Merge pull request #81 from KieronQuinn/release/2.0.5

- Fixed an issue where on device recognition would not work on some d…
KieronQuinn · Jun 30, 2022 · 3953d65 · 3953d65
2 parents b71c3a1 + 7b7f34d
commit 3953d65
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 
 String DEFAULT_MANIFEST = "217:https://storage.googleapis.com/music-iq-db/updatable_ytm_db/20220626-030028/manifest.json"
 
-def tagName = '2.0.4'
-def version = 204
+def tagName = '2.0.5'
+def version = 205
 
 def getKeystoreProperties() {
     def properties = new Properties()

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 203,
-      "versionName": "2.0.3",
+      "versionCode": 205,
+      "versionName": "2.0.5",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/kieronquinn/app/ambientmusicmod/service/ShizukuService.kt b/app/src/main/java/com/kieronquinn/app/ambientmusicmod/service/ShizukuService.kt
@@ -37,7 +37,7 @@ class ShizukuService: IShellProxy.Stub() {
     companion object {
         const val ROOT_UID = 0
         const val SHELL_UID = 2000
-        const val ROOT_PACKAGE = "root"
+        const val ROOT_PACKAGE = "android"
         const val SHELL_PACKAGE = "com.android.shell"
     }
 

diff --git a/app/src/main/java/com/kieronquinn/app/ambientmusicmod/utils/context/ShellContext.kt b/app/src/main/java/com/kieronquinn/app/ambientmusicmod/utils/context/ShellContext.kt
@@ -4,9 +4,9 @@ import android.annotation.SuppressLint
 import android.content.AttributionSource
 import android.content.Context
 import android.content.ContextWrapper
-import android.util.Log
 import com.kieronquinn.app.ambientmusicmod.service.ShizukuService.Companion.ROOT_PACKAGE
 import com.kieronquinn.app.ambientmusicmod.service.ShizukuService.Companion.ROOT_UID
+import com.kieronquinn.app.ambientmusicmod.service.ShizukuService.Companion.SHELL_PACKAGE
 import com.kieronquinn.app.ambientmusicmod.service.ShizukuService.Companion.SHELL_UID
 
 class ShellContext(context: Context, private val isRoot: Boolean) : ContextWrapper(context) {
@@ -19,8 +19,6 @@ class ShellContext(context: Context, private val isRoot: Boolean) : ContextWrapp
     override fun getAttributionSource(): AttributionSource {
         val uid = if (isRoot) ROOT_UID else SHELL_UID
         return AttributionSource.Builder(uid)
-            .setPackageName(if(isRoot) "android" else ROOT_PACKAGE).build().also {
-                Log.d("RootMRM", "Getting attribution source, returning UID ${it.uid}")
-            }
+            .setPackageName(if(isRoot) ROOT_PACKAGE else SHELL_PACKAGE).build()
     }
 }