From 1103a409c0b4ba4817dfd2b5c7d3557077a3451b Mon Sep 17 00:00:00 2001
From: Philipp Schaefer <trashzopf@gmail.com>
Date: Tue, 4 Mar 2014 00:30:35 +0100
Subject: [PATCH] use correct default values for MultiSelectListPreference
 outside of xml

---
 mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java  | 8 ++++++--
 mobile/src/com/cradle/iitc_mobile/IITC_WebView.java | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 9c53984c..9a34dfc5 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -49,6 +49,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Stack;
@@ -137,7 +138,8 @@ public class IITC_Mobile extends Activity
         mDesktopMode = mSharedPrefs.getBoolean("pref_force_desktop", false);
 
         // enable/disable advance menu
-        mAdvancedMenu = mSharedPrefs.getStringSet("pref_android_menu", new HashSet<String>());
+        final String[] menuDefaults = getResources().getStringArray(R.array.pref_android_menu_default);
+        mAdvancedMenu = mSharedPrefs.getStringSet("pref_android_menu", new HashSet<String>(Arrays.asList(menuDefaults)));
 
         // get fullscreen status from settings
         mIitcWebView.updateFullscreenStatus();
@@ -180,7 +182,9 @@ public class IITC_Mobile extends Activity
             mNavigationHelper.onPrefChanged();
             return;
         } else if (key.equals("pref_android_menu")) {
-            mAdvancedMenu = mSharedPrefs.getStringSet("pref_android_menu", new HashSet<String>());
+            final String[] menuDefaults = getResources().getStringArray(R.array.pref_android_menu_default);
+            mAdvancedMenu = mSharedPrefs.getStringSet("pref_android_menu",
+                    new HashSet<String>(Arrays.asList(menuDefaults)));
             mNavigationHelper.setDebugMode(mAdvancedMenu.contains(R.string.menu_debug));
             invalidateOptionsMenu();
             // no reload needed
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
index 48253429..7c329a7c 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
@@ -17,6 +17,7 @@ import android.widget.Toast;
 
 import com.cradle.iitc_mobile.async.CheckHttpResponse;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -214,7 +215,9 @@ public class IITC_WebView extends WebView {
     }
 
     void updateFullscreenStatus() {
-        final Set<String> entries = mSharedPrefs.getStringSet("pref_fullscreen", new HashSet<String>());
+        final String[] fullscreenDefaults = getResources().getStringArray(R.array.pref_hide_fullscreen_defaults);
+        final Set<String> entries = mSharedPrefs.getStringSet("pref_fullscreen",
+                new HashSet<String>(Arrays.asList(fullscreenDefaults)));
         mFullscreenStatus &= FS_ENABLED;
 
         for (final String entry : entries) {