patch 4

Author: queuejw

app/build.gradle

@@ -12,7 +12,7 @@ android {
         minSdk 23
         targetSdk 34
         versionCode 10
-        versionName "0.8.1-reborn-neko11-compatibility"
+        versionName "0.8.2-reborn-neko11-compatibility"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = '17'
     }
+    setBuildToolsVersion('35.0.0 rc1')
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -65,7 +65,7 @@ Copyright (C) 2016 The Android Open Source Project
         <!-- FileProvider for sending pictures -->
         <provider
                 android:name="androidx.core.content.FileProvider"
-                android:authorities="com.android.egg.fileprovider"
+                android:authorities="ru.dimon6018.neko11.fileprovider"
                 android:grantUriPermissions="true"
                 android:exported="false">
             <meta-data

app/src/main/java/ru/dimon6018/neko11/NekoLand.kt

@@ -49,20 +49,25 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import ru.dimon6018.neko11.NekoService.Companion.setupNotificationChannels
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
 
 
+
 class NekoLand : AppCompatActivity(), PrefState.PrefsListener {
     private var mPrefs: PrefState? = null
     private var mAdapter: CatAdapter? = null
     private var mPendingShareCat: Cat? = null
+    private var numCats = 0
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -156,26 +161,33 @@ class NekoLand : AppCompatActivity(), PrefState.PrefsListener {
     }
 
     private fun updateCats(): Int {
-        val cats: Array<Cat?>
-        if (CAT_GEN) {
-            cats = arrayOfNulls(50)
-            for (i in cats.indices) {
-                cats[i] = Cat.create(this)
-            }
-        } else {
-            val hsv = FloatArray(3)
-            val list = mPrefs!!.cats
-            list.sortedWith { cat, cat2 ->
-                Color.colorToHSV(cat.bodyColor, hsv)
-                val bodyH1 = hsv[0]
-                Color.colorToHSV(cat2.bodyColor, hsv)
-                val bodyH2 = hsv[0]
-                bodyH1.compareTo(bodyH2)
+        val catsUpdate: Deferred<Int> = CoroutineScope(Dispatchers.IO).async {
+            val cats: Array<Cat?>
+            if (CAT_GEN) {
+                cats = arrayOfNulls(50)
+                for (i in cats.indices) {
+                    cats[i] = Cat.create(this@NekoLand)
+                }
+            } else {
+                val hsv = FloatArray(3)
+                val list = mPrefs!!.cats
+                list.sortedWith { cat, cat2 ->
+                    Color.colorToHSV(cat.bodyColor, hsv)
+                    val bodyH1 = hsv[0]
+                    Color.colorToHSV(cat2.bodyColor, hsv)
+                    val bodyH2 = hsv[0]
+                    bodyH1.compareTo(bodyH2)
+                }
+                cats = list.toTypedArray<Cat?>()
             }
-            cats = list.toTypedArray<Cat?>()
+            mAdapter!!.setCats(cats)
+
+            return@async cats.size
+        }
+        runBlocking {
+            numCats = catsUpdate.await()
         }
-        mAdapter!!.setCats(cats)
-        return cats.size
+        return numCats
     }
 
     private fun onCatClick(cat: Cat?) {
@@ -336,7 +348,7 @@ class NekoLand : AppCompatActivity(), PrefState.PrefsListener {
                     val uri: Uri =
                         FileProvider.getUriForFile(
                             this@NekoLand,
-                            "com.android.egg.fileprovider",
+                            "ru.dimon6018.neko11.fileprovider",
                             png
                         )
                     Log.v("Neko", "cat uri: $uri")

app/src/main/java/ru/dimon6018/neko11/PrefState.kt

@@ -32,7 +32,7 @@ class PrefState(private val mContext: Context) : OnSharedPreferenceChangeListene
         mPrefs.edit().remove(CAT_KEY_PREFIX + cat.seed).apply()
     }
 
-    val cats: List<Cat>
+    val cats: MutableList<Cat>
         get() {
             val cats = ArrayList<Cat>()
             val map = mPrefs.all