Added boot completed receiver to send settings to module. This avoids…

… problems with SELinux blocking access to the shared preferences. Bumped version to 1.41.

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "io.github.francoiscampbell.xposeddatausage"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 15
-        versionName "1.40"
+        versionCode 16
+        versionName "1.41"
     }
     buildTypes {
         release {

app/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.github.francoiscampbell.xposeddatausage">
 
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
     <application
         android:name=".DataUsageApplication"
         android:allowBackup="true"
@@ -39,6 +41,13 @@
             </intent-filter>
         </activity-alias>
 
+        <receiver android:name=".nonmodule.BootCompletedReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
 
     </application>
 

app/src/main/kotlin/io/github/francoiscampbell/xposeddatausage/Module.kt

@@ -8,7 +8,6 @@ import de.robv.android.xposed.callbacks.XC_InitPackageResources
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 import io.github.francoiscampbell.xposeddatausage.di.AppModule
 import io.github.francoiscampbell.xposeddatausage.di.DaggerAppComponent
-import io.github.francoiscampbell.xposeddatausage.di.RootModule
 import io.github.francoiscampbell.xposeddatausage.log.XposedLog
 import io.github.francoiscampbell.xposeddatausage.util.hookLayout
 import io.github.francoiscampbell.xposeddatausage.util.registerReceiver
@@ -18,26 +17,24 @@ import io.github.francoiscampbell.xposeddatausage.util.registerReceiver
  */
 class Module() : IXposedHookZygoteInit, IXposedHookLoadPackage, IXposedHookInitPackageResources {
     companion object {
-        private lateinit var rootModule: RootModule
+        private lateinit var modulePath: String
 
-        const val PACKAGE_MODULE = "io.github.francoiscampbell.xposeddatausage"
         private const val PACKAGE_SYSTEM_UI = "com.android.systemui"
         private const val PACKAGE_ANDROID_SYSTEM = "android"
         private const val CLASS_NAME_CONTEXT = "android.app.ContextImpl"
         private const val PERMISSION_READ_NETWORK_USAGE_HISTORY = "android.permission.READ_NETWORK_USAGE_HISTORY"
     }
 
     override fun initZygote(startupParam: IXposedHookZygoteInit.StartupParam) {
-        rootModule = RootModule(startupParam.modulePath)
+        modulePath = startupParam.modulePath
     }
 
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
         if (lpparam.packageName != PACKAGE_ANDROID_SYSTEM) {
             return
         }
 
-        XposedLog.i("Nuking permission check")
-
+        XposedLog.i("Nuking PERMISSION_READ_NETWORK_USAGE_HISTORY check")
         XposedHelpers.findAndHookMethod(
                 CLASS_NAME_CONTEXT,
                 lpparam.classLoader,
@@ -67,8 +64,7 @@ class Module() : IXposedHookZygoteInit, IXposedHookLoadPackage, IXposedHookInitP
             val hookedContext = liparam.view.context
 
             val dataUsageView = DaggerAppComponent.builder()
-                    .rootModule(rootModule)
-                    .appModule(AppModule(hookedContext, liparam))
+                    .appModule(AppModule(modulePath, hookedContext, liparam))
                     .build()
                     .dataUsageView()
 

app/src/main/kotlin/io/github/francoiscampbell/xposeddatausage/di/AppComponent.kt

@@ -6,7 +6,7 @@ import io.github.francoiscampbell.xposeddatausage.widget.DataUsageView
 /**
  * Created by francois on 16-03-30.
  */
-@Component(modules = arrayOf(RootModule::class, AppModule::class))
+@Component(modules = arrayOf(AppModule::class))
 interface AppComponent {
-        fun dataUsageView(): DataUsageView
+    fun dataUsageView(): DataUsageView
 }

app/src/main/kotlin/io/github/francoiscampbell/xposeddatausage/di/AppModule.kt

@@ -1,6 +1,7 @@
 package io.github.francoiscampbell.xposeddatausage.di
 
 import android.content.Context
+import android.content.res.XModuleResources
 import android.net.ConnectivityManager
 import android.net.INetworkStatsService
 import android.net.TrafficStats
@@ -23,8 +24,14 @@ import javax.inject.Named
  * Created by francois on 16-03-30.
  */
 @Module
-open class AppModule(private val hookedContext: Context,
+open class AppModule(private val xposedModulePath: String,
+                     private val hookedContext: Context,
                      private val liparam: XC_LayoutInflated.LayoutInflatedParam) {
+    @Provides
+    fun provideXModuleResources(): XModuleResources {
+        return XModuleResources.createInstance(xposedModulePath, null)
+    }
+
     @Provides
     @Named("ui")
     fun provideUiContext() = hookedContext

app/src/main/kotlin/io/github/francoiscampbell/xposeddatausage/log/XposedLog.kt

@@ -13,15 +13,20 @@ object XposedLog {
     var debugLogging = false
 
     fun i(message: String) {
+        Log.i(xposedTag, "$tag/$message")
+    }
+
+    fun d(message: String) {
         if (BuildConfig.DEBUG || debugLogging) {
             Log.i(xposedTag, "$tag/$message")
         }
     }
 
     fun e(message: String, throwable: Throwable? = null) {
-        when (BuildConfig.DEBUG || debugLogging) {
-            true -> Log.e(xposedTag, "$tag/$message/${Log.getStackTraceString(throwable)}")
-            false -> Log.e(xposedTag, "$tag/$message")
+        if (BuildConfig.DEBUG || debugLogging) {
+            Log.e(xposedTag, "$tag/$message/${Log.getStackTraceString(throwable)}")
+        } else {
+            Log.e(xposedTag, "$tag/$message")
         }
     }
 }

app/src/main/kotlin/io/github/francoiscampbell/xposeddatausage/model/settings/SettingsImpl.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.IntentFilter
 import android.content.res.XModuleResources
 import android.graphics.Color
-import de.robv.android.xposed.XSharedPreferences
 import io.github.francoiscampbell.xposeddatausage.R
 import io.github.francoiscampbell.xposeddatausage.log.XposedLog
 import io.github.francoiscampbell.xposeddatausage.model.net.NetworkManager
@@ -20,22 +19,16 @@ import javax.inject.Named
  */
 class SettingsImpl @Inject constructor(
         @Named("app") private val context: Context,
-        private val res: XModuleResources,
-        private val prefs: XSharedPreferences
+        private val res: XModuleResources
 ) : Settings {
     private val settingsUpdatedAction = res.getString(R.string.action_settings_updated)
     private lateinit var settingsChangedListener: OnSettingsChangedListener
 
     override fun attach(listener: OnSettingsChangedListener) {
         settingsChangedListener = listener
-        sendAllSettingsToListener()
         registerSettingsReceiver()
     }
 
-    private fun sendAllSettingsToListener() {
-        prefs.apply { reload() }.all.forEach { handleSettingUpdate(it.key, it.value) }
-    }
-
     private fun registerSettingsReceiver() {
         context.registerReceiver(IntentFilter(settingsUpdatedAction)) { context, intent ->
             intent.extras?.keySet()?.forEach {
@@ -46,7 +39,7 @@ class SettingsImpl @Inject constructor(
     }
 
     private fun handleSettingUpdate(key: String, newValue: Any?): Unit {
-        XposedLog.i("$key is $newValue in ${javaClass.simpleName}")
+        XposedLog.d("$key is $newValue in ${javaClass.simpleName}")
         if (newValue == null) return
         settingsChangedListener.run {
             @Suppress("UNCHECKED_CAST")
@@ -80,8 +73,6 @@ class SettingsImpl @Inject constructor(
                 res.getString(R.string.pref_debug_logging_key) -> onDebugLoggingChanged(newValue as Boolean)
             }
         }
-
-        XposedLog.i("Debug logging is ${XposedLog.debugLogging} in SettingsImpl")
     }
 
     private fun networkTypeNamesToEnum(networkTypeNames: Set<String>): Set<NetworkManager.NetworkType> {

app/src/main/kotlin/io/github/francoiscampbell/xposeddatausage/nonmodule/BootCompletedReceiver.kt

@@ -0,0 +1,17 @@
+package io.github.francoiscampbell.xposeddatausage.nonmodule
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+
+/**
+ * Created by francois on 2016-07-08.
+ */
+class BootCompletedReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        SettingsChangeActions(context).apply {
+            startListeningForChanges()
+            stopListeningForChanges()
+        }
+    }
+}

app/src/main/kotlin/io/github/francoiscampbell/xposeddatausage/nonmodule/SettingsChangeActions.kt

@@ -23,7 +23,7 @@ class SettingsChangeActions(
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
         val newPrefValue = sharedPreferences.all[key]
-        XposedLog.i("$key changed to $newPrefValue in ${javaClass.simpleName}")
+        XposedLog.d("$key changed to $newPrefValue in ${javaClass.simpleName}")
 
         if (isPrefForApp(key)) {
             handleAppPrefChange(key, newPrefValue)
@@ -38,13 +38,13 @@ class SettingsChangeActions(
     }
 
     fun startListeningForChanges() {
-        XposedLog.i("startBroadcastingChanges")
+        XposedLog.d("startBroadcastingChanges")
         prefs.all.forEach { onSharedPreferenceChanged(prefs, it.key) } //push settings to module when opening the settings app
         prefs.registerOnSharedPreferenceChangeListener(this)
     }
 
     fun stopListeningForChanges() {
-        XposedLog.i("stopBroadcastingChanges")
+        XposedLog.d("stopBroadcastingChanges")
         prefs.unregisterOnSharedPreferenceChangeListener(this)
     }
 

app/src/main/kotlin/io/github/francoiscampbell/xposeddatausage/nonmodule/SettingsFragment.kt

@@ -31,7 +31,7 @@ class SettingsFragment : PreferenceFragment() {
 
         settingsChangeActions.startListeningForChanges()
 
-        XposedLog.i("Debug logging is ${XposedLog.debugLogging} in SettingsFragment")
+        XposedLog.d("Debug logging is ${XposedLog.debugLogging} in SettingsFragment")
     }
 
     override fun onPause() {