fun fact: 9/10 devs have no idea why this works

Signed-off-by: androidacy-user <opensource@androidacy.com>

Author: androidacy-user

app/build.gradle.kts

@@ -499,12 +499,12 @@ dependencies {
     implementation("com.github.Fox2Code:AndroidANSI:1.2.1")
 
     // sentry
-    implementation("io.sentry:sentry-android:6.28.0")
-    implementation("io.sentry:sentry-android-timber:6.28.0")
-    implementation("io.sentry:sentry-android-fragment:6.28.0")
-    implementation("io.sentry:sentry-android-okhttp:6.28.0")
-    implementation("io.sentry:sentry-kotlin-extensions:6.28.0")
-    implementation("io.sentry:sentry-android-ndk:6.28.0")
+    implementation("io.sentry:sentry-android:6.29.0")
+    implementation("io.sentry:sentry-android-timber:6.29.0")
+    implementation("io.sentry:sentry-android-fragment:6.29.0")
+    implementation("io.sentry:sentry-android-okhttp:6.29.0")
+    implementation("io.sentry:sentry-kotlin-extensions:6.29.0")
+    implementation("io.sentry:sentry-android-ndk:6.29.0")
 
     // Markdown
     // TODO: switch to an updated implementation
@@ -554,6 +554,8 @@ dependencies {
 
     // optional - Kotlin Extensions and Coroutines support for Room
     implementation("androidx.room:room-ktx:2.5.2")
+
+    implementation("pl.droidsonroids.gif:android-gif-drawable:1.2.28")
 }
 
 android {
@@ -563,7 +565,7 @@ android {
         }
     }
 
-    ndkVersion = "25.2.9519653"
+    ndkVersion = "26.0.10636728 rc2"
     dependenciesInfo {
         includeInApk = false
         includeInBundle = false

app/src/main/kotlin/com/fox2code/mmm/NotificationType.kt

@@ -27,6 +27,7 @@ import com.fox2code.mmm.utils.IntentHelper
 import com.fox2code.mmm.utils.io.Files.Companion.patchModuleSimple
 import com.fox2code.mmm.utils.io.Files.Companion.read
 import com.fox2code.mmm.utils.io.net.Http
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import timber.log.Timber
 import java.io.BufferedReader
 import java.io.File
@@ -195,6 +196,15 @@ enum class NotificationType(
         androidx.appcompat.R.attr.colorBackgroundFloating,
         com.google.android.material.R.attr.colorOnBackground,
         View.OnClickListener { v: View? ->
+            if (MainApplication.getSharedPreferences("mmm")?.getBoolean("pref_require_security", false) == true) {
+                // block local install for safety
+                MaterialAlertDialogBuilder(v!!.context)
+                    .setTitle(R.string.install_from_storage)
+                    .setMessage(R.string.install_from_storage_safe_modules)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .show()
+                return@OnClickListener
+            }
             val compatActivity = FoxActivity.getFoxActivity(v)
             val module = File(
                 compatActivity.cacheDir, "installer" + File.separator + "module.zip"

app/src/main/kotlin/com/fox2code/mmm/SetupActivity.kt

@@ -11,6 +11,7 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Resources.Theme
+import android.net.Uri
 import android.os.Bundle
 import android.os.Process
 import android.view.View
@@ -46,6 +47,7 @@ class SetupActivity : FoxActivity(), LanguageActivity {
     private var cachedTheme = 0
 
     @SuppressLint("ApplySharedPref", "RestrictedApi")
+    @Suppress("KotlinConstantConditions", "NAME_SHADOWING")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         this.setTitle(R.string.setup_title)
@@ -69,7 +71,7 @@ class SetupActivity : FoxActivity(), LanguageActivity {
             if (ts.time > buildTime.time) {
                 val pm = packageManager
                 val intent = Intent(this, ExpiredActivity::class.java)
-                @Suppress("DEPRECATION") val resolveInfo = pm.queryIntentActivities(intent, 0)
+                val resolveInfo = pm.queryIntentActivities(intent, 0)
                 if (resolveInfo.size > 0) {
                     startActivity(intent)
                     finish()
@@ -85,6 +87,67 @@ class SetupActivity : FoxActivity(), LanguageActivity {
             }
         }
         val view: View = binding.root
+        // if our application id is "com.androidacy.mmm" or begins with it, check if com.fox2code.mmm is installed and offer to uninstall it. if we're com.fox2code.mmm, check if com.fox2code.mmm.fdroid or com.fox2code.mmm.debug is installed and offer to uninstall it
+        val ourPackageName = BuildConfig.APPLICATION_ID
+        val foxPkgName = "com.fox2code.mmm"
+        val foxPkgNameFdroid = "com.fox2code.mmm.fdroid"
+        val foxPkgNameDebug = "com.fox2code.mmm.debug"
+        val foxPkgNamePlay = "com.androidacy.mmm.play"
+        val androidacyPkgName = "com.androidacy.mmm"
+        val pm = packageManager
+        val intent = Intent(Intent.ACTION_MAIN, null)
+        intent.addCategory(Intent.CATEGORY_LAUNCHER)
+        val resolveInfoList = pm.queryIntentActivities(intent, 0)
+        for (resolveInfo in resolveInfoList) {
+            val packageName = resolveInfo.activityInfo.packageName
+            if (packageName == ourPackageName) {
+                continue
+            }
+            when (ourPackageName) {
+                foxPkgName -> {
+                    if (packageName == foxPkgNameDebug || packageName == foxPkgNameFdroid || packageName == foxPkgNamePlay) {
+                        val materialAlertDialogBuilder = MaterialAlertDialogBuilder(this)
+                        materialAlertDialogBuilder.setTitle(R.string.setup_uninstall_title)
+                        materialAlertDialogBuilder.setMessage(getString(R.string.setup_uninstall_message, packageName))
+                        materialAlertDialogBuilder.setPositiveButton(R.string.uninstall) { _: DialogInterface?, _: Int ->
+                            // start uninstall intent
+                            val intent = Intent(Intent.ACTION_DELETE)
+                            intent.data = Uri.parse("package:$packageName")
+                            startActivity(intent)
+                        }
+                        materialAlertDialogBuilder.setNegativeButton(R.string.cancel) { _: DialogInterface?, _: Int -> }
+                    }
+                }
+                androidacyPkgName -> {
+                    if (packageName == foxPkgName || packageName == foxPkgNameFdroid || packageName == foxPkgNameDebug || packageName == foxPkgNamePlay) {
+                        val materialAlertDialogBuilder = MaterialAlertDialogBuilder(this)
+                        materialAlertDialogBuilder.setTitle(R.string.setup_uninstall_title)
+                        materialAlertDialogBuilder.setMessage(getString(R.string.setup_uninstall_message, packageName))
+                        materialAlertDialogBuilder.setPositiveButton(R.string.uninstall) { _: DialogInterface?, _: Int ->
+                            // start uninstall intent
+                            val intent = Intent(Intent.ACTION_DELETE)
+                            intent.data = Uri.parse("package:$packageName")
+                            startActivity(intent)
+                        }
+                        materialAlertDialogBuilder.setNegativeButton(R.string.cancel) { _: DialogInterface?, _: Int -> }
+                    }
+                }
+                else -> {
+                    if (packageName == foxPkgNameDebug) {
+                        val materialAlertDialogBuilder = MaterialAlertDialogBuilder(this)
+                        materialAlertDialogBuilder.setTitle(R.string.setup_uninstall_title)
+                        materialAlertDialogBuilder.setMessage(getString(R.string.setup_uninstall_message, packageName))
+                        materialAlertDialogBuilder.setPositiveButton(R.string.uninstall) { _: DialogInterface?, _: Int ->
+                            // start uninstall intent
+                            val intent = Intent(Intent.ACTION_DELETE)
+                            intent.data = Uri.parse("package:$packageName")
+                            startActivity(intent)
+                        }
+                        materialAlertDialogBuilder.setNegativeButton(R.string.cancel) { _: DialogInterface?, _: Int -> }
+                    }
+                }
+            }
+        }
         (Objects.requireNonNull<Any>(view.findViewById(R.id.setup_background_update_check)) as MaterialSwitch).isChecked =
             BuildConfig.ENABLE_AUTO_UPDATER
         (Objects.requireNonNull<Any>(view.findViewById(R.id.setup_crash_reporting)) as MaterialSwitch).isChecked =
@@ -205,10 +268,16 @@ class SetupActivity : FoxActivity(), LanguageActivity {
         val setupButton = view.findViewById<BottomNavigationItemView>(R.id.setup_finish)
         // on clicking setup_agree_eula, enable the setup button if it's checked, if it's not, disable it
         val agreeEula = view.findViewById<MaterialCheckBox>(R.id.setup_agree_eula)
-        agreeEula.setOnCheckedChangeListener { _: CompoundButton?, isChecked: Boolean ->
-            setupButton.isEnabled = isChecked
-        }
         setupButton.setOnClickListener { _: View? ->
+            // if agreeEula is not checked, show a toast and return
+            if (!agreeEula.isChecked) {
+                Toast.makeText(
+                    this,
+                    R.string.setup_agree_eula_toast,
+                    Toast.LENGTH_LONG
+                ).show()
+                return@setOnClickListener
+            }
             Timber.i("Setup button clicked")
             // get instance of editor
             if (BuildConfig.DEBUG) Timber.d("Saving preferences")
@@ -247,6 +316,14 @@ class SetupActivity : FoxActivity(), LanguageActivity {
                 "pref_analytics_enabled",
                 (Objects.requireNonNull<Any>(view.findViewById(R.id.setup_app_analytics)) as MaterialSwitch).isChecked
             )
+            // setup_require_security -> pref_require_security
+            editor.putBoolean(
+                "pref_require_security", (Objects.requireNonNull<Any>(
+                    view.findViewById(
+                        R.id.setup_require_security
+                    )
+                ) as MaterialSwitch).isChecked
+            )
             if (BuildConfig.DEBUG) Timber.d("Saving preferences")
             // now basically do the same thing for room db
             val db = Room.databaseBuilder(
@@ -262,7 +339,7 @@ class SetupActivity : FoxActivity(), LanguageActivity {
             reposListDao.setEnabled(androidacyRepoRoomObj.id, androidacyRepoRoom)
             reposListDao.setEnabled(magiskAltRepoRoomObj.id, magiskAltRepoRoom)
             db.close()
-            editor.putString("last_shown_setup", "v3")
+            editor.putString("last_shown_setup", "v4")
             // Commit the changes
             editor.commit()
             // Log the changes
@@ -415,11 +492,11 @@ class SetupActivity : FoxActivity(), LanguageActivity {
                 safe = false,
                 stats = 0,
             )
+            moduleListCacheDao.deleteAll()
             // insert the modulelistcache into the database
             moduleListCacheDao.insert(moduleListCache)
             // now make sure reposlist is updated with 2 entries and modulelistcache is updated with 1 entry
             val reposList = reposListDao.getAll()
-            val moduleListCacheList = moduleListCacheDao.getAll()
             // make sure reposlist is updated with 2 entries
             if (reposList.size != 2) {
                 Timber.e("ReposList is not updated with 2 entries")
@@ -435,7 +512,7 @@ class SetupActivity : FoxActivity(), LanguageActivity {
                 if (BuildConfig.DEBUG) Timber.d("ReposList is updated with 2 entries")
             }
             // make sure modulelistcache is updated with 1 entry
-            if (moduleListCacheList.size != 1) {
+            if (moduleListCacheDao.getAll().size != 1) {
                 Timber.e("ModuleListCache is not updated with 1 entry")
                 // show a toast
                 runOnUiThread {

app/src/main/kotlin/com/fox2code/mmm/background/BackgroundUpdateChecker.kt

@@ -14,7 +14,6 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
-import android.os.Build
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -381,19 +380,17 @@ class BackgroundUpdateChecker(context: Context, workerParams: WorkerParameters)
         fun onMainActivityCreate(context: Context) {
             // Refuse to run if first_launch pref is not false
             if (MainApplication.getSharedPreferences("mmm")!!
-                    .getString("last_shown_setup", null) != "v3"
+                    .getString("last_shown_setup", null) != "v4"
             ) return
             // create notification channel group
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                val groupName: CharSequence = context.getString(R.string.notification_group_updates)
-                val mNotificationManager =
-                    ContextCompat.getSystemService(context, NotificationManager::class.java)
-                mNotificationManager?.createNotificationChannelGroup(
-                    NotificationChannelGroup(
-                        NOTFIICATION_GROUP, groupName
-                    )
+            val groupName: CharSequence = context.getString(R.string.notification_group_updates)
+            val mNotificationManager =
+                ContextCompat.getSystemService(context, NotificationManager::class.java)
+            mNotificationManager?.createNotificationChannelGroup(
+                NotificationChannelGroup(
+                    NOTFIICATION_GROUP, groupName
                 )
-            }
+            )
             val notificationManagerCompat = NotificationManagerCompat.from(context)
             notificationManagerCompat.createNotificationChannel(
                 NotificationChannelCompat.Builder(

app/src/main/kotlin/com/fox2code/mmm/manager/ModuleManager.kt

@@ -32,9 +32,9 @@ class ModuleManager private constructor() : SyncManager() {
     private var updatableModuleCount = 0
 
     override fun scanInternal(updateListener: UpdateListener) {
-        // if last_shown_setup is not "v3", then refuse to continue
+        // if last_shown_setup is not "v4", then refuse to continue
         if (MainApplication.getSharedPreferences("mmm")!!
-                .getString("last_shown_setup", "") != "v3"
+                .getString("last_shown_setup", "") != "v4"
         ) {
             return
         }

app/src/main/kotlin/com/fox2code/mmm/module/ActionButtonType.kt

@@ -14,6 +14,7 @@ import androidx.annotation.DrawableRes
 import com.fox2code.foxcompat.app.FoxActivity
 import com.fox2code.foxcompat.view.FoxDisplay
 import com.fox2code.mmm.BuildConfig
+import com.fox2code.mmm.MainApplication
 import com.fox2code.mmm.MainApplication.Companion.INSTANCE
 import com.fox2code.mmm.MainApplication.Companion.isShowcaseMode
 import com.fox2code.mmm.R
@@ -121,6 +122,19 @@ enum class ActionButtonType {
         }
 
         override fun doAction(button: Chip, moduleHolder: ModuleHolder) {
+            if (MainApplication.getSharedPreferences("mmm")?.getBoolean("pref_require_security", false) == true) {
+                // get safe status from either mainmoduleinfo or repo module
+                val safe = moduleHolder.mainModuleInfo.safe || moduleHolder.repoModule?.moduleInfo?.safe ?: false
+                if (!safe) {
+                    // block local install for safety
+                    MaterialAlertDialogBuilder(button.context)
+                        .setTitle(R.string.install_blocked)
+                        .setMessage(R.string.install_blocked_message)
+                        .setPositiveButton(android.R.string.ok, null)
+                        .show()
+                    return
+                }
+            }
             // if mainmoduleinfo is null, we are in repo mode
             val moduleInfo: ModuleInfo = if (moduleHolder.mainModuleInfo != null) {
                 moduleHolder.mainModuleInfo

app/src/main/kotlin/com/fox2code/mmm/repo/CustomRepoManager.kt

@@ -30,7 +30,7 @@ class CustomRepoManager internal constructor(
     init {
         repoCount = 0
         // refuse to load if setup is not complete
-        if (getSharedPreferences("mmm")!!.getString("last_shown_setup", "") == "v3") {
+        if (getSharedPreferences("mmm")!!.getString("last_shown_setup", "") == "v4") {
             val i = 0
             val lastFilled = intArrayOf(0)
             // now the same as above but for room database

app/src/main/kotlin/com/fox2code/mmm/repo/RepoManager.kt

@@ -56,7 +56,7 @@ class RepoManager private constructor(mainApplication: MainApplication) : SyncMa
         repoData = LinkedHashMap()
         modules = HashMap()
         // refuse to load if setup is not complete
-        if (getSharedPreferences("mmm")!!.getString("last_shown_setup", "") == "v3") {
+        if (getSharedPreferences("mmm")!!.getString("last_shown_setup", "") == "v4") {
             // We do not have repo list config yet.
             androidacyRepoData = addAndroidacyRepoData()
             val altRepo = addRepoData(MAGISK_ALT_REPO, "Magisk Modules Alt Repo")
@@ -82,8 +82,8 @@ class RepoManager private constructor(mainApplication: MainApplication) : SyncMa
     }
 
     private fun populateDefaultCache(repoData: RepoData?) {
-        // if last_shown_setup is not "v3", them=n refuse to continue
-        if (getSharedPreferences("mmm")!!.getString("last_shown_setup", "") != "v3") {
+        // if last_shown_setup is not "v4", them=n refuse to continue
+        if (getSharedPreferences("mmm")!!.getString("last_shown_setup", "") != "v4") {
             return
         }
         // make sure repodata is not null

app/src/main/kotlin/com/fox2code/mmm/settings/DebugFragment.kt

@@ -25,6 +25,7 @@ import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.io.InputStreamReader
+import java.util.Date
 
 class DebugFragment : PreferenceFragmentCompat() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -182,6 +183,17 @@ class DebugFragment : PreferenceFragmentCompat() {
                         }
                     }
                 }
+                // save logs to our external storage - name is current date and time
+                try {
+                    val extStorage = File(requireContext().getExternalFilesDir(null), "logs" + File.separator + "log-" + Date().toString() + ".txt")
+                    FileUtils.copyFile(logsFile, extStorage)
+                } catch (e: IOException) {
+                    e.printStackTrace()
+                    Toast.makeText(
+                        requireContext(), R.string.error_saving_logs, Toast.LENGTH_SHORT
+                    ).show()
+                    return@setOnPreferenceClickListener true
+                }
                 // Share logs
                 val shareIntent = Intent()
                 // create a new intent and grantUriPermission to the file provider

app/src/main/kotlin/com/fox2code/mmm/utils/RuntimeUtils.kt

@@ -159,7 +159,7 @@ class RuntimeUtils {
         if (BuildConfig.DEBUG) Timber.i("Checking if we need to run setup")
         // Check if context is the first launch using prefs and if doSetupRestarting was passed in the intent
         val prefs = MainApplication.getSharedPreferences("mmm")!!
-        var firstLaunch = prefs.getString("last_shown_setup", null) != "v3"
+        var firstLaunch = prefs.getString("last_shown_setup", null) != "v4"
         // First launch
         // context is intentionally separate from the above if statement, because it needs to be checked even if the first launch check is true due to some weird edge cases
         if (activity.intent.getBooleanExtra("doSetupRestarting", false)) {