Remove dependency of :net:discovery and :ui:echo on :core (#7036)

Moves the common icon files to :ui:common

3 files changed, 14 insertions, 8 deletions

diff --git a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/GpodderAuthenticationFragment.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/GpodderAuthenticationFragment.java
index d28355dad..388359e3d 100644
--- a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/GpodderAuthenticationFragment.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/GpodderAuthenticationFragment.java
@@ -18,9 +18,10 @@ import androidx.annotation.Nullable;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import androidx.fragment.app.DialogFragment;
 import com.google.android.material.button.MaterialButton;
+import de.danoeh.antennapod.core.sync.queue.SynchronizationQueueSink;
 import de.danoeh.antennapod.net.common.AntennapodHttpClient;
 import de.danoeh.antennapod.core.sync.SyncService;
-import de.danoeh.antennapod.core.sync.SynchronizationCredentials;
+import de.danoeh.antennapod.storage.preferences.SynchronizationCredentials;
 import de.danoeh.antennapod.core.sync.SynchronizationProviderViewData;
 import de.danoeh.antennapod.core.sync.SynchronizationSettings;
 import de.danoeh.antennapod.core.util.FileNameGenerator;
@@ -83,10 +84,11 @@ public class GpodderAuthenticationFragment extends DialogFragment {
             if (serverUrlText.getText().length() == 0) {
                 return;
             }
-            SynchronizationCredentials.clear(getContext());
+            SynchronizationCredentials.clear();
+            SynchronizationQueueSink.clearQueue(getContext());
             SynchronizationCredentials.setHosturl(serverUrlText.getText().toString());
             service = new GpodnetService(AntennapodHttpClient.getHttpClient(),
-                    SynchronizationCredentials.getHosturl(), SynchronizationCredentials.getDeviceID(),
+                    SynchronizationCredentials.getHosturl(), SynchronizationCredentials.getDeviceId(),
                     SynchronizationCredentials.getUsername(), SynchronizationCredentials.getPassword());
             getDialog().setTitle(SynchronizationCredentials.getHosturl());
             advance();
@@ -258,7 +260,7 @@ public class GpodderAuthenticationFragment extends DialogFragment {
                     SynchronizationSettings.setSelectedSyncProvider(SynchronizationProviderViewData.GPODDER_NET);
                     SynchronizationCredentials.setUsername(username);
                     SynchronizationCredentials.setPassword(password);
-                    SynchronizationCredentials.setDeviceID(selectedDevice.getId());
+                    SynchronizationCredentials.setDeviceId(selectedDevice.getId());
                     setupFinishView(view);
                 }
             }
diff --git a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/NextcloudAuthenticationFragment.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/NextcloudAuthenticationFragment.java
index b73ee2453..5c0f22d88 100644
--- a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/NextcloudAuthenticationFragment.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/NextcloudAuthenticationFragment.java
@@ -8,9 +8,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import androidx.fragment.app.DialogFragment;
+import de.danoeh.antennapod.core.sync.queue.SynchronizationQueueSink;
 import de.danoeh.antennapod.net.common.AntennapodHttpClient;
 import de.danoeh.antennapod.core.sync.SyncService;
-import de.danoeh.antennapod.core.sync.SynchronizationCredentials;
+import de.danoeh.antennapod.storage.preferences.SynchronizationCredentials;
 import de.danoeh.antennapod.core.sync.SynchronizationProviderViewData;
 import de.danoeh.antennapod.core.sync.SynchronizationSettings;
 import de.danoeh.antennapod.net.sync.nextcloud.NextcloudLoginFlow;
@@ -88,7 +89,8 @@ public class NextcloudAuthenticationFragment extends DialogFragment
     @Override
     public void onNextcloudAuthenticated(String server, String username, String password) {
         SynchronizationSettings.setSelectedSyncProvider(SynchronizationProviderViewData.NEXTCLOUD_GPODDER);
-        SynchronizationCredentials.clear(getContext());
+        SynchronizationCredentials.clear();
+        SynchronizationQueueSink.clearQueue(getContext());
         SynchronizationCredentials.setPassword(password);
         SynchronizationCredentials.setHosturl(server);
         SynchronizationCredentials.setUsername(username);
diff --git a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/SynchronizationPreferencesFragment.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/SynchronizationPreferencesFragment.java
index 3c6461272..e8428dd5c 100644
--- a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/SynchronizationPreferencesFragment.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/SynchronizationPreferencesFragment.java
@@ -21,13 +21,14 @@ import androidx.preference.PreferenceFragmentCompat;
 
 import com.google.android.material.snackbar.Snackbar;
 
+import de.danoeh.antennapod.core.sync.queue.SynchronizationQueueSink;
 import de.danoeh.antennapod.ui.preferences.R;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import de.danoeh.antennapod.event.SyncServiceEvent;
-import de.danoeh.antennapod.core.sync.SynchronizationCredentials;
+import de.danoeh.antennapod.storage.preferences.SynchronizationCredentials;
 import de.danoeh.antennapod.core.sync.SyncService;
 import de.danoeh.antennapod.core.sync.SynchronizationProviderViewData;
 import de.danoeh.antennapod.core.sync.SynchronizationSettings;
@@ -100,7 +101,8 @@ public class SynchronizationPreferencesFragment extends PreferenceFragmentCompat
             return true;
         });
         findPreference(PREFERENCE_LOGOUT).setOnPreferenceClickListener(preference -> {
-            SynchronizationCredentials.clear(getContext());
+            SynchronizationCredentials.clear();
+            SynchronizationQueueSink.clearQueue(getContext());
             Snackbar.make(getView(), R.string.pref_synchronization_logout_toast, Snackbar.LENGTH_LONG).show();
             SynchronizationSettings.setSelectedSyncProvider(null);
             updateScreen();