#178 fixing the mapping of shared preference keys

PanicInitiative · Mar 2, 2016 · 5a30726 · 5a30726
1 parent e3c1276
commit 5a30726
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/app/src/main/java/org/iilab/pb/MainActivity.java b/app/src/main/java/org/iilab/pb/MainActivity.java
@@ -235,7 +235,6 @@ public void onBackPressed() {
         }
     }
 
-
     @Override
     public boolean onPreferenceStartScreen(PreferenceFragmentCompat preferenceFragmentCompat,
                                            PreferenceScreen preferenceScreen) {

diff --git a/app/src/main/java/org/iilab/pb/common/ApplicationSettings.java b/app/src/main/java/org/iilab/pb/common/ApplicationSettings.java
@@ -201,7 +201,7 @@ public static Boolean isFirstMsgSent(Context context) {
 
 
     public static boolean isHardwareTriggerServiceEnabled(Context context) {
-        String powerButtonTriggerStatus = sharedPreferences(context).getString(context.getString(R.string.powerButtonTriggerStatus_key), context.getString(R.string.activate_power_button_trigger));
+        String powerButtonTriggerStatus = sharedPreferences(context).getString(context.getString(R.string.configurePowerButtonTriggerKey), context.getString(R.string.activate_power_button_trigger));
         return (context.getString(R.string.activate_power_button_trigger).equals(powerButtonTriggerStatus) ? true : false);
     }
 

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -68,10 +68,7 @@
     <string name="PowerButtonTriggerTitle">Power Button Trigger</string>
 
     <string name="deactivate_power_button_trigger">Deactivated</string>
-    <string name="powerButtonTriggerStatus_key">"powerButtonTriggerStatus" </string>
-    <string name="configure_power_button_trigger_summary">"Enable/Disable the power button alarm trigger" </string>
     <string name="activate_power_button_trigger">Activated </string>
-    <string name="debug_mode">Debug Mode </string>
 
     <string name="changeTriggerPattern">Change Trigger Pattern</string>
     <string name="firstClicks">Number of first clicks</string>
@@ -101,7 +98,7 @@
     <string name="confirmationSequenceTitle"> Use Confirmation Sequence</string>
     <string name="confirmationSequenceKey">confirmationSettings</string>
     <string name="confirmationSequenceDefault">1</string>
-    <string name="confirmationSequenceSummary">Feedback on Alarm Activation</string>
+    <string name="confirmationSequenceSummary">Pattern to inform that the alarm confirmation is required or not </string>
 
     <string name="confirmationWaitTimeTitle">Confirmation Wait Time</string>
     <string name="confirmationWaitTimeDefault">2</string>
@@ -125,7 +122,7 @@
     <string name="redoTrainingKey">redoTraining</string>
 
     <string name="triggerSettingsHeaderTitle">Alarm Trigger Settings</string>
-    <string name="default7RepeatedPressTitle">(Default) 7 repeated presses</string>
+    <string name="default7RepeatedPressTitle">(Default)7 Repeated Presses</string>
     <string name="default7RepeatedPressKey">default7Press</string>
     <string name="extraConfirmationPressTitle">5 presses plus  confirmation </string>
     <string name="extraConfirmationPressKey">extraConfirmation </string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -68,11 +68,9 @@
     <string name="configurePowerButtonTriggerKey">powerButtonTriggerStatus</string>
     <string name="configurePowerButtonTriggerSummary">Enable/Disable the power button alarm trigger</string>
     <string name="PowerButtonTriggerTitle">Power Button Trigger</string>
+
     <string name="deactivate_power_button_trigger">Deactivated</string>
-    <string name="powerButtonTriggerStatus_key">"powerButtonTriggerStatus" </string>
-    <string name="configure_power_button_trigger_summary">"Enable/Disable the power button alarm trigger" </string>
     <string name="activate_power_button_trigger">Activated </string>
-    <string name="debug_mode">Debug Mode </string>
 
     <string name="changeTriggerPattern">Change Trigger Pattern</string>
     <string name="firstClicks">Number of first clicks</string>
@@ -103,7 +101,7 @@
     <string name="confirmationSequenceTitle"> Use Confirmation Sequence</string>
     <string name="confirmationSequenceKey">confirmationSettings</string>
     <string name="confirmationSequenceDefault">1</string>
-    <string name="confirmationSequenceSummary">Feedback on Alarm Activation</string>
+    <string name="confirmationSequenceSummary">Pattern to inform that the alarm confirmation is required or not </string>
 
     <string name="confirmationWaitTimeTitle">Confirmation Wait Time</string>
     <string name="confirmationWaitTimeDefault">2</string>