Merge pull request #57 from KieronQuinn/release/1.5.1

KieronQuinn · web-flow · commit 18eb1f054964 · 2022-07-08T19:37:10.000+01:00
1.5.1
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,17 +6,18 @@ plugins {
     id 'kotlin-parcelize'
     id 'com.google.android.gms.oss-licenses-plugin'
 }
+apply plugin: 'kotlin-android'
 
-def version = '1.5'
+def version = '1.5.1'
 
 android {
-    compileSdk 31
+    compileSdk 32
 
     defaultConfig {
         applicationId "com.kieronquinn.app.classicpowermenu"
         minSdk 30
         targetSdk 31
-        versionCode 150
+        versionCode 151
         versionName version
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -147,4 +148,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation "androidx.core:core-ktx:+"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 150,
-      "versionName": "1.5",
+      "versionCode": 151,
+      "versionName": "1.5.1",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuButtonsAdapter.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuButtonsAdapter.kt
@@ -288,6 +288,7 @@ class PowerMenuButtonsAdapter(context: Context, var items: MutableList<PowerMenu
                     notifyItemChanged(itemIndex)
                 }
             }
+            else -> {}
         }
     }
 
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/update/UpdateDownloadBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/update/UpdateDownloadBottomSheetFragment.kt
@@ -62,6 +62,7 @@ class UpdateDownloadBottomSheetFragment: BaseBottomSheetFragment<FragmentUpdateD
                         Toast.makeText(requireContext(), R.string.bs_update_download_failed, Toast.LENGTH_LONG).show()
                         dismiss()
                     }
+                    else -> {}
                 }
             }
         }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+IActivityManager.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+IActivityManager.kt
@@ -9,6 +9,9 @@ import android.content.Intent
 import android.os.Build
 import android.os.IBinder
 import androidx.core.os.BuildCompat
+import java.lang.Error
+import java.lang.Exception
+import kotlin.reflect.KFunction6
 
 /**
  *  Handles differences between calls on Android 11 and 12+
@@ -21,64 +24,109 @@ fun IActivityManager.broadcastIntentWithFeatureCompat(
     intentType: String?,
     identifier: Int
 ) {
-    when {
-        BuildCompat.isAtLeastT() -> {
-            broadcastIntentWithFeature(
-                thread,
-                attributionTag,
-                intent,
-                intentType,
-                null,
-                Activity.RESULT_OK,
-                null,
-                null,
-                null,
-                null,
-                null,
-                -1,
-                null,
-                false,
-                false,
-                identifier
-            )
-        }
-        Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            broadcastIntentWithFeature(
-                thread,
-                attributionTag,
-                intent,
-                intentType,
-                null,
-                Activity.RESULT_OK,
-                null,
-                null,
-                null,
-                null,
-                -1,
-                null,
-                false,
-                false,
-                identifier
-            )
-        }
-        else -> {
-            broadcastIntentWithFeature(
-                thread,
-                attributionTag,
-                intent,
-                intentType,
-                null,
-                Activity.RESULT_OK,
-                null,
-                null,
-                null,
-                -1,
-                null,
-                false,
-                false,
-                identifier
-            )
-        }
+    val options = arrayOf(
+        IActivityManager::broadcastIntentOptionA,
+        IActivityManager::broadcastIntentOptionB,
+        IActivityManager::broadcastIntentOptionC
+    )
+    val result = options.firstOrNull {
+        it.invoke(this, thread, attributionTag, intent, intentType, identifier) == null
+    }
+    if(result == null){
+        throw NoSuchMethodError("Failed to find broadcastIntentWithFeature method")
+    }
+}
+
+private fun IActivityManager.broadcastIntentOptionA(
+    thread: IApplicationThread,
+    attributionTag: String?,
+    intent: Intent,
+    intentType: String?,
+    identifier: Int
+): Throwable? {
+    return try {
+        broadcastIntentWithFeature(
+            thread,
+            attributionTag,
+            intent,
+            intentType,
+            null,
+            Activity.RESULT_OK,
+            null,
+            null,
+            null,
+            null,
+            null,
+            -1,
+            null,
+            false,
+            false,
+            identifier
+        )
+        null
+    }catch (e: NoSuchMethodError){
+        e
+    }
+}
+
+private fun IActivityManager.broadcastIntentOptionB(
+    thread: IApplicationThread,
+    attributionTag: String?,
+    intent: Intent,
+    intentType: String?,
+    identifier: Int
+): Throwable? {
+    return try {
+        broadcastIntentWithFeature(
+            thread,
+            attributionTag,
+            intent,
+            intentType,
+            null,
+            Activity.RESULT_OK,
+            null,
+            null,
+            null,
+            null,
+            -1,
+            null,
+            false,
+            false,
+            identifier
+        )
+        null
+    }catch (e: NoSuchMethodError){
+        e
+    }
+}
+
+private fun IActivityManager.broadcastIntentOptionC(
+    thread: IApplicationThread,
+    attributionTag: String?,
+    intent: Intent,
+    intentType: String?,
+    identifier: Int
+): Throwable? {
+    return try {
+        broadcastIntentWithFeature(
+            thread,
+            attributionTag,
+            intent,
+            intentType,
+            null,
+            Activity.RESULT_OK,
+            null,
+            null,
+            null,
+            -1,
+            null,
+            false,
+            false,
+            identifier
+        )
+        null
+    }catch (e: NoSuchMethodError){
+        e
     }
 }
 
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext.kotlin_version = '1.7.10'
     ext.koin_version = '3.1.6'
     ext.nav_version = "2.4.2"
     ext.protobufVersion = '0.8.17'
@@ -14,6 +15,7 @@ buildscript {
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
         classpath "com.google.protobuf:protobuf-gradle-plugin:$protobufVersion"
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/systemstubs/build.gradle b/systemstubs/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'kotlin-android'
 }
 
 android {
@@ -23,12 +22,8 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.21"
     implementation 'androidx.annotation:annotation:1.2.0'
 }
diff --git a/systemstubs/src/main/java/android/app/IActivityManager.java b/systemstubs/src/main/java/android/app/IActivityManager.java
@@ -8,10 +8,8 @@
 
 public interface IActivityManager extends android.os.IInterface {
 
-    abstract class Stub extends android.os.Binder implements android.app.IServiceConnection
-    {
-        public static IActivityManager asInterface(android.os.IBinder obj)
-        {
+    abstract class Stub extends android.os.Binder implements android.app.IServiceConnection {
+        public static IActivityManager asInterface(android.os.IBinder obj) {
             throw new RuntimeException("Stub!");
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,7 @@ class PowerMenuButtonsAdapter(context: Context, var items: MutableList<PowerMenu`
`288`	`288`	`notifyItemChanged(itemIndex)`
`289`	`289`	`}`
`290`	`290`	`}`
	`291`	`+ else -> {}`
`291`	`292`	`}`
`292`	`293`	`}`
`293`	`294`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ class UpdateDownloadBottomSheetFragment: BaseBottomSheetFragment<FragmentUpdateD`
`62`	`62`	`Toast.makeText(requireContext(), R.string.bs_update_download_failed, Toast.LENGTH_LONG).show()`
`63`	`63`	`dismiss()`
`64`	`64`	`}`
	`65`	`+ else -> {}`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'com.android.library'`
`3`		`- id 'kotlin-android'`
`4`	`3`	`}`
`5`	`4`
`6`	`5`	`android {`
`@@ -23,12 +22,8 @@ android {`
`23`	`22`	`sourceCompatibility JavaVersion.VERSION_1_8`
`24`	`23`	`targetCompatibility JavaVersion.VERSION_1_8`
`25`	`24`	`}`
`26`		`- kotlinOptions {`
`27`		`- jvmTarget = '1.8'`
`28`		`- }`
`29`	`25`	`}`
`30`	`26`
`31`	`27`	`dependencies {`
`32`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.21"`
`33`	`28`	`implementation 'androidx.annotation:annotation:1.2.0'`
`34`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,8 @@`
`8`	`8`
`9`	`9`	`public interface IActivityManager extends android.os.IInterface {`
`10`	`10`
`11`		`- abstract class Stub extends android.os.Binder implements android.app.IServiceConnection`
`12`		`- {`
`13`		`- public static IActivityManager asInterface(android.os.IBinder obj)`
`14`		`- {`
	`11`	`+ abstract class Stub extends android.os.Binder implements android.app.IServiceConnection {`
	`12`	`+ public static IActivityManager asInterface(android.os.IBinder obj) {`
`15`	`13`	`throw new RuntimeException("Stub!");`
`16`	`14`	`}`
`17`	`15`	`}`