WIP Migrating away from StoreBox to DataStore

- Added DataStore dependency - Created AppPreferencesImpl Signed-off-by: Julius Linus <[email protected]>
nextcloud · Sep 5, 2023 · 433c2f9 · 433c2f9
1 parent 4ca0620
commit 433c2f9
Show file tree

Hide file tree

Showing 6 changed files with 678 additions and 387 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -164,6 +164,7 @@ configurations.all {
 
 dependencies {
     implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'androidx.datastore:datastore-core:1.0.0'
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.1")
 
     implementation fileTree(include: ['*'], dir: 'libs')
@@ -282,6 +283,7 @@ dependencies {
         //noinspection DuplicatePlatformClasses
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     })
+    implementation("androidx.datastore:datastore-preferences:1.0.0")
 
     implementation 'androidx.core:core-ktx:1.10.1'
 

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,8 +25,7 @@
 
 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;
 
@@ -39,7 +38,7 @@ 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;
     }

diff --git a/...n/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt b/...n/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt
@@ -35,7 +35,6 @@ 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 java.io.File
 import javax.inject.Inject
 
@@ -66,7 +65,8 @@ class RemoteFileBrowserItemsViewModel @Inject constructor(
     class FinishState(val selectedPaths: Set<String>) : ViewState
 
     private val initialSortOrder = FileSortOrder.getFileSortOrder(appPreferences.sorting)
-    private val sortingPrefListener: SortChangeListener = SortChangeListener()
+    // TODO remove this after implementing kotlin flow
+    // private val sortingPrefListener: SortChangeListener = SortChangeListener()
 
     private val _viewState: MutableLiveData<ViewState> = MutableLiveData(InitialState)
     val viewState: LiveData<ViewState>
@@ -86,19 +86,15 @@ class RemoteFileBrowserItemsViewModel @Inject constructor(
         get() = _selectedPaths
 
     init {
-        appPreferences.registerSortingChangeListener(sortingPrefListener)
+        // TODO change this to a kotlin flow
+        // appPreferences.registerSortingChangeListener(sortingPrefListener)
     }
 
-    inner class SortChangeListener : OnPreferenceValueChangedListener<String> {
-        override fun onChanged(newValue: String) {
-            onSelectSortOrder(newValue)
-        }
-    }
-
-    override fun onCleared() {
-        super.onCleared()
-        appPreferences.unregisterSortingChangeListener(sortingPrefListener)
-    }
+    // inner class SortChangeListener : OnPreferenceValueChangedListener<String> {
+    //     override fun onChanged(newValue: String) {
+    //         onSelectSortOrder(newValue)
+    //     }
+    // }
 
     fun loadItems() {
         _viewState.value = LoadingItemsState