Skip to content

Commit 9f2da9d

Browse files
authored
Merge pull request #27 from KieronQuinn/release/1.3.1
1.3.1
2 parents 001d66b + db5ef9a commit 9f2da9d

File tree

7 files changed

+29
-26
lines changed

7 files changed

+29
-26
lines changed

.idea/modules.xml

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Controls/src/main/java/com/android/settingslib/applications/DefaultAppInfo.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,13 @@ public String getKey() {
137137

138138
private ComponentInfo getComponentInfo() {
139139
try {
140-
ComponentInfo componentInfo = AppGlobals.getPackageManager().getActivityInfo(
141-
componentName, 0, userId);
140+
ComponentInfo componentInfo = mContext.getPackageManager()
141+
.getActivityInfo(componentName, 0);
142142
if (componentInfo == null) {
143-
componentInfo = AppGlobals.getPackageManager().getServiceInfo(
144-
componentName, 0, userId);
143+
componentInfo = mContext.getPackageManager().getServiceInfo(componentName, 0);
145144
}
146145
return componentInfo;
147-
} catch (RemoteException e) {
146+
} catch (PackageManager.NameNotFoundException e) {
148147
return null;
149148
}
150149
}

app/build.gradle

+13-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
id 'com.google.android.gms.oss-licenses-plugin'
88
}
99

10-
def version = '1.3'
10+
def version = '1.3.1'
1111

1212
android {
1313
compileSdk 31
@@ -16,7 +16,7 @@ android {
1616
applicationId "com.kieronquinn.app.classicpowermenu"
1717
minSdk 30
1818
targetSdk 31
19-
versionCode 13
19+
versionCode 131
2020
versionName version
2121

2222
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -73,23 +73,23 @@ dependencies {
7373
//AndroidX
7474
def lifecycle_version = "2.4.0"
7575
implementation 'androidx.core:core-ktx:1.7.0'
76-
implementation 'androidx.appcompat:appcompat:1.3.1'
76+
implementation 'androidx.appcompat:appcompat:1.4.1'
7777
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
7878
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
7979
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
8080
implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
81-
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
82-
implementation 'androidx.lifecycle:lifecycle-service:2.3.1'
83-
implementation 'androidx.work:work-runtime-ktx:2.7.0'
84-
implementation "androidx.core:core-splashscreen:1.0.0-alpha02"
81+
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
82+
implementation 'androidx.lifecycle:lifecycle-service:2.4.0'
83+
implementation 'androidx.work:work-runtime-ktx:2.7.1'
84+
implementation "androidx.core:core-splashscreen:1.0.0-beta01"
8585
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
8686
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
8787

8888
//Material
89-
implementation 'com.google.android.material:material:1.4.0'
89+
implementation 'com.google.android.material:material:1.5.0'
9090

9191
//Monet
92-
implementation 'com.github.KieronQuinn:MonetCompat:0.2.1'
92+
implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
9393

9494
//Dependency injection
9595
implementation "io.insert-koin:koin-android:$koin_version"
@@ -117,13 +117,13 @@ dependencies {
117117
implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
118118

119119
//libsu for root operations
120-
def libsuVersion = '3.1.2'
120+
def libsuVersion = '3.2.1'
121121
implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
122122
implementation "com.github.topjohnwu.libsu:service:${libsuVersion}"
123123
implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
124124

125125
//Shizuku for helpful system service code (wallet/controls don't work with just Shizuku)
126-
def shizuku_version = '11.0.3'
126+
def shizuku_version = '12.1.0'
127127
implementation "dev.rikka.shizuku:api:$shizuku_version"
128128

129129
//Xposed
@@ -137,8 +137,8 @@ dependencies {
137137
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
138138

139139
//Other third party
140-
implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:2.0'
141-
implementation 'com.airbnb.android:lottie:4.2.0'
140+
implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:4.2'
141+
implementation 'com.airbnb.android:lottie:4.2.2'
142142
implementation 'com.jakewharton:process-phoenix:2.1.2'
143143
implementation 'me.saket:better-link-movement-method:2.2.0'
144144
implementation "io.noties.markwon:core:4.6.2"

app/release/output-metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 13,
15-
"versionName": "1.3",
14+
"versionCode": 131,
15+
"versionName": "1.3.1",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

app/src/main/java/com/kieronquinn/app/classicpowermenu/ClassicPowerMenu.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class ClassicPowerMenu: LifecycleApplication() {
167167
override fun onCreate() {
168168
super.onCreate()
169169
Shell.setDefaultBuilder(Shell.Builder.create().setFlags(Shell.FLAG_MOUNT_MASTER));
170-
HiddenApiBypass.addHiddenApiExemptions("L")
170+
HiddenApiBypass.addHiddenApiExemptions("")
171171
startKoin {
172172
androidContext(this@ClassicPowerMenu)
173173
modules(singletonsModule, serviceModule, walletModule, monetModule, viewModelModule)

app/src/main/java/com/kieronquinn/app/classicpowermenu/service/container/CPMServiceContainer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class CPMServiceContainerImpl(context: Context): CPMServiceContainer {
3131

3232
@Synchronized
3333
override suspend fun <T> runWithService(block: suspend (IClassicPowerMenu) -> T): T {
34-
val service = withContext(Dispatchers.IO) {
34+
val service = withContext(Dispatchers.Main){
3535
getServiceLocked()
3636
}
3737
return block(service)

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.koin_version = '3.1.2'
4-
ext.nav_version = "2.3.5"
3+
ext.koin_version = '3.1.5'
4+
ext.nav_version = "2.4.1"
55
ext.protobufVersion = '0.8.17'
66
repositories {
77
google()
88
mavenCentral()
99
maven { url 'https://api.xposed.info/' }
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:7.0.3'
13-
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
12+
classpath 'com.android.tools.build:gradle:7.0.4'
13+
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
1414
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
1515
classpath "com.google.protobuf:protobuf-gradle-plugin:$protobufVersion"
1616
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.4'

0 commit comments

Comments
 (0)