Merge pull request #9 from bakad3v/dev1

v 1.5.0

Author: bakad3v

README.md

@@ -16,14 +16,15 @@ android {
         applicationId = "com.android.aftools"
         minSdk = 26
         targetSdk = 35
-        versionCode = 6
-        versionName = "1.4.1"
+        versionCode = 7
+        versionName = "1.5.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -67,6 +68,7 @@ android {
     }
 
   buildFeatures {
+    buildConfig = true
     viewBinding = true
   }
 
@@ -100,8 +102,6 @@ dependencies {
     implementation(libs.navigation.fragment.ktx)
     implementation(libs.navigation.ui.ktx)
 
-    implementation(libs.security.crypto.ktx)
-
     coreLibraryDesugaring(libs.desugar.jdk.libs)
 
     //Better Encrypted DataStore
@@ -128,11 +128,16 @@ dependencies {
     implementation(libs.core)
     implementation(libs.storage)
 
+    //Network
+    implementation(libs.retrofit)
+    implementation(libs.converter.scalars)
+
     //Project modules dependencies
     implementation(project(":core:validators"))
     implementation(project(":core:passwordStrength"))
     implementation(project(":core:resources"))
     implementation(project(":core:utils"))
+    implementation(project(":core:network"))
     implementation(project(":features:passwordSetup"))
     implementation(project(":features:profiles"))
     implementation(project(":features:files"))
@@ -155,4 +160,5 @@ dependencies {
     implementation(project(":data:files"))
     implementation(project(":data:logs"))
     implementation(project(":data:profiles"))
+    implementation(project(":data:appUpdater"))
 }

README_RU.md

@@ -18,4 +18,18 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn org.joda.convert.FromString
+-dontwarn org.joda.convert.ToString
+-keep class androidx.datastore.*.** { *; }
+-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite* {
+    <fields>;
+}
+-dontwarn retrofit2.**
+-keep class retrofit2.** { *; }
+-keepclasseswithmembers class * {
+    @retrofit2.http.* <methods>;
+}
+-keepattributes Signature,Exceptions,*Annotation*
+-dontnote retrofit2.Platform
+-dontwarn retrofit2.Platform$Java8

app/build.gradle.kts

@@ -11,7 +11,9 @@
     android:name="android.permission.READ_EXTERNAL_STORAGE"
     android:maxSdkVersion="32" />
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-  <application
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+    <application
     android:name=".AndroidAntiForensicTools"
     android:allowBackup="true"
     android:dataExtractionRules="@xml/data_extraction_rules"

app/proguard-rules.pro

@@ -9,13 +9,15 @@ import com.sonozaki.data.settings.repositories.DeviceProtectionSettingsRepositor
 import com.sonozaki.data.settings.repositories.PermissionsRepository
 import com.sonozaki.data.settings.repositories.SettingsRepository
 import com.sonozaki.data.settings.repositories.UsbSettingsRepository
+import com.sonozaki.entities.ButtonSelected
 import com.sonozaki.entities.DeviceProtectionSettings
 import com.sonozaki.entities.Settings
 import com.sonozaki.entities.UsbSettings
 import com.sonozaki.password.repository.PasswordManager
 import com.sonozaki.triggerreceivers.services.domain.repository.ReceiversRepository
 import kotlinx.coroutines.flow.first
 import com.sonozaki.entities.Permissions
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class ReceiversAdapter @Inject constructor(
@@ -52,8 +54,16 @@ class ReceiversAdapter @Inject constructor(
         return buttonSettingsRepository.buttonSettings.first()
     }
 
-    override suspend fun getButtonClicksData(): ButtonClicksData {
-        return buttonSettingsRepository.getButtonClicksData()
+    override suspend fun getButtonClicksData(buttonSelected: ButtonSelected): ButtonClicksData {
+        return buttonSettingsRepository.getButtonClicksData(buttonSelected)
+    }
+
+    override fun getButtonSettingsFlow(): Flow<ButtonSettings> {
+        return buttonSettingsRepository.buttonSettings
+    }
+
+    override fun getPermissionsFlow(): Flow<Permissions> {
+        return permissionsRepository.permissions
     }
 
     override suspend fun onRightPassword() {
@@ -80,12 +90,12 @@ class ReceiversAdapter @Inject constructor(
         settingsRepository.setRunOnBoot(status)
     }
 
-    override suspend fun setClicksInRow(clicks: Int) {
-        buttonSettingsRepository.setClicksInRow(clicks)
+    override suspend fun setClicksInRow(clicks: Int, buttonSelected: ButtonSelected) {
+        buttonSettingsRepository.setClicksInRow(clicks, buttonSelected)
     }
 
-    override suspend fun setLastTimestamp(timestamp: Long) {
-        buttonSettingsRepository.setLastTimestamp(timestamp)
+    override suspend fun setLastTimestamp(timestamp: Long, buttonSelected: ButtonSelected) {
+        buttonSettingsRepository.setLastTimestamp(timestamp, buttonSelected)
     }
 
     override suspend fun writeToLogs(text: String) {

app/src/main/AndroidManifest.xml

@@ -1,21 +1,26 @@
 package com.android.aftools.adapters
 
-import com.sonozaki.entities.ButtonSettings
+import com.bakasoft.appupdater.repository.AppUpdateRepository
+import com.bakasoft.network.RequestResult
 import com.sonozaki.data.settings.repositories.BruteforceRepository
 import com.sonozaki.data.settings.repositories.ButtonSettingsRepository
 import com.sonozaki.data.settings.repositories.DeviceProtectionSettingsRepository
 import com.sonozaki.data.settings.repositories.PermissionsRepository
 import com.sonozaki.data.settings.repositories.SettingsRepository
 import com.sonozaki.data.settings.repositories.UsbSettingsRepository
 import com.sonozaki.entities.BruteforceSettings
+import com.sonozaki.entities.ButtonSettings
 import com.sonozaki.entities.DeviceProtectionSettings
 import com.sonozaki.entities.MultiuserUIProtection
 import com.sonozaki.entities.Permissions
+import com.sonozaki.entities.PowerButtonTriggerOptions
 import com.sonozaki.entities.Settings
 import com.sonozaki.entities.Theme
 import com.sonozaki.entities.UsbSettings
+import com.sonozaki.entities.VolumeButtonTriggerOptions
 import com.sonozaki.settings.domain.repository.SettingsScreenRepository
 import kotlinx.coroutines.flow.Flow
+import okhttp3.ResponseBody
 import javax.inject.Inject
 
 class SettingsAdapter @Inject constructor(
@@ -24,7 +29,8 @@ class SettingsAdapter @Inject constructor(
     private val buttonSettingsRepository: ButtonSettingsRepository,
     private val bruteforceRepository: BruteforceRepository,
     private val permissionsRepository: PermissionsRepository,
-    private val deviceProtectionSettingsRepository: DeviceProtectionSettingsRepository
+    private val deviceProtectionSettingsRepository: DeviceProtectionSettingsRepository,
+    private val appUpdateRepository: AppUpdateRepository
 ): SettingsScreenRepository {
     override val settings: Flow<Settings>
         get() = settingsRepository.settings
@@ -38,6 +44,8 @@ class SettingsAdapter @Inject constructor(
         get() = buttonSettingsRepository.buttonSettings
     override val deviceProtectionSettings: Flow<DeviceProtectionSettings>
         get() = deviceProtectionSettingsRepository.deviceProtectionSettings
+    override val showUpdatePopup: Flow<Boolean>
+        get() = appUpdateRepository.showUpdatePopupStatus
 
     override suspend fun setTheme(theme: Theme) {
         settingsRepository.setTheme(theme)
@@ -111,60 +119,36 @@ class SettingsAdapter @Inject constructor(
         settingsRepository.setClearItself(status)
     }
 
-    override suspend fun setUserLimit(limit: Int) {
-        settingsRepository.setUserLimit(limit)
-    }
-
-    override suspend fun getUserLimit(): Int? {
-        return settingsRepository.getUserLimit()
-    }
-
     override suspend fun setRunOnDuressPassword(status: Boolean) {
        settingsRepository.setRunOnDuressPassword(status)
     }
 
-    override suspend fun setMultiuserUIStatus(status: Boolean) {
-        settingsRepository.setMultiuserUIStatus(status)
-    }
-
-    override suspend fun setSafeBootStatus(status: Boolean) {
-        settingsRepository.setSafeBootStatus(status)
-    }
-
-    override suspend fun getSafeBootStatus(): Boolean {
-        return settingsRepository.getSafeBootStatus()
-    }
-
-    override suspend fun setSwitchUserRestriction(status: Boolean) {
-        settingsRepository.setSwitchUserRestriction(status)
-    }
-
-    override suspend fun getSwitchUserRestriction(): Boolean {
-        return settingsRepository.getSwitchUserRestriction()
+    override suspend fun updateLatency(latency: Int) {
+        buttonSettingsRepository.updateLatency(latency)
     }
 
-    override suspend fun getUserSwitcherStatus(): Boolean {
-        return settingsRepository.getUserSwitcherStatus()
+    override suspend fun updateRootLatency(latency: Int) {
+        buttonSettingsRepository.updateRootLatency(latency)
     }
 
-    override suspend fun setUserSwitcherStatus(status: Boolean) {
-        settingsRepository.setUserSwitcherStatus(status)
+    override suspend fun updateAllowedClicks(allowedClicks: Int) {
+        buttonSettingsRepository.updateAllowedClicks(allowedClicks)
     }
 
-    override suspend fun getMultiuserUIStatus(): Boolean {
-        return settingsRepository.getMultiuserUIStatus()
+    override suspend fun setTriggerOnButtonStatus(status: PowerButtonTriggerOptions) {
+        buttonSettingsRepository.setTriggerOnButtonStatus(status)
     }
 
-    override suspend fun updateLatency(latency: Int) {
-        buttonSettingsRepository.updateLatency(latency)
+    override suspend fun setTriggerOnVolumeButtonStatus(status: VolumeButtonTriggerOptions) {
+        buttonSettingsRepository.setTriggerOnVolumeButtonStatus(status)
     }
 
-    override suspend fun updateAllowedClicks(allowedClicks: Int) {
-        buttonSettingsRepository.updateAllowedClicks(allowedClicks)
+    override suspend fun setTriggerOnVolumeButtonLatency(latency: Int) {
+        buttonSettingsRepository.updateVolumeLatency(latency)
     }
 
-    override suspend fun setTriggerOnButtonStatus(status: Boolean) {
-        buttonSettingsRepository.setTriggerOnButtonStatus(status)
+    override suspend fun setVolumeButtonAllowedClicks(clicks: Int) {
+        buttonSettingsRepository.updateAllowedVolumeButtonClicks(clicks)
     }
 
     override suspend fun changeRebootDelay(delay: Int) {
@@ -182,4 +166,12 @@ class SettingsAdapter @Inject constructor(
     override suspend fun setScreenshotsStatus(status: Boolean) {
         settingsRepository.setScreenshotsStatus(status)
     }
+
+    override suspend fun disableUpdatePopup() {
+        appUpdateRepository.disableUpdatePopup()
+    }
+
+    override suspend fun downloadUpdate(): RequestResult<ResponseBody> {
+        return appUpdateRepository.downloadUpdate()
+    }
 }

app/src/main/java/com/android/aftools/adapters/ReceiversAdapter.kt

@@ -1,5 +1,7 @@
 package com.android.aftools.di
 
+import com.bakasoft.appupdater.repository.AppUpdateRepository
+import com.bakasoft.appupdater.repository.AppUpdateRepositoryImpl
 import com.sonozaki.data.files.repository.FilesRepository
 import com.sonozaki.data.files.repository.FilesRepositoryImpl
 import com.sonozaki.data.logs.repository.LogsRepositoryImpl
@@ -29,6 +31,10 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 @Module
 abstract class RepositoriesModule {
+
+    @Binds
+    @Singleton
+    abstract fun bindAppUpdateRepository(impl: AppUpdateRepositoryImpl): AppUpdateRepository
     @Binds
     @Singleton
     abstract fun bindFilesRepository(filesRepositoryImpl: FilesRepositoryImpl): FilesRepository

app/src/main/java/com/android/aftools/adapters/SettingsAdapter.kt

@@ -4,6 +4,7 @@ import com.sonozaki.entities.ButtonSettings
 import com.sonozaki.data.files.entities.FilesList
 import com.sonozaki.data.logs.entities.LogList
 import com.sonozaki.data.profiles.entities.IntList
+import com.sonozaki.data.settings.entities.ButtonSettingsV1
 import com.sonozaki.data.settings.entities.SettingsV1
 import com.sonozaki.data.settings.entities.UsbSettingsV1
 import com.sonozaki.encrypteddatastore.BaseSerializer
@@ -108,4 +109,10 @@ class SerializersModule {
     fun bindUSBV1BaseSerializer(@Named(IO_DISPATCHER) ioDispatcher: CoroutineDispatcher) =
         BaseSerializer<UsbSettingsV1>(ioDispatcher, UsbSettingsV1.serializer(),
             UsbSettingsV1())
+
+    @Provides
+    @Singleton
+    fun bindButtonSettingsV1BaseSerializer(@Named(IO_DISPATCHER) ioDispatcher: CoroutineDispatcher) =
+        BaseSerializer<ButtonSettingsV1>(ioDispatcher, ButtonSettingsV1.serializer(),
+            ButtonSettingsV1())
 }

app/src/main/java/com/android/aftools/di/RepositoriesModule.kt

@@ -0,0 +1,48 @@
+package com.android.aftools.di
+
+import com.android.aftools.BuildConfig
+import com.bakasoft.appupdater.network.DownloadAppTestVersionService
+import com.sonozaki.resources.APP_UPDATE_URL
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import retrofit2.converter.scalars.ScalarsConverterFactory
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class UpdateModule {
+
+    @Provides
+    @Singleton
+    @Named(APP_UPDATE_URL)
+    fun getUrl(): String {
+        val version = when (BuildConfig.FLAVOR_name) {
+            "island" -> "AFTools_island_TESTONLY.apk"
+            "shelter" -> "AFTools_shelter_TESTONLY.apk"
+            else -> return ""
+        }
+        return  "bakad3v/Android-AntiForensic-Tools/releases/download/v${BuildConfig.VERSION_NAME}/$version"
+    }
+
+
+    @Provides
+    @Singleton
+    fun provideRetrofit(): Retrofit {
+        return Retrofit.Builder().baseUrl(GITHUB).addConverterFactory(
+            ScalarsConverterFactory.create()).build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideUpdateService(retrofit: Retrofit): DownloadAppTestVersionService {
+       return retrofit.create(DownloadAppTestVersionService::class.java)
+    }
+
+    companion object {
+        const val GITHUB = "https://github.com/"
+    }
+}