Remove ABI warning

Signed-off-by: Tyler Nijmeh <tylernij@gmail.com>
ghost58400 · Oct 15, 2022 · 4ebe17d · 4ebe17d
1 parent 211c69d
commit 4ebe17d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/app/src/main/java/com/draco/ladb/viewmodels/MainActivityViewModel.kt b/app/src/main/java/com/draco/ladb/viewmodels/MainActivityViewModel.kt
@@ -17,7 +17,9 @@ import com.draco.ladb.R
 import com.draco.ladb.utils.ADB
 import com.github.javiersantos.piracychecker.PiracyChecker
 import com.github.javiersantos.piracychecker.piracyChecker
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
 import java.io.File
 
 class MainActivityViewModel(application: Application) : AndroidViewModel(application) {
@@ -44,10 +46,6 @@ class MainActivityViewModel(application: Application) : AndroidViewModel(applica
         }
     }
 
-    fun isAbiUnsupported() =
-            Build.SUPPORTED_64_BIT_ABIS.isNullOrEmpty() &&
-            (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
-
     /**
      * Start the piracy checker if it is not setup yet (release builds only)
      *
@@ -110,7 +108,8 @@ class MainActivityViewModel(application: Application) : AndroidViewModel(applica
         val context = getApplication<Application>().applicationContext
 
         if (!sharedPreferences.getBoolean(context.getString(R.string.paired_key), false) &&
-            (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)) {
+            (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
+        ) {
             return true
         }
 
@@ -137,6 +136,7 @@ class MainActivityViewModel(application: Application) : AndroidViewModel(applica
                     it?.readText()
                 }
             }
+
             "text/plain" -> intent.getStringExtra(Intent.EXTRA_TEXT)
             else -> null
         }

diff --git a/app/src/main/java/com/draco/ladb/views/MainActivity.kt b/app/src/main/java/com/draco/ladb/views/MainActivity.kt
@@ -20,7 +20,6 @@ import com.draco.ladb.BuildConfig
 import com.draco.ladb.R
 import com.draco.ladb.databinding.ActivityMainBinding
 import com.draco.ladb.viewmodels.MainActivityViewModel
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -30,7 +29,6 @@ class MainActivity : AppCompatActivity() {
     private val viewModel: MainActivityViewModel by viewModels()
     private lateinit var binding: ActivityMainBinding
 
-    private lateinit var badAbiDialog: MaterialAlertDialogBuilder
     private var lastCommand = ""
 
     private var bookmarkGetResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -60,11 +58,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun setupUI() {
-        badAbiDialog = MaterialAlertDialogBuilder(this)
-            .setTitle(R.string.bad_abi_title)
-            .setMessage(R.string.bad_abi_message)
-            .setPositiveButton(R.string.dismiss, null)
-
         binding.command.setOnKeyListener { _, keyCode, keyEvent ->
             if (keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN) {
                 sendCommandToADB()
@@ -154,10 +147,6 @@ class MainActivity : AppCompatActivity() {
         setupDataListeners()
         pairAndStart()
 
-        if (viewModel.isAbiUnsupported()) {
-            badAbiDialog.show()
-        }
-
         viewModel.piracyCheck(this)
     }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -37,9 +37,6 @@
     <string name="pair_title">Pairing information</string>
     <string name="pair_message">Connect the device to LADB using a pairing code from the <b>"Wireless debugging"</b> page in Settings. The codes will change if the settings dialog closes, so you <b>MUST</b> use split screen or pop-out mode.</string>
 
-    <string name="bad_abi_title">Unsupported device</string>
-    <string name="bad_abi_message">Your device is unsupported since it is 32-bit and running on Android 11+.\n\nSorry :(</string>
-
     <string name="settings">Settings</string>
     <string name="troubleshooting">Troubleshooting</string>
     <string name="about">About</string>