Add synchronization with gPodder Nextcloud server app

app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java

@@ -6,6 +6,7 @@
 import android.provider.Settings;
 import android.view.Menu;
 import android.view.MenuItem;
+
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
@@ -21,13 +22,13 @@
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.databinding.SettingsActivityBinding;
 import de.danoeh.antennapod.fragment.preferences.AutoDownloadPreferencesFragment;
-import de.danoeh.antennapod.fragment.preferences.GpodderPreferencesFragment;
 import de.danoeh.antennapod.fragment.preferences.ImportExportPreferencesFragment;
 import de.danoeh.antennapod.fragment.preferences.MainPreferencesFragment;
 import de.danoeh.antennapod.fragment.preferences.NetworkPreferencesFragment;
 import de.danoeh.antennapod.fragment.preferences.NotificationPreferencesFragment;
 import de.danoeh.antennapod.fragment.preferences.PlaybackPreferencesFragment;
 import de.danoeh.antennapod.fragment.preferences.StoragePreferencesFragment;
+import de.danoeh.antennapod.fragment.preferences.synchronization.SynchronizationPreferencesFragment;
 import de.danoeh.antennapod.fragment.preferences.SwipePreferencesFragment;
 import de.danoeh.antennapod.fragment.preferences.UserInterfacePreferencesFragment;
 
@@ -76,8 +77,8 @@ private PreferenceFragmentCompat getPreferenceScreen(int screen) {
             prefFragment = new ImportExportPreferencesFragment();
         } else if (screen == R.xml.preferences_autodownload) {
             prefFragment = new AutoDownloadPreferencesFragment();
-        } else if (screen == R.xml.preferences_gpodder) {
-            prefFragment = new GpodderPreferencesFragment();
+        } else if (screen == R.xml.preferences_synchronization) {
+            prefFragment = new SynchronizationPreferencesFragment();
         } else if (screen == R.xml.preferences_playback) {
             prefFragment = new PlaybackPreferencesFragment();
         } else if (screen == R.xml.preferences_notifications) {
@@ -101,8 +102,8 @@ public static int getTitleOfPage(int preferences) {
             return R.string.import_export_pref;
         } else if (preferences == R.xml.preferences_user_interface) {
             return R.string.user_interface_label;
-        } else if (preferences == R.xml.preferences_gpodder) {
-            return R.string.gpodnet_main_label;
+        } else if (preferences == R.xml.preferences_synchronization) {
+            return R.string.synchronization_pref;
         } else if (preferences == R.xml.preferences_notifications) {
             return R.string.notification_pref_fragment;
         } else if (preferences == R.xml.feed_settings) {

app/src/main/java/de/danoeh/antennapod/discovery/GpodnetPodcastSearcher.java

@@ -1,6 +1,6 @@
 package de.danoeh.antennapod.discovery;
 
-import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.sync.SynchronizationCredentials;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.net.sync.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.net.sync.gpoddernet.GpodnetServiceException;
@@ -18,8 +18,8 @@ public Single<List<PodcastSearchResult>> search(String query) {
         return Single.create((SingleOnSubscribe<List<PodcastSearchResult>>) subscriber -> {
             try {
                 GpodnetService service = new GpodnetService(AntennapodHttpClient.getHttpClient(),
-                        GpodnetPreferences.getHosturl(), GpodnetPreferences.getDeviceID(),
-                        GpodnetPreferences.getUsername(), GpodnetPreferences.getPassword());
+                        SynchronizationCredentials.getHosturl(), SynchronizationCredentials.getDeviceID(),
+                        SynchronizationCredentials.getUsername(), SynchronizationCredentials.getPassword());
                 List<GpodnetPodcast> gpodnetPodcasts = service.searchPodcasts(query, 0);
                 List<PodcastSearchResult> results = new ArrayList<>();
                 for (GpodnetPodcast podcast : gpodnetPodcasts) {

app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java

@@ -15,7 +15,7 @@
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
 import de.danoeh.antennapod.adapter.gpodnet.PodcastListAdapter;
-import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.sync.SynchronizationCredentials;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.net.sync.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.net.sync.gpoddernet.GpodnetServiceException;
@@ -76,8 +76,8 @@ final void loadData() {
         disposable = Observable.fromCallable(
                 () -> {
                     GpodnetService service = new GpodnetService(AntennapodHttpClient.getHttpClient(),
-                            GpodnetPreferences.getHosturl(), GpodnetPreferences.getDeviceID(),
-                            GpodnetPreferences.getUsername(), GpodnetPreferences.getPassword());
+                            SynchronizationCredentials.getHosturl(), SynchronizationCredentials.getDeviceID(),
+                            SynchronizationCredentials.getUsername(), SynchronizationCredentials.getPassword());
                     return loadPodcastData(service);
                 })
                 .subscribeOn(Schedulers.io())

app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java

@@ -8,7 +8,7 @@
 import androidx.fragment.app.ListFragment;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.gpodnet.TagListAdapter;
-import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.sync.SynchronizationCredentials;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.net.sync.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.net.sync.gpoddernet.model.GpodnetTag;
@@ -51,8 +51,8 @@ private void startLoadTask() {
         disposable = Observable.fromCallable(
             () -> {
                 GpodnetService service = new GpodnetService(AntennapodHttpClient.getHttpClient(),
-                        GpodnetPreferences.getHosturl(), GpodnetPreferences.getDeviceID(),
-                        GpodnetPreferences.getUsername(), GpodnetPreferences.getPassword());
+                        SynchronizationCredentials.getHosturl(), SynchronizationCredentials.getDeviceID(),
+                        SynchronizationCredentials.getUsername(), SynchronizationCredentials.getPassword());
                 return service.getTopTags(COUNT);
             })
                 .subscribeOn(Schedulers.io())

app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java

@@ -17,12 +17,11 @@
 import de.danoeh.antennapod.fragment.preferences.about.AboutFragment;
 
 public class MainPreferencesFragment extends PreferenceFragmentCompat {
-    private static final String TAG = "MainPreferencesFragment";
 
     private static final String PREF_SCREEN_USER_INTERFACE = "prefScreenInterface";
     private static final String PREF_SCREEN_PLAYBACK = "prefScreenPlayback";
     private static final String PREF_SCREEN_NETWORK = "prefScreenNetwork";
-    private static final String PREF_SCREEN_GPODDER = "prefScreenGpodder";
+    private static final String PREF_SCREEN_SYNCHRONIZATION = "prefScreenSynchronization";
     private static final String PREF_SCREEN_STORAGE = "prefScreenStorage";
     private static final String PREF_DOCUMENTATION = "prefDocumentation";
     private static final String PREF_VIEW_FORUM = "prefViewForum";
@@ -74,8 +73,8 @@ private void setupMainScreen() {
             ((PreferenceActivity) getActivity()).openScreen(R.xml.preferences_network);
             return true;
         });
-        findPreference(PREF_SCREEN_GPODDER).setOnPreferenceClickListener(preference -> {
-            ((PreferenceActivity) getActivity()).openScreen(R.xml.preferences_gpodder);
+        findPreference(PREF_SCREEN_SYNCHRONIZATION).setOnPreferenceClickListener(preference -> {
+            ((PreferenceActivity) getActivity()).openScreen(R.xml.preferences_synchronization);
             return true;
         });
         findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference -> {
@@ -142,8 +141,8 @@ private void setupSearch() {
                 .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_network))
                 .addBreadcrumb(R.string.automation)
                 .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_autodownload));
-        config.index(R.xml.preferences_gpodder)
-                .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_gpodder));
+        config.index(R.xml.preferences_synchronization)
+                .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_synchronization));
         config.index(R.xml.preferences_notifications)
                 .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_notifications));
         config.index(R.xml.feed_settings)

app/src/main/java/de/danoeh/antennapod/fragment/preferences/NotificationPreferencesFragment.java

@@ -4,11 +4,10 @@
 import androidx.preference.PreferenceFragmentCompat;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.PreferenceActivity;
-import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
+import de.danoeh.antennapod.core.sync.SynchronizationSettings;
 
 public class NotificationPreferencesFragment extends PreferenceFragmentCompat {
 
-    private static final String TAG = "NotificationPrefFragment";
     private static final String PREF_GPODNET_NOTIFICATIONS = "pref_gpodnet_notifications";
 
     @Override
@@ -24,7 +23,6 @@ public void onStart() {
     }
 
     private void setUpScreen() {
-        final boolean loggedIn = GpodnetPreferences.loggedIn();
-        findPreference(PREF_GPODNET_NOTIFICATIONS).setEnabled(loggedIn);
+        findPreference(PREF_GPODNET_NOTIFICATIONS).setEnabled(SynchronizationSettings.isProviderConnected());
     }
 }