Merge pull request #342 from farkam135/quickfix-manual-screenshot-mode

Quickfix manual screenshot mode
farkam135 · Sep 1, 2016 · 1255632 · 1255632
2 parents 79b296b + 6f9d9fa
commit 1255632
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java b/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 
 public class GoIVSettings {
 
@@ -38,7 +39,12 @@ public boolean shouldShouldConfirmationDialogs() {
     }
 
     public boolean isManualScreenshotModeEnabled() {
-        return prefs.getBoolean(MANUAL_SCREENSHOT_MODE, false);
+        //XXX unify with code in SettingsActivity.java
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH) {
+            return true;
+        } else {
+            return prefs.getBoolean(MANUAL_SCREENSHOT_MODE, false);
+        }
     }
 
     public boolean shouldDeleteScreenshots() {

diff --git a/app/src/main/java/com/kamron/pogoiv/SettingsActivity.java b/app/src/main/java/com/kamron/pogoiv/SettingsActivity.java
@@ -85,7 +85,7 @@ public boolean onPreferenceClick(Preference preference) {
                 preferenceScreen.removePreference(checkForUpdatePreference);
             }
 
-            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH) {
                 SwitchPreference manualScreenshotModePreference = (SwitchPreference) getPreferenceManager().findPreference(GoIVSettings.MANUAL_SCREENSHOT_MODE);
                 manualScreenshotModePreference.setDefaultValue(true);
                 manualScreenshotModePreference.setChecked(true);