From ffd08658e1a9333b6af896aa3fc853c5184fc571 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 1 Aug 2017 10:22:24 +0200 Subject: put settings defaults into resource file --- .../de/pixart/messenger/parser/MessageParser.java | 11 +++++- .../services/AbstractConnectionManager.java | 13 ++++-- .../messenger/services/ExportLogsService.java | 2 +- .../messenger/services/NotificationService.java | 4 +- .../messenger/services/XmppConnectionService.java | 46 +++++++++++----------- .../pixart/messenger/ui/ConversationActivity.java | 6 +-- .../pixart/messenger/ui/ConversationFragment.java | 2 +- .../pixart/messenger/ui/MagicCreateActivity.java | 9 +++++ .../de/pixart/messenger/ui/ShareWithActivity.java | 2 +- .../ui/ShowFullscreenMessageActivity.java | 4 +- .../messenger/ui/StartConversationActivity.java | 4 +- .../de/pixart/messenger/ui/WelcomeActivity.java | 9 +++++ .../java/de/pixart/messenger/ui/XmppActivity.java | 12 +++--- .../messenger/ui/adapter/ConversationAdapter.java | 2 +- .../messenger/ui/adapter/ListItemAdapter.java | 2 +- .../de/pixart/messenger/utils/ExceptionHelper.java | 2 +- 16 files changed, 81 insertions(+), 49 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java index d503eb95e..c5e818f1a 100644 --- a/src/main/java/de/pixart/messenger/parser/MessageParser.java +++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java @@ -17,6 +17,7 @@ import java.util.Set; import java.util.UUID; import de.pixart.messenger.Config; +import de.pixart.messenger.R; import de.pixart.messenger.crypto.OtrService; import de.pixart.messenger.crypto.axolotl.AxolotlService; import de.pixart.messenger.crypto.axolotl.XmppAxolotlMessage; @@ -736,8 +737,14 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece private static SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm:ss"); private void activateGracePeriod(Account account) { - long duration = mXmppConnectionService.getPreferences().getLong("race_period_length", 144) * 1000; - Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": activating grace period till " + TIME_FORMAT.format(new Date(System.currentTimeMillis() + duration))); + long duration; + long defaultValue = mXmppConnectionService.getResources().getInteger(R.integer.grace_period); + try { + duration = Long.parseLong(mXmppConnectionService.getPreferences().getString("grace_period_length", String.valueOf(defaultValue))) * 1000; + } catch (NumberFormatException e) { + duration = defaultValue * 1000; + } + Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": activating grace period (" + duration + ") till " + TIME_FORMAT.format(new Date(System.currentTimeMillis() + duration))); account.activateGracePeriod(duration); } } diff --git a/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java b/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java index 5a65d23c3..9232b2d7e 100644 --- a/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java +++ b/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java @@ -33,6 +33,7 @@ import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import de.pixart.messenger.Config; +import de.pixart.messenger.R; import de.pixart.messenger.entities.DownloadableFile; public class AbstractConnectionManager { @@ -49,21 +50,25 @@ public class AbstractConnectionManager { } public long getAutoAcceptFileSize() { + long defaultValue_wifi = this.getXmppConnectionService().getResources().getInteger(R.integer.auto_accept_filesize_wifi); + long defaultValue_mobile = this.getXmppConnectionService().getResources().getInteger(R.integer.auto_accept_filesize_mobile); + long defaultValue_roaming = this.getXmppConnectionService().getResources().getInteger(R.integer.auto_accept_filesize_roaming); + String config = "0"; if (mXmppConnectionService.isWIFI()) { config = this.mXmppConnectionService.getPreferences().getString( - "auto_accept_file_size_wifi", "10485760"); + "auto_accept_file_size_wifi", String.valueOf(defaultValue_wifi)); } else if (mXmppConnectionService.isMobile()) { config = this.mXmppConnectionService.getPreferences().getString( - "auto_accept_file_size_mobile", "262144"); + "auto_accept_file_size_mobile", String.valueOf(defaultValue_mobile)); } else if (mXmppConnectionService.isMobileRoaming()) { config = this.mXmppConnectionService.getPreferences().getString( - "auto_accept_file_size_roaming", "1"); + "auto_accept_file_size_roaming", String.valueOf(defaultValue_roaming)); } try { return Long.parseLong(config); } catch (NumberFormatException e) { - return 1048576; + return defaultValue_mobile; } } diff --git a/src/main/java/de/pixart/messenger/services/ExportLogsService.java b/src/main/java/de/pixart/messenger/services/ExportLogsService.java index ab1d223db..2337d04d0 100644 --- a/src/main/java/de/pixart/messenger/services/ExportLogsService.java +++ b/src/main/java/de/pixart/messenger/services/ExportLogsService.java @@ -55,7 +55,7 @@ public class ExportLogsService extends Service { mDatabaseBackend = DatabaseBackend.getInstance(getBaseContext()); mAccounts = mDatabaseBackend.getAccounts(); final SharedPreferences ReadableLogs = PreferenceManager.getDefaultSharedPreferences(this); - ReadableLogsEnabled = ReadableLogs.getBoolean("export_plain_text_logs", false); + ReadableLogsEnabled = ReadableLogs.getBoolean("export_plain_text_logs", getResources().getBoolean(R.bool.plain_text_logs)); pm = (PowerManager) getSystemService(Context.POWER_SERVICE); wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ExportLogsService"); } diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java index 0397a8950..ee5db3156 100644 --- a/src/main/java/de/pixart/messenger/services/NotificationService.java +++ b/src/main/java/de/pixart/messenger/services/NotificationService.java @@ -90,7 +90,7 @@ public class NotificationService { } public boolean notificationsEnabled() { - return mXmppConnectionService.getPreferences().getBoolean("show_notification", true); + return mXmppConnectionService.getPreferences().getBoolean("show_notification", mXmppConnectionService.getResources().getBoolean(R.bool.show_notification)); } private boolean notificationsFromStrangers() { @@ -99,7 +99,7 @@ public class NotificationService { } public boolean isQuietHours() { - if (!mXmppConnectionService.getPreferences().getBoolean("enable_quiet_hours", false)) { + if (!mXmppConnectionService.getPreferences().getBoolean("enable_quiet_hours", mXmppConnectionService.getResources().getBoolean(R.bool.enable_quiet_hours))) { return false; } final long startTime = mXmppConnectionService.getPreferences().getLong("quiet_hours_start", TimePreference.DEFAULT_VALUE) % Config.MILLISECONDS_IN_DAY; diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 5f075bf7e..ef83aa227 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -875,7 +875,7 @@ public class XmppConnectionService extends Service { } private boolean manuallyChangePresence() { - return getPreferences().getBoolean(SettingsActivity.MANUALLY_CHANGE_PRESENCE, false); + return getPreferences().getBoolean(SettingsActivity.MANUALLY_CHANGE_PRESENCE, getResources().getBoolean(R.bool.manually_change_presence)); } private boolean treatVibrateAsSilent() { @@ -883,15 +883,15 @@ public class XmppConnectionService extends Service { } private boolean awayWhenScreenOff() { - return getPreferences().getBoolean(SettingsActivity.AWAY_WHEN_SCREEN_IS_OFF, false); + return getPreferences().getBoolean(SettingsActivity.AWAY_WHEN_SCREEN_IS_OFF, getResources().getBoolean(R.bool.away_when_screen_off)); } private String getCompressPicturesPreference() { - return getPreferences().getString("picture_compression", "auto"); + return getPreferences().getString("picture_compression", getResources().getString(R.string.picture_compression)); } public int getCompressImageResolutionPreference() { - switch (getPreferences().getString("image_compression", "high")) { + switch (getPreferences().getString("image_compression", getResources().getString(R.string.picture_compression))) { case "low": return 720; case "mid": @@ -904,7 +904,7 @@ public class XmppConnectionService extends Service { } public int getCompressImageSizePreference() { - switch (getPreferences().getString("image_compression", "high")) { + switch (getPreferences().getString("image_compression", getResources().getString(R.string.picture_compression))) { case "low": return 209715; // 0.2 * 1024 * 1024 = 209715 (0.2 MiB) case "mid": @@ -912,12 +912,12 @@ public class XmppConnectionService extends Service { case "high": return 1048576; // 1 * 1024 * 1024 = 1048576 (1 MiB) default: - return 1048576; + return 524288; } } private int getCompressVideoResolutionPreference() { - switch (getPreferences().getString("video_compression", "high")) { + switch (getPreferences().getString("video_compression", getResources().getString(R.string.video_compression))) { case "low": return 144; case "mid": @@ -925,12 +925,12 @@ public class XmppConnectionService extends Service { case "high": return 720; default: - return 720; + return 360; } } private int getCompressVideoBitratePreference() { - switch (getPreferences().getString("video_compression", "high")) { + switch (getPreferences().getString("video_compression", getResources().getString(R.string.video_compression))) { case "low": return 100000; case "mid": @@ -938,7 +938,7 @@ public class XmppConnectionService extends Service { case "high": return 2000000; default: - return 2000000; + return 500000; } } @@ -2914,7 +2914,7 @@ public class XmppConnectionService extends Service { } public void createContact(Contact contact) { - boolean autoGrant = getPreferences().getBoolean("grant_new_contacts", true); + boolean autoGrant = getPreferences().getBoolean("grant_new_contacts", getResources().getBoolean(R.bool.grant_new_contacts)); if (autoGrant) { contact.setOption(Contact.Options.PREEMPTIVE_GRANT); contact.setOption(Contact.Options.ASKING); @@ -3424,7 +3424,7 @@ public class XmppConnectionService extends Service { public long getAutomaticMessageDeletionDate() { try { - final long timeout = Long.parseLong(getPreferences().getString(SettingsActivity.AUTOMATIC_MESSAGE_DELETION, "0")) * 1000; + final long timeout = Long.parseLong(getPreferences().getString(SettingsActivity.AUTOMATIC_MESSAGE_DELETION, String.valueOf(getResources().getInteger(R.integer.automatic_message_deletion)))) * 1000; return timeout == 0 ? timeout : System.currentTimeMillis() - timeout; } catch (NumberFormatException e) { return 0; @@ -3432,35 +3432,35 @@ public class XmppConnectionService extends Service { } public boolean confirmMessages() { - return getPreferences().getBoolean("confirm_messages", true); + return getPreferences().getBoolean("confirm_messages", getResources().getBoolean(R.bool.confirm_messages)); } public boolean allowMessageCorrection() { - return getPreferences().getBoolean("allow_message_correction", true); + return getPreferences().getBoolean("allow_message_correction", getResources().getBoolean(R.bool.allow_message_correction)); } public boolean sendChatStates() { - return getPreferences().getBoolean("chat_states", true); + return getPreferences().getBoolean("chat_states", getResources().getBoolean(R.bool.chat_states)); } private boolean respectAutojoin() { - return getPreferences().getBoolean("autojoin", true); + return getPreferences().getBoolean("autojoin", getResources().getBoolean(R.bool.autojoin)); } public boolean indicateReceived() { - return getPreferences().getBoolean("indicate_received", true); + return getPreferences().getBoolean("indicate_received", getResources().getBoolean(R.bool.indicate_received)); } public boolean useTorToConnect() { - return Config.FORCE_ORBOT || getPreferences().getBoolean("use_tor", false); + return Config.FORCE_ORBOT || getPreferences().getBoolean("use_tor", getResources().getBoolean(R.bool.use_tor)); } public boolean showExtendedConnectionOptions() { - return getPreferences().getBoolean("show_connection_options", false); + return getPreferences().getBoolean("show_connection_options", getResources().getBoolean(R.bool.show_connection_options)); } public boolean broadcastLastActivity() { - return getPreferences().getBoolean(SettingsActivity.BROADCAST_LAST_ACTIVITY, true); + return getPreferences().getBoolean(SettingsActivity.BROADCAST_LAST_ACTIVITY, getResources().getBoolean(R.bool.last_activity)); } public int unreadCount() { @@ -3622,7 +3622,7 @@ public class XmppConnectionService extends Service { public void updateMemorizingTrustmanager() { final MemorizingTrustManager tm; - final boolean dontTrustSystemCAs = getPreferences().getBoolean("dont_trust_system_cas", false); + final boolean dontTrustSystemCAs = getPreferences().getBoolean("dont_trust_system_cas", getResources().getBoolean(R.bool.dont_trust_system_cas)); if (dontTrustSystemCAs) { tm = new MemorizingTrustManager(getApplicationContext(), null); } else { @@ -4080,7 +4080,7 @@ public class XmppConnectionService extends Service { if (name != null && !name.trim().isEmpty()) { bookmark.setBookmarkName(name.trim()); } - bookmark.setAutojoin(getPreferences().getBoolean("autojoin", true)); + bookmark.setAutojoin(getPreferences().getBoolean("autojoin", getResources().getBoolean(R.bool.autojoin))); account.getBookmarks().add(bookmark); pushBookmarks(account); conversation.setBookmark(bookmark); @@ -4145,7 +4145,7 @@ public class XmppConnectionService extends Service { } public boolean blindTrustBeforeVerification() { - return getPreferences().getBoolean(SettingsActivity.BLIND_TRUST_BEFORE_VERIFICATION, true); + return getPreferences().getBoolean(SettingsActivity.BLIND_TRUST_BEFORE_VERIFICATION, getResources().getBoolean(R.bool.btbv)); } public void pushMamPreferences(Account account, Element prefs) { 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 @@ -38,6 +38,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)) { 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 @@ -51,6 +51,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)) { 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 { } 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 { } 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/utils/ExceptionHelper.java b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java index ed58737ac..c511039cf 100644 --- a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java +++ b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java @@ -44,7 +44,7 @@ public class ExceptionHelper { try { final SharedPreferences preferences = PreferenceManager .getDefaultSharedPreferences(activity); - boolean crashreport = preferences.getBoolean("crashreport", true); + boolean crashreport = preferences.getBoolean("crashreport", activity.getResources().getBoolean(R.bool.send_crashreport)); if (!crashreport || Config.BUG_REPORTS == null) { return false; } -- cgit v1.2.3