Fix for notification actions

RichyHBM · Jan 7, 2019 · 801d1cf · 801d1cf
1 parent 5bbdbd3
commit 801d1cf
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "uk.co.richyhbm.monochromatic"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 9
-        versionName "0.6.0"
+        versionCode 10
+        versionName "0.6.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/uk/co/richyhbm/monochromatic/Activities/MainActivity.kt b/app/src/main/java/uk/co/richyhbm/monochromatic/Activities/MainActivity.kt
@@ -20,12 +20,18 @@ import uk.co.richyhbm.monochromatic.Utilities.Settings
 class MainActivity : AppCompatActivity() {
     val settings by lazy { Settings(this) }
 
-    private val preferencesChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { _, _ ->
-        if (settings.isEnabled()) {
-            MonochromeService.startService(this)
-            SecureSettings.toggleFilters(settings.isAllowed(), contentResolver, settings)
-        } else {
-            MonochromeService.stopService(this)
+    private val preferencesChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
+        when(key) {
+            getString(R.string.settings_key_disable_screen) -> {}
+            getString(R.string.settings_key_disable_session) -> {}
+            else -> {
+                if (settings.isEnabled()) {
+                    MonochromeService.startService(this)
+                    SecureSettings.toggleFilters(settings.isAllowed(), contentResolver, settings)
+                } else {
+                    MonochromeService.stopService(this)
+                }
+            }
         }
     }
 

diff --git a/...rc/main/java/uk/co/richyhbm/monochromatic/Receivers/DisableMonochromeForScreenReceiver.kt b/...rc/main/java/uk/co/richyhbm/monochromatic/Receivers/DisableMonochromeForScreenReceiver.kt
@@ -12,7 +12,7 @@ class DisableMonochromeForScreenReceiver: BroadcastReceiver() {
             val settings = Settings(context)
             if(settings.isEnabled()) {
                 settings.screenDisabled()
-                SecureSettings.toggleMonochrome(settings.isAllowed(), context.contentResolver)
+                SecureSettings.toggleFilters(settings.isAllowed(), context.contentResolver, settings)
             }
         }
     }

diff --git a/...c/main/java/uk/co/richyhbm/monochromatic/Receivers/DisableMonochromeForSessionReceiver.kt b/...c/main/java/uk/co/richyhbm/monochromatic/Receivers/DisableMonochromeForSessionReceiver.kt
@@ -12,7 +12,7 @@ class DisableMonochromeForSessionReceiver: BroadcastReceiver() {
             val settings = Settings(context)
             if(settings.isEnabled()) {
                 settings.sessionDisabled()
-                SecureSettings.toggleMonochrome(settings.isAllowed(), context.contentResolver)
+                SecureSettings.toggleFilters(settings.isAllowed(), context.contentResolver, settings)
             }
         }
     }

diff --git a/app/src/main/java/uk/co/richyhbm/monochromatic/Utilities/SecureSettings.kt b/app/src/main/java/uk/co/richyhbm/monochromatic/Utilities/SecureSettings.kt
@@ -17,7 +17,7 @@ object SecureSettings {
         }
     }
 
-    fun toggleMonochrome(enabled: Boolean, contentResolver: ContentResolver) {
+    private fun toggleMonochrome(enabled: Boolean, contentResolver: ContentResolver) {
         Settings.Secure.putInt(contentResolver, Constants.secureSetting_displayDaltonizerEnabled, enabled.int)
         if (enabled) {
             Settings.Secure.putInt(contentResolver, Constants.secureSetting_displayDaltonizer, Constants.secureSettingValue_daltonizerSimulateMonochrome)