put settings defaults into resource file

10 files changed, 36 insertions, 16 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index e47bb31e7..7dccdd8b9 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -2073,15 +2073,15 @@ public class ConversationActivity extends XmppActivity
     }
 
     public boolean useSendButtonToIndicateStatus() {
-        return getPreferences().getBoolean("send_button_status", true);
+        return getPreferences().getBoolean("send_button_status", getResources().getBoolean(R.bool.send_button_status));
     }
 
     public boolean indicateReceived() {
-        return getPreferences().getBoolean("indicate_received", true);
+        return getPreferences().getBoolean("indicate_received", getResources().getBoolean(R.bool.indicate_received));
     }
 
     public boolean useWhiteBackground() {
-        return getPreferences().getBoolean("use_white_background", false);
+        return getPreferences().getBoolean("use_white_background", getResources().getBoolean(R.bool.use_white_background));
     }
 
     protected boolean trustKeysIfNeeded(int requestCode) {
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 1e1b51a93..9cf2120fa 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1281,7 +1281,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
                 if (conference && c.getNextCounterpart() != null) {
                     action = SendButtonAction.CANCEL;
                 } else {
-                    String setting = activity.getPreferences().getString("quick_action", "recent");
+                    String setting = activity.getPreferences().getString("quick_action", activity.getResources().getString(R.string.quick_action));
                     if (!setting.equals("none") && UIHelper.receivedLocationQuestion(conversation.getLatestMessage())) {
                         setting = "location";
                     } else if (setting.equals("recent")) {
diff --git a/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java b/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
index 5e41ad326..0d5759b6a 100644
--- a/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
@@ -39,6 +39,15 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher {
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        final int theme = findTheme();
+        if (this.mTheme != theme) {
+            recreate();
+        }
+    }
+
+    @Override
     protected void onCreate(final Bundle savedInstanceState) {
         if (getResources().getBoolean(R.bool.portrait_only)) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
index f8a414102..d269e4249 100644
--- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
@@ -212,7 +212,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
             IntentReceived = true;
         }
         Log.d(Config.LOGTAG, "ShareWithActivity onStart() getIntent " + intent.toString());
-        this.mReturnToPrevious = getPreferences().getBoolean("return_to_previous", false);
+        this.mReturnToPrevious = getPreferences().getBoolean("return_to_previous", getResources().getBoolean(R.bool.return_to_previous));
         final String type = intent.getType();
         final String action = intent.getAction();
         Log.d(Config.LOGTAG, "action: " + action + ", type:" + type);
diff --git a/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java b/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java
index ca5ff3de1..3aba479e5 100644
--- a/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java
@@ -257,11 +257,11 @@ public class ShowFullscreenMessageActivity extends Activity {
     }
 
     public boolean useMaxBrightness() {
-        return getPreferences().getBoolean("use_max_brightness", true);
+        return getPreferences().getBoolean("use_max_brightness", getResources().getBoolean(R.bool.use_max_brightness));
     }
 
     public boolean useAutoRotateScreen() {
-        return getPreferences().getBoolean("use_auto_rotate", true);
+        return getPreferences().getBoolean("use_auto_rotate", getResources().getBoolean(R.bool.auto_rotate));
     }
 
     protected SharedPreferences getPreferences() {
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 784e511ef..aaae41e65 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -376,7 +376,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
         }
         Conversation conversation = xmppConnectionService.findOrCreateConversation(bookmark.getAccount(), jid, true, true, true);
         conversation.setBookmark(bookmark);
-        if (!bookmark.autojoin() && getPreferences().getBoolean("autojoin", true)) {
+        if (!bookmark.autojoin() && getPreferences().getBoolean("autojoin", getResources().getBoolean(R.bool.autojoin))) {
             bookmark.setAutojoin(true);
             xmppConnectionService.pushBookmarks(bookmark.getAccount());
         }
@@ -522,7 +522,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
                                 jid.setError(getString(R.string.bookmark_already_exists));
                             } else {
                                 final Bookmark bookmark = new Bookmark(account, conferenceJid.toBareJid());
-                                bookmark.setAutojoin(getPreferences().getBoolean("autojoin", true));
+                                bookmark.setAutojoin(getPreferences().getBoolean("autojoin", getResources().getBoolean(R.bool.autojoin)));
                                 String nick = conferenceJid.getResourcepart();
                                 if (nick != null && !nick.isEmpty()) {
                                     bookmark.setNick(nick);
diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
index 60f4636b0..b34cc22ae 100644
--- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
@@ -52,6 +52,15 @@ public class WelcomeActivity extends XmppActivity {
     private static final int REQUEST_READ_EXTERNAL_STORAGE = 0XD737;
 
     @Override
+    public void onStart() {
+        super.onStart();
+        final int theme = findTheme();
+        if (this.mTheme != theme) {
+            recreate();
+        }
+    }
+
+    @Override
     protected void onCreate(final Bundle savedInstanceState) {
         if (getResources().getBoolean(R.bool.portrait_only)) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 2187a467b..82cd46b51 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -417,7 +417,7 @@ public abstract class XmppActivity extends Activity {
         this.mTheme = findTheme();
         setTheme(this.mTheme);
         this.mUsingEnterKey = usingEnterKey();
-        mUseSubject = getPreferences().getBoolean("use_subject", true);
+        mUseSubject = getPreferences().getBoolean("use_subject", getResources().getBoolean(R.bool.use_subject));
         final ActionBar ab = getActionBar();
         if (ab != null) {
             ab.setDisplayHomeAsUpEnabled(true);
@@ -454,7 +454,7 @@ public abstract class XmppActivity extends Activity {
     }
 
     protected boolean usingEnterKey() {
-        return getPreferences().getBoolean("display_enter_key", false);
+        return getPreferences().getBoolean("display_enter_key", getResources().getBoolean(R.bool.display_enter_key));
     }
 
     protected SharedPreferences getPreferences() {
@@ -1021,11 +1021,11 @@ public abstract class XmppActivity extends Activity {
     }
 
     protected boolean neverCompressPictures() {
-        return getPreferences().getString("picture_compression", "auto").equals("never");
+        return getPreferences().getString("picture_compression", getResources().getString(R.string.picture_compression)).equals("never");
     }
 
     protected boolean manuallyChangePresence() {
-        return getPreferences().getBoolean(SettingsActivity.MANUALLY_CHANGE_PRESENCE, true);
+        return getPreferences().getBoolean(SettingsActivity.MANUALLY_CHANGE_PRESENCE,  getResources().getBoolean(R.bool.manually_change_presence));
     }
 
     protected void unregisterNdefPushMessageCallback() {
@@ -1095,7 +1095,9 @@ public abstract class XmppActivity extends Activity {
     }
 
     protected int findTheme() {
-        if (getPreferences().getBoolean("use_larger_font", false)) {
+        Boolean larger = getPreferences().getBoolean("use_larger_font", getResources().getBoolean(R.bool.use_larger_font));
+
+        if (larger) {
             return R.style.ConversationsTheme_LargerText;
         } else {
             return R.style.ConversationsTheme;
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
index d2d001981..ee1ce4102 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -315,7 +315,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
     }
 
     public boolean ShowPresenceColoredNames() {
-        return getPreferences().getBoolean("presence_colored_names", false);
+        return getPreferences().getBoolean("presence_colored_names", activity.getResources().getBoolean(R.bool.presence_colored_names));
     }
 
     protected SharedPreferences getPreferences() {
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
index ce0649c56..0c3c3eb9e 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
@@ -214,7 +214,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
     }
 
     public boolean ShowPresenceColoredNames() {
-        return getPreferences().getBoolean("presence_colored_names", false);
+        return getPreferences().getBoolean("presence_colored_names", activity.getResources().getBoolean(R.bool.presence_colored_names));
     }
 
     protected SharedPreferences getPreferences() {