Merge pull request #504 from KieronQuinn/release/1.3

1.3
KieronQuinn · Mar 25, 2022 · c271541 · c271541
2 parents 7e848b1 + ed07abe
commit c271541
Show file tree

Hide file tree

Showing 55 changed files with 1,022 additions and 190 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ plugins {
 //Permission for Columbus to use
 rootProject.ext.set("columbusPermission", "com.google.android.columbus.taptap.permission.CONFIGURE_COLUMBUS_GESTURE")
 
-def tagName = '1.2'
+def tagName = '1.3'
 
 android {
     compileSdk 32
@@ -21,7 +21,7 @@ android {
         applicationId "com.kieronquinn.app.taptap"
         minSdk 24
         targetSdk 32
-        versionCode 1200
+        versionCode 1300
         versionName tagName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -87,13 +87,13 @@ dependencies {
     implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
 
     //Room
-    def room_version = "2.4.1"
+    def room_version = "2.4.2"
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
 
     //MD3
-    implementation 'com.google.android.material:material:1.6.0-alpha02'
+    implementation 'com.google.android.material:material:1.6.0-beta01'
 
     //MonetCompat for Monet backwards compatibility
     implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
@@ -112,7 +112,7 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
 
     //Gson for serialization
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
     //Columbus module is separate to make it easier to work with
     implementation project(path: ':columbus')
@@ -127,7 +127,7 @@ dependencies {
     compileOnly project(path: ':systemstubs')
 
     //Bypass hidden API requirements for Shizuku + more
-    implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:4.2'
+    implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:4.3'
 
     //Tasker library to fire events
     implementation 'com.joaomgcd:taskerpluginlibrary:0.4.2'
@@ -138,7 +138,7 @@ dependencies {
     implementation "dev.rikka.shizuku:provider:$shizuku_version"
     implementation "dev.rikka.tools.refine:runtime:$refine_version"
 
-    def libsuVersion = '3.2.1'
+    def libsuVersion = '4.0.0'
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:service:${libsuVersion}"
 
@@ -155,7 +155,7 @@ dependencies {
     implementation "io.noties.markwon:core:4.6.2"
 
     //Lottie for animations
-    implementation 'com.airbnb.android:lottie:4.2.2'
+    implementation 'com.airbnb.android:lottie:5.0.3'
 
     //Process Phoenix to fully restart the app when needed
     implementation 'com.jakewharton:process-phoenix:2.1.2'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -18,6 +19,8 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
     <uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
+    <uses-permission android:name="android.permission.READ_LOGS"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS"
         tools:ignore="HighSamplingRate" />
 
@@ -36,6 +39,7 @@
         <activity
             android:name=".ui.activities.MainActivity"
             android:screenOrientation="portrait"
+            android:launchMode="singleInstance"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/aidl/com/kieronquinn/app/taptap/root/ITapTapRootService.aidl b/app/src/main/aidl/com/kieronquinn/app/taptap/root/ITapTapRootService.aidl
@@ -6,6 +6,7 @@ import com.kieronquinn.app.taptap.models.service.ActivityContainer;
 interface ITapTapRootService {
     SnapchatQuickTapState isSnapchatQuickTapToSnapEnabled();
     void applySnapchatOverride();
+    void grantReadLogsPermission();
 
     int startActivityPrivileged(in ActivityContainer activityContainer, in Intent intent);
 }
diff --git a/app/src/main/aidl/com/kieronquinn/app/taptap/shizuku/ITapTapShizukuService.aidl b/app/src/main/aidl/com/kieronquinn/app/taptap/shizuku/ITapTapShizukuService.aidl
@@ -5,6 +5,7 @@ import com.kieronquinn.app.taptap.contexthub.IRemoteContextHubClient;
 interface ITapTapShizukuService {
 
     IRemoteContextHubClient getRemoteContextHubClient() = 1;
+    void grantReadLogsPermission() = 2;
 
     void destroy() = 16777114;
 

diff --git a/app/src/main/aidl/com/kieronquinn/app/taptap/shizuku/ITapTapShizukuShellService.aidl b/app/src/main/aidl/com/kieronquinn/app/taptap/shizuku/ITapTapShizukuShellService.aidl
@@ -17,6 +17,8 @@ interface ITapTapShizukuShellService {
 
     void clickQuickSetting(String component) = 5;
 
+    void grantReadLogsPermission() = 6;
+
     void destroy() = 16777114;
 
 }
diff --git a/app/src/main/java/com/kieronquinn/app/taptap/TapTap.kt b/app/src/main/java/com/kieronquinn/app/taptap/TapTap.kt
@@ -1,7 +1,6 @@
 package com.kieronquinn.app.taptap
 
 import android.app.Application
-import android.app.IActivityManager
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
@@ -18,10 +17,7 @@ import com.kieronquinn.app.taptap.components.blur.BlurProvider
 import com.kieronquinn.app.taptap.components.columbus.ColumbusServiceSettings
 import com.kieronquinn.app.taptap.components.columbus.TapTapColumbusService
 import com.kieronquinn.app.taptap.components.columbus.adjustments.SensitivityAdjustment
-import com.kieronquinn.app.taptap.components.columbus.sensors.ServiceEventEmitter
-import com.kieronquinn.app.taptap.components.columbus.sensors.ServiceEventEmitterImpl
-import com.kieronquinn.app.taptap.components.columbus.sensors.TapTapCHREGestureSensor
-import com.kieronquinn.app.taptap.components.columbus.sensors.TapTapGestureSensorImpl
+import com.kieronquinn.app.taptap.components.columbus.sensors.*
 import com.kieronquinn.app.taptap.components.navigation.*
 import com.kieronquinn.app.taptap.components.service.TapTapServiceRouter
 import com.kieronquinn.app.taptap.components.service.TapTapServiceRouterImpl
@@ -115,6 +111,8 @@ import com.kieronquinn.app.taptap.ui.screens.settings.modelpicker.SettingsModelP
 import com.kieronquinn.app.taptap.ui.screens.settings.modelpicker.SettingsModelPickerViewModelImpl
 import com.kieronquinn.app.taptap.ui.screens.settings.more.SettingsMoreViewModel
 import com.kieronquinn.app.taptap.ui.screens.settings.more.SettingsMoreViewModelImpl
+import com.kieronquinn.app.taptap.ui.screens.settings.nativemode.SettingsNativeModeViewModel
+import com.kieronquinn.app.taptap.ui.screens.settings.nativemode.SettingsNativeModeViewModelImpl
 import com.kieronquinn.app.taptap.ui.screens.settings.options.SettingsOptionsViewModel
 import com.kieronquinn.app.taptap.ui.screens.settings.options.SettingsOptionsViewModelImpl
 import com.kieronquinn.app.taptap.ui.screens.settings.shared.internet.SettingsSharedInternetPermissionDialogViewModel
@@ -166,7 +164,6 @@ import org.koin.core.context.startKoin
 import org.koin.core.scope.Scope
 import org.koin.dsl.module
 import org.lsposed.hiddenapibypass.HiddenApiBypass
-import rikka.shizuku.SystemServiceHelper
 
 class TapTap : Application() {
 
@@ -178,7 +175,7 @@ class TapTap : Application() {
         single { BlurProvider.getBlurProvider(resources) }
         single { Gson() }
         single { createMarkwon() }
-        single<TapTapSettings> { TapTapSettingsImpl(get()) }
+        single<TapTapSettings> { TapTapSettingsImpl(get(), get()) }
         single<TapTapAccessibilityRouter> { TapTapAccessibilityRouterImpl() }
         single<TapTapServiceRouter> { TapTapServiceRouterImpl() }
         single<SuiProvider>(createdAtStart = true) { SuiProviderImpl() }
@@ -247,6 +244,7 @@ class TapTap : Application() {
         viewModel<SetupCompleteViewModel> { SetupCompleteViewModelImpl(get(), get()) }
         viewModel<SetupUpgradeViewModel> { SetupUpgradeViewModelImpl(get(), get()) }
         viewModel<DisableColumbusViewModel> { DisableColumbusViewModelImpl(get(), get()) }
+        viewModel<SettingsNativeModeViewModel> { SettingsNativeModeViewModelImpl(get(), get(), get()) }
     }
 
     private val navigationModule = module {
@@ -282,6 +280,12 @@ class TapTap : Application() {
         }
     }
 
+    private val nativeModeModule = module {
+        scope<SettingsNativeModeViewModelImpl> {
+            scoped<TapTapShizukuServiceRepository> { TapTapShizukuServiceRepositoryImpl(get(), this, false) }
+        }
+    }
+
     private fun Scope.createGestureSensor(): GestureSensor {
         val columbusInitializer = get<ColumbusServiceSettings>()
         val demoModeRepository = get<DemoModeRepository>()
@@ -291,29 +295,42 @@ class TapTap : Application() {
         val useContextHub = if(demoModeRepository.isDemoModeEnabled()){
             demoModeRepository.getUseContextHub()
         }else columbusInitializer.useContextHub
-        return if (useContextHub) {
-            TapTapCHREGestureSensor(
-                get(),
-                columbusInitializer.lifecycleOwner,
-                get(),
-                get(),
-                get(),
-                get(),
-                get(),
-                mainHandler,
-                get(),
-                isTripleTapEnabled
-            )
-        } else {
-            TapTapGestureSensorImpl(
-                this@TapTap,
-                mainHandler,
-                isTripleTapEnabled,
-                get(),
-                this,
-                columbusInitializer.tapModel,
-                get()
-            )
+        val useContextHubLogging = if(demoModeRepository.isDemoModeEnabled()){
+            demoModeRepository.getUseContextHub()
+        }else columbusInitializer.useContextHubLogging
+        return when {
+            useContextHub -> {
+                TapTapCHREGestureSensor(
+                    get(),
+                    columbusInitializer.lifecycleOwner,
+                    get(),
+                    get(),
+                    get(),
+                    get(),
+                    get(),
+                    mainHandler,
+                    get(),
+                    isTripleTapEnabled
+                )
+            }
+            useContextHubLogging -> {
+                TapTapCHRELogSensor(
+                    this,
+                    columbusInitializer.isTripleTapEnabled,
+                    get()
+                )
+            }
+            else -> {
+                TapTapGestureSensorImpl(
+                    this@TapTap,
+                    mainHandler,
+                    isTripleTapEnabled,
+                    get(),
+                    this,
+                    columbusInitializer.tapModel,
+                    get()
+                )
+            }
         }
     }
 
@@ -370,7 +387,7 @@ class TapTap : Application() {
         )
         startKoin {
             androidContext(this@TapTap)
-            modules(singlesModule, repositoriesModule, navigationModule, viewModelModule, appShortcutsModule, columbusModule)
+            modules(singlesModule, repositoriesModule, navigationModule, viewModelModule, appShortcutsModule, nativeModeModule, columbusModule)
         }
         setupCrashReporting()
         setupMonet()

diff --git a/app/src/main/java/com/kieronquinn/app/taptap/components/columbus/ColumbusServiceSettings.kt b/app/src/main/java/com/kieronquinn/app/taptap/components/columbus/ColumbusServiceSettings.kt
@@ -18,6 +18,7 @@ data class ColumbusServiceSettings (
     private var _feedbackEffects: List<TapTapFeedbackEffect>? = null,
     private var _isTripleTapEnabled: Boolean? = null,
     private var _useContextHub: Boolean? = null,
+    private var _useContextHubLogging: Boolean? = null,
     private var _tapModel: TapModel? = null
 ): KoinComponent {
 
@@ -42,6 +43,9 @@ data class ColumbusServiceSettings (
     val useContextHub
         get() = _useContextHub ?: throw NullPointerException("useContextHub not set in ColumbusServiceSettings")
 
+    val useContextHubLogging
+        get() = _useContextHubLogging ?: throw NullPointerException("useContextHubLogging not set in ColumbusServiceSettings")
+
     val tapModel
         get() = _tapModel ?: throw NullPointerException("tapModel not set in ColumbusServiceSettings")
 
@@ -73,6 +77,10 @@ data class ColumbusServiceSettings (
         this._useContextHub = enabled
     }
 
+    fun setUseContextHubLogging(enabled: Boolean) {
+        this._useContextHubLogging = enabled
+    }
+
     fun setTapModel(tapModel: TapModel) {
         this._tapModel = tapModel
     }

diff --git a/...main/java/com/kieronquinn/app/taptap/components/columbus/actions/custom/SnapchatAction.kt b/...main/java/com/kieronquinn/app/taptap/components/columbus/actions/custom/SnapchatAction.kt
@@ -5,13 +5,15 @@ import android.content.ActivityNotFoundException
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.provider.MediaStore
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.google.android.columbus.feedback.FeedbackEffect
 import com.google.android.columbus.sensors.GestureSensor
 import com.kieronquinn.app.taptap.components.accessibility.TapTapAccessibilityRouter
 import com.kieronquinn.app.taptap.components.columbus.actions.TapTapAction
 import com.kieronquinn.app.taptap.components.columbus.gates.TapTapWhenGate
+import com.kieronquinn.app.taptap.utils.extensions.EXTRA_KEY_IS_FROM_COLUMBUS
 import com.kieronquinn.app.taptap.utils.extensions.isAppLaunchable
 import kotlinx.coroutines.flow.*
 import org.koin.core.component.inject
@@ -27,7 +29,6 @@ class SnapchatAction(
 
     companion object {
         const val PACKAGE_NAME = "com.snapchat.android"
-        val LAUNCH_COMPONENT = ComponentName("com.snapchat.android", "com.snap.samples.catalina.CatalinaActivity")
     }
 
     override val tag = "SnapchatAction"
@@ -63,8 +64,9 @@ class SnapchatAction(
         if(showOverlayNotificationIfNeeded()) return
         if(keyguardManager.isKeyguardLocked) {
             try {
-                context.startActivity(Intent().apply {
-                    component = LAUNCH_COMPONENT
+                context.startActivity(Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE).apply {
+                    `package` = PACKAGE_NAME
+                    putExtra(EXTRA_KEY_IS_FROM_COLUMBUS, true)
                     addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 })
             } catch (e: ActivityNotFoundException) {