[fix] fix bug when opening .1list files from file managers using cont…

…entresolver
lolo-io · Dec 4, 2019 · b35bd5c · b35bd5c
1 parent 645f481
commit b35bd5c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.lolo.io.onelist"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 7
-        versionName "1.2.0"
+        versionCode 9
+        versionName "1.2.1"
         vectorDrawables.useSupportLibrary = true
     }
 

diff --git a/app/src/main/java/com/lolo/io/onelist/OneListFragment.kt b/app/src/main/java/com/lolo/io/onelist/OneListFragment.kt
@@ -173,6 +173,14 @@ class OneListFragment : Fragment(), ListsCallbacks, ItemsCallbacks, MainActivity
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        // in case things have changed while stopped
+        persistence.refreshAndFetchNewLists(allLists)
+        listsAdapter.notifyDataSetChanged()
+        itemsAdapter.notifyDataSetChanged()
+    }
+
     private fun setupListsRecyclerView() {
 
         listsRecyclerView.adapter = listsAdapter

diff --git a/app/src/main/java/com/lolo/io/onelist/PersistenceHelper.kt b/app/src/main/java/com/lolo/io/onelist/PersistenceHelper.kt
@@ -60,6 +60,20 @@ class PersistenceHelper(private val app: Activity) {
         }
     }
 
+
+    fun refreshAndFetchNewLists(lists: MutableList<ItemList>) {
+        runBlocking {
+            val newIds = getListIdsTable()
+            newIds.forEach { fetchedId ->
+                if (!listsIds.keys.contains(fetchedId.key)) {
+                    lists.add(getListAsync(fetchedId.key).await())
+                }
+            }
+            listsIds = newIds
+            refreshAllLists(lists)
+        }
+    }
+
     fun refreshAllLists(lists: List<ItemList>) {
         runBlocking {
             lists.forEach {
@@ -101,7 +115,6 @@ class PersistenceHelper(private val app: Activity) {
             val content = app.contentResolver.openInputStream(uri)?.bufferedReader()?.use { it.readText() }
             val list = gson.fromJson(content, ItemList::class.java)
             list.path = ""
-            if (uri.path?.startsWith("/tree/") == true) list.path = uri.toString()
             require(!listsIds.containsKey(list.stableId)) { app.getString(R.string.list_already_in_your_lists) }
             return list
         } catch (e: IllegalArgumentException) {