Merge pull request #3249 from nextcloud/issue-3043-migrate-from-storebox

Migrating away from StoreBox to DataStore
nextcloud · Oct 24, 2023 · 510bc8e · 510bc8e
2 parents 128e57d + 11f1d5f
commit 510bc8e
Show file tree

Hide file tree

Showing 7 changed files with 739 additions and 391 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -164,6 +164,8 @@ configurations.all {
 
 dependencies {
     implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'androidx.datastore:datastore-core:1.0.0'
+    implementation 'androidx.datastore:datastore-preferences:1.0.0'
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.1")
 
     implementation fileTree(include: ['*'], dir: 'libs')
@@ -237,7 +239,6 @@ dependencies {
     implementation "androidx.room:room-ktx:${roomVersion}"
 
     implementation "org.parceler:parceler-api:$parcelerVersion"
-    implementation 'net.orange-box.storebox:storebox-lib:1.4.0'
     implementation 'eu.davidea:flexible-adapter:5.1.0'
     implementation 'eu.davidea:flexible-adapter-ui:1.0.0'
     implementation 'org.apache.commons:commons-lang3:3.13.0'

diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
@@ -25,25 +25,33 @@
 
 import com.nextcloud.talk.data.source.local.TalkDatabase;
 import com.nextcloud.talk.utils.preferences.AppPreferences;
-
-import net.orange_box.storebox.StoreBox;
+import com.nextcloud.talk.utils.preferences.AppPreferencesImpl;
 
 import javax.inject.Singleton;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
 import dagger.Module;
 import dagger.Provides;
+import kotlinx.coroutines.ExperimentalCoroutinesApi;
 
 @Module
+@OptIn(markerClass = ExperimentalCoroutinesApi.class)
 public class DatabaseModule {
     @Provides
     @Singleton
     public AppPreferences providePreferences(@NonNull final Context poContext) {
-        AppPreferences preferences = StoreBox.create(poContext, AppPreferences.class);
+        AppPreferences preferences = new AppPreferencesImpl(poContext);
         preferences.removeLinkPreviews();
         return preferences;
     }
 
+    @Provides
+    @Singleton
+    public AppPreferencesImpl providePreferencesImpl(@NonNull final Context poContext) {
+        return new AppPreferencesImpl(poContext);
+    }
+
     @Provides
     @Singleton
     public TalkDatabase provideTalkDatabase(@NonNull final Context context,

diff --git a/...n/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt b/...n/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt
@@ -22,20 +22,26 @@
 
 package com.nextcloud.talk.remotefilebrowser.viewmodels
 
+import android.content.res.Resources
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.nextcloud.talk.R
 import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem
 import com.nextcloud.talk.remotefilebrowser.repositories.RemoteFileBrowserItemsRepository
 import com.nextcloud.talk.utils.FileSortOrder
 import com.nextcloud.talk.utils.Mimetype.FOLDER
-import com.nextcloud.talk.utils.preferences.AppPreferences
+import com.nextcloud.talk.utils.preferences.AppPreferencesImpl
 import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
-import net.orange_box.storebox.listeners.OnPreferenceValueChangedListener
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.launch
 import java.io.File
 import javax.inject.Inject
 
@@ -52,9 +58,12 @@ import javax.inject.Inject
  * FinishState --> [*]
  * @enduml
  */
-class RemoteFileBrowserItemsViewModel @Inject constructor(
+@OptIn(ExperimentalCoroutinesApi::class)
+class RemoteFileBrowserItemsViewModel
+@Inject
+constructor(
     private val repository: RemoteFileBrowserItemsRepository,
-    private val appPreferences: AppPreferences
+    private val appPreferences: AppPreferencesImpl
 ) :
     ViewModel() {
 
@@ -66,7 +75,8 @@ class RemoteFileBrowserItemsViewModel @Inject constructor(
     class FinishState(val selectedPaths: Set<String>) : ViewState
 
     private val initialSortOrder = FileSortOrder.getFileSortOrder(appPreferences.sorting)
-    private val sortingPrefListener: SortChangeListener = SortChangeListener()
+
+    private var sortingFlow: Flow<String>
 
     private val _viewState: MutableLiveData<ViewState> = MutableLiveData(InitialState)
     val viewState: LiveData<ViewState>
@@ -86,20 +96,19 @@ class RemoteFileBrowserItemsViewModel @Inject constructor(
         get() = _selectedPaths
 
     init {
-        appPreferences.registerSortingChangeListener(sortingPrefListener)
-    }
-
-    inner class SortChangeListener : OnPreferenceValueChangedListener<String> {
-        override fun onChanged(newValue: String) {
-            onSelectSortOrder(newValue)
+        val key = Resources.getSystem().getString(R.string.nc_file_browser_sort_by_key)
+        sortingFlow = appPreferences.readString(key)
+        CoroutineScope(Dispatchers.Main).launch {
+            var state = appPreferences.sorting
+            sortingFlow.collect { newString ->
+                if (newString != state) {
+                    state = newString
+                    onSelectSortOrder(newString)
+                }
+            }
         }
     }
 
-    override fun onCleared() {
-        super.onCleared()
-        appPreferences.unregisterSortingChangeListener(sortingPrefListener)
-    }
-
     fun loadItems() {
         _viewState.value = LoadingItemsState
         repository.listFolder(currentPath.value!!).subscribeOn(Schedulers.io())