Skip to content

Commit 9f99a46

Browse files
authored
Finally implemented write secure settings feature to Geto. We no longer need aShell. (#245)
* Finally implemented write secure settings feature to Geto. We no longer need aShell. * Added UI to Shizuku * Added UI to Shizuku attempt 1 * Cleanup shizuku implementation * 🤖 Updates baselines for Dependency Guard * Update version * Remove command dialog test * Fixed minify crash and updated fastlane * 🤖 Updates baselines for Dependency Guard * Shizuku navigation was popped * Cleanup resources * Update screenshots --------- Co-authored-by: JackEblan <JackEblan@users.noreply.github.com>
1 parent de330a4 commit 9f99a46

60 files changed

Lines changed: 1042 additions & 377 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.idea/compiler.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetSelector.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,4 @@ with `android.permission.WRITE_SECURE_SETTINGS` in order for it to modify your S
4646
# License
4747

4848
**Geto** is licensed under the GNU General Public License v3.0. See the [license](LICENSE) for more
49-
information.
50-
</div>
49+
information.

app/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232

3333
defaultConfig {
3434
applicationId = "com.android.geto"
35-
versionCode = 164
36-
versionName = "1.16.4"
35+
versionCode = 165
36+
versionName = "1.16.5"
3737

3838
// Custom test runner to set up Hilt dependency graph
3939
testInstrumentationRunner = "com.android.geto.core.testing.GetoTestRunner"
@@ -71,6 +71,7 @@ dependencies {
7171
implementation(projects.feature.home)
7272
implementation(projects.feature.service)
7373
implementation(projects.feature.settings)
74+
implementation(projects.feature.shizuku)
7475

7576
implementation(projects.broadcastReceiver)
7677
implementation(projects.foregroundService)
@@ -79,6 +80,7 @@ dependencies {
7980
implementation(projects.framework.notificationManager)
8081
implementation(projects.framework.packageManager)
8182
implementation(projects.framework.secureSettings)
83+
implementation(projects.framework.shizuku)
8284
implementation(projects.framework.shortcutManager)
8385
implementation(projects.framework.usageStatsManager)
8486

app/dependencies/releaseRuntimeClasspath.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ com.google.protobuf:protobuf-kotlin-lite:4.26.1
128128
com.squareup.okhttp3:okhttp:4.12.0
129129
com.squareup.okio:okio-jvm:3.8.0
130130
com.squareup.okio:okio:3.8.0
131+
dev.rikka.shizuku:aidl:13.1.5
132+
dev.rikka.shizuku:api:13.1.5
133+
dev.rikka.shizuku:provider:13.1.5
134+
dev.rikka.shizuku:shared:13.1.5
131135
io.coil-kt:coil-base:2.6.0
132136
io.coil-kt:coil-compose-base:2.6.0
133137
io.coil-kt:coil-compose:2.6.0

app/release-badging.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
package: name='com.android.geto' versionCode='164' versionName='1.16.4' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
2-
sdkVersion:'21'
1+
package: name='com.android.geto' versionCode='165' versionName='1.16.5' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
2+
sdkVersion:'24'
33
targetSdkVersion:'34'
44
uses-permission: name='android.permission.POST_NOTIFICATIONS'
55
uses-permission: name='android.permission.FOREGROUND_SERVICE'
66
uses-permission: name='android.permission.FOREGROUND_SERVICE_SPECIAL_USE'
77
uses-permission: name='android.permission.WRITE_SECURE_SETTINGS'
88
uses-permission: name='android.permission.PACKAGE_USAGE_STATS'
99
uses-permission: name='com.android.geto.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION'
10+
uses-permission: name='moe.shizuku.manager.permission.API_V23'
1011
application-label:'Geto'
1112
application-label-af:'Geto'
1213
application-label-am:'Geto'

app/src/main/kotlin/com/android/geto/navigation/GetoNavHost.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ import com.android.geto.feature.service.navigation.navigateToService
3939
import com.android.geto.feature.service.navigation.serviceScreen
4040
import com.android.geto.feature.settings.navigation.navigateToSettings
4141
import com.android.geto.feature.settings.navigation.settingsScreen
42+
import com.android.geto.feature.shizuku.navigation.navigateToShizuku
43+
import com.android.geto.feature.shizuku.navigation.shizukuScreen
4244
import com.android.geto.navigation.TopLevelDestination.APPS
4345
import com.android.geto.navigation.TopLevelDestination.SERVICE
4446
import com.android.geto.navigation.TopLevelDestination.SETTINGS
@@ -80,7 +82,12 @@ fun GetoNavHost(
8082
},
8183
)
8284

83-
appSettingsScreen(onNavigationIconClick = navController::navigateUp)
85+
appSettingsScreen(
86+
onNavigationIconClick = navController::navigateUp,
87+
onShizuku = navController::navigateToShizuku,
88+
)
89+
90+
shizukuScreen(onNavigationIconClick = navController::navigateUp)
8491
}
8592
}
8693

build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
5757
"androidTestImplementation",
5858
libs.findLibrary("androidx.lifecycle.runtime.testing").get(),
5959
)
60+
add(
61+
"androidTestImplementation",
62+
libs.findLibrary("androidx.test.core").get(),
63+
)
64+
6065
add("testImplementation", libs.findLibrary("androidx-navigation-testing").get())
6166
}
6267
}

build-logic/convention/src/main/kotlin/com/android/geto/KotlinAndroid.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ internal fun Project.configureKotlinAndroid(
3838
compileSdk = 34
3939

4040
defaultConfig {
41-
minSdk = 21
41+
minSdk = 24
4242
}
4343

4444
compileOptions {

0 commit comments

Comments
 (0)