Give some love to gpodder login UI

2 files changed, 4 insertions, 2 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
index ea97fc0fd..337880317 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
@@ -342,8 +342,8 @@ public class GpodnetAuthenticationActivity extends AppCompatActivity {
         final Button back = view.findViewById(R.id.butGoMainscreen);
 
         sync.setOnClickListener(v -> {
-            SyncService.sync(GpodnetAuthenticationActivity.this);
             finish();
+            SyncService.sync(getApplicationContext());
         });
         back.setOnClickListener(v -> {
             Intent intent = new Intent(GpodnetAuthenticationActivity.this, MainActivity.class);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java
index 95af40d47..25532f6fa 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java
@@ -52,6 +52,9 @@ public class GpodderPreferencesFragment extends PreferenceFragmentCompat {
 
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     public void syncStatusChanged(SyncServiceEvent event) {
+        if (!GpodnetPreferences.loggedIn()) {
+            return;
+        }
         if (event.getMessageResId() == R.string.sync_status_error
                 || event.getMessageResId() == R.string.sync_status_success) {
             updateLastGpodnetSyncReport(SyncService.isLastSyncSuccessful(getContext()),
@@ -117,7 +120,6 @@ public class GpodderPreferencesFragment extends PreferenceFragmentCompat {
                     SyncService.getLastSyncAttempt(getContext()));
         } else {
             findPreference(PREF_GPODNET_LOGOUT).setSummary(null);
-            updateLastGpodnetSyncReport(false, 0);
         }
         findPreference(PREF_GPODNET_HOSTNAME).setSummary(GpodnetPreferences.getHostname());
     }