Merge from upstream

Author: kairusds

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.draco.ladb"
         minSdk 26
         targetSdk 31
-        versionCode 36
-        versionName "1.9.1"
+        versionCode 38
+        versionName "2.0"
 
         ndk {
             abiFilters 'arm64-v8a', 'armeabi-v7a'
@@ -39,22 +39,26 @@ android {
             useLegacyPackaging = true
         }
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
 
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.fragment:fragment-ktx:1.4.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
+    implementation 'androidx.fragment:fragment-ktx:1.5.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0'
 
     implementation 'com.github.javiersantos:PiracyChecker:1.2.8'
 
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.1'
     implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
 }

app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
-        <activity android:name=".views.HelpActivity" android:label="@string/help" />
+        <activity android:name=".views.HelpActivity" android:label="@string/more" />
         <activity android:name=".views.BookmarksActivity" android:label="@string/bookmarks" />
 
         <service android:name=".services.QSTile"

app/src/main/java/com/draco/ladb/fragments/HelpPreferenceFragment.kt

@@ -4,15 +4,15 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import androidx.lifecycle.lifecycleScope
+import androidx.core.content.edit
 import androidx.preference.*
 import com.draco.ladb.R
 import com.draco.ladb.utils.ADB
+import com.draco.ladb.views.MainActivity
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlin.system.exitProcess
 
 class HelpPreferenceFragment : PreferenceFragmentCompat() {
     private lateinit var adb: ADB
@@ -26,23 +26,30 @@ class HelpPreferenceFragment : PreferenceFragmentCompat() {
         setPreferencesFromResource(R.xml.help, rootKey)
     }
 
+    private fun restartApp() {
+        val intent = Intent(requireContext(), MainActivity::class.java)
+        startActivity(intent)
+        requireActivity().finishAffinity()
+        exitProcess(0)
+    }
+
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         when (preference.key) {
             getString(R.string.reset_key) -> {
-                context?.let {
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        /* Unpair server and client */
-                        with(PreferenceManager.getDefaultSharedPreferences(it).edit()) {
-                            putBoolean(getString(R.string.paired_key), false)
-                            commit()
-                        }
-
-                        adb.reset()
-                    }
-                    activity?.finish()
+                val context = requireContext()
+                PreferenceManager.getDefaultSharedPreferences(context).edit(commit = true) {
+                    clear()
                 }
+
+                context.filesDir.deleteRecursively()
+                context.cacheDir.deleteRecursively()
+
+                restartApp()
             }
 
+            getString(R.string.restart_key) -> restartApp()
+            getString(R.string.tutorial_key) -> openURL(getString(R.string.tutorial_url))
+
             getString(R.string.developer_key) -> openURL(getString(R.string.developer_url))
             getString(R.string.source_key) -> openURL(getString(R.string.source_url))
             getString(R.string.contact_key) -> openURL(getString(R.string.contact_url))

app/src/main/java/com/draco/ladb/recyclers/BookmarksRecyclerAdapter.kt

@@ -1,5 +1,6 @@
 package com.draco.ladb.recyclers
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
@@ -12,7 +13,7 @@ import com.draco.ladb.R
 
 class BookmarksRecyclerAdapter(val context: Context): RecyclerView.Adapter<BookmarksRecyclerAdapter.ViewHolder>() {
     private val list = sortedSetOf<String>()
-    val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+    private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
 
     var pickHook: (String) -> Unit = {}
     var deleteHook: (String) -> Unit = {}
@@ -24,32 +25,36 @@ class BookmarksRecyclerAdapter(val context: Context): RecyclerView.Adapter<Bookm
         val edit: ImageButton = view.findViewById(R.id.edit)
     }
 
+    @SuppressLint("NotifyDataSetChanged")
     fun updateList(refresh: Boolean = true) {
         list.clear()
         list.addAll(prefs.getStringSet("bookmarks", setOf()) ?: emptySet())
         if (refresh)
             notifyDataSetChanged()
     }
 
-    fun saveList() {
+    private fun saveList() {
         with(prefs.edit()) {
             putStringSet("bookmarks", list)
             apply()
         }
     }
 
+    @SuppressLint("NotifyDataSetChanged")
     fun add(text: String) {
         list.add(text)
         notifyDataSetChanged()
         saveList()
     }
 
+    @SuppressLint("NotifyDataSetChanged")
     fun delete(text: String) {
         list.remove(text)
         notifyDataSetChanged()
         saveList()
     }
 
+    @SuppressLint("NotifyDataSetChanged")
     fun edit(text: String, newText: String) {
         list.remove(text)
         list.add(newText)