Removed unused BroadcastReceiver

francoiscampbell · Mar 19, 2016 · 1da2955 · 1da2955
1 parent ca64194
commit 1da2955
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 45 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -25,8 +25,6 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name=".model.settings.SettingsRelay" />
-
     </application>
 
 </manifest>
diff --git a/...in/io/github/francoiscampbell/xposeddatausage/model/settings/SettingsChangeBroadcaster.kt b/...in/io/github/francoiscampbell/xposeddatausage/model/settings/SettingsChangeBroadcaster.kt
@@ -17,7 +17,6 @@ class SettingsChangeBroadcaster(private val context: Context) : SharedPreference
 
     private val res = context.resources
     private val settingsUpdatedAction = res.getString(R.string.action_settings_updated)
-    private val settingsUpdateRequestAction = res.getString(R.string.action_settings_update_request)
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
         val newPrefValue = sharedPreferences.all[key]
@@ -31,7 +30,7 @@ class SettingsChangeBroadcaster(private val context: Context) : SharedPreference
         if (BuildConfig.DEBUG) {
             Log.i("Xposed", "startBroadcastingChanges")
         }
-        context.sendBroadcast(Intent(context, SettingsRelay::class.java)) //trigger push settings to module
+        prefs.all.forEach { onSharedPreferenceChanged(prefs, it.key) } //push settings to module when opening the settings app
         prefs.registerOnSharedPreferenceChangeListener(this)
     }
 

diff --git a/...src/main/kotlin/io/github/francoiscampbell/xposeddatausage/model/settings/SettingsImpl.kt b/...src/main/kotlin/io/github/francoiscampbell/xposeddatausage/model/settings/SettingsImpl.kt
@@ -1,7 +1,6 @@
 package io.github.francoiscampbell.xposeddatausage.model.settings
 
 import android.content.Context
-import android.content.Intent
 import android.content.IntentFilter
 import android.content.res.XModuleResources
 import de.robv.android.xposed.XposedBridge
@@ -21,10 +20,7 @@ class SettingsImpl : Settings {
 
     private val settingsUpdatedAction = res.getString(R.string.action_settings_updated)
 
-    private val RELAY_PACKAGE_NAME = "io.github.francoiscampbell.xposeddatausage"
-    private val RELAY_CLASS_NAME = "io.github.francoiscampbell.xposeddatausage.model.settings.SettingsRelay"
-
-    private val prefsCache = res.getString(R.string.action_settings_update_request) + "_preferences"
+    private val prefsCache = res.getString(R.string.module_prefs_cache_name)
     private val prefs = context.getSharedPreferences(prefsCache, Context.MODE_PRIVATE)
 
     private lateinit var settingsChangedListener: OnSettingsChangedListener
@@ -51,7 +47,6 @@ class SettingsImpl : Settings {
             }
             editor.apply()
         }
-        context.sendBroadcast(Intent().setClassName(RELAY_PACKAGE_NAME, RELAY_CLASS_NAME))
     }
 
     private fun handleSettingUpdate(key: String, newValue: Any?): Unit {

diff --git a/...rc/main/kotlin/io/github/francoiscampbell/xposeddatausage/model/settings/SettingsRelay.kt b/...rc/main/kotlin/io/github/francoiscampbell/xposeddatausage/model/settings/SettingsRelay.kt
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">Xposed-DataUsage</string>
     <string name="action_settings_updated">xposeddatausage.action.SETTINGS_CHANGED</string>
-    <string name="action_settings_update_request">xposeddatausage.action.SETTINGS_UPDATE_REQUEST</string>
+    <string name="module_prefs_cache_name">io.github.francoiscampbell.xposeddatausage.Module_preferences</string>
 
 </resources>