From 609ffb261b384077ec8a952b751c8c17fff8cb36 Mon Sep 17 00:00:00 2001 From: Timothy Rae Date: Thu, 26 Nov 2015 02:42:23 +0900 Subject: [PATCH] Give integer preference a new name to prevent crash --- .../src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java | 2 +- AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java | 2 +- AnkiDroid/src/main/java/com/ichi2/anki/Preferences.java | 2 +- AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java | 2 +- AnkiDroid/src/main/java/com/ichi2/compat/CompatV19.java | 2 +- AnkiDroid/src/main/res/xml/preferences_reviewing.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java index f15f71fa09..4453f9012b 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java @@ -1669,7 +1669,7 @@ public abstract class AbstractFlashcardViewer extends NavigationDrawerActivity { mLongClickWorkaround = preferences.getBoolean("textSelectionLongclickWorkaround", false); // mDeckFilename = preferences.getString("deckFilename", ""); mNightMode = preferences.getBoolean("invertedColors", false); - mPrefFullscreenReview = Integer.parseInt(preferences.getString("fullscreenReview", "0")) >0; + mPrefFullscreenReview = Integer.parseInt(preferences.getString("fullscreenMode", "0")) >0; mCardZoom = preferences.getInt("cardZoom", 100); mImageZoom = preferences.getInt("imageZoom", 100); mRelativeButtonSize = preferences.getInt("answerButtonSize", 100); diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java index 964cb18bb9..e61583c2fa 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java @@ -907,7 +907,7 @@ public class DeckPicker extends NavigationDrawerActivity implements if (previousVersionCode < 20500219) { // clear fullscreen flag as we use a integer boolean old =preferences.getBoolean("fullscreenReview", false); - preferences.edit().putString("fullscreenReview", old ? "1": "0").commit(); + preferences.edit().putString("fullscreenMode", old ? "1": "0").commit(); } } diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Preferences.java b/AnkiDroid/src/main/java/com/ichi2/anki/Preferences.java index b46a034d04..cdd6137f80 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/Preferences.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/Preferences.java @@ -242,7 +242,7 @@ public class Preferences extends AppCompatPreferenceActivity implements Preferen screen = listener.getPreferenceScreen(); // Show error toast if the user tries to disable answer button without gestures on ListPreference fullscreenPreference = (ListPreference) - screen.findPreference("fullscreenReview"); + screen.findPreference("fullscreenMode"); fullscreenPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { public boolean onPreferenceChange(Preference preference, final Object newValue) { SharedPreferences prefs = AnkiDroidApp.getSharedPrefs(Preferences.this); diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java index ca0d6e855c..2a010ae17e 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java @@ -320,7 +320,7 @@ public class Reviewer extends AbstractFlashcardViewer { super.restorePreferences(); SharedPreferences preferences = AnkiDroidApp.getSharedPrefs(getBaseContext()); mBlackWhiteboard = preferences.getBoolean("blackWhiteboard", true); - mPrefFullscreenReview = Integer.parseInt(preferences.getString("fullscreenReview", "0")) >0; + mPrefFullscreenReview = Integer.parseInt(preferences.getString("fullscreenMode", "0")) >0; return preferences; } diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV19.java b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV19.java index 9db80d30ca..aa7a3c8b58 100644 --- a/AnkiDroid/src/main/java/com/ichi2/compat/CompatV19.java +++ b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV19.java @@ -45,7 +45,7 @@ public class CompatV19 extends CompatV16 implements Compat { // Show / hide the Action bar together with the status bar SharedPreferences prefs = AnkiDroidApp.getSharedPrefs(a); - final int fullscreenMode = Integer.parseInt(prefs.getString("fullscreenReview", "0")); + final int fullscreenMode = Integer.parseInt(prefs.getString("fullscreenMode", "0")); View decorView = a.getWindow().getDecorView(); decorView.setOnSystemUiVisibilityChangeListener (new View.OnSystemUiVisibilityChangeListener() { diff --git a/AnkiDroid/src/main/res/xml/preferences_reviewing.xml b/AnkiDroid/src/main/res/xml/preferences_reviewing.xml index 0bd43e2ec5..20697fcb0a 100644 --- a/AnkiDroid/src/main/res/xml/preferences_reviewing.xml +++ b/AnkiDroid/src/main/res/xml/preferences_reviewing.xml @@ -61,7 +61,7 @@ android:title="@string/pref_keep_screen_on" />