Remove default gpodder sync server

1 files changed, 11 insertions, 32 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/synchronization/GpodderAuthenticationFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/synchronization/GpodderAuthenticationFragment.java
index 358985cea..e3e069868 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/synchronization/GpodderAuthenticationFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/synchronization/GpodderAuthenticationFragment.java
@@ -2,7 +2,6 @@ package de.danoeh.antennapod.fragment.preferences.synchronization;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.graphics.Paint;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
@@ -12,31 +11,20 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.ViewFlipper;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
-
 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.textfield.TextInputLayout;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.core.sync.SynchronizationCredentials;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.core.sync.SyncService;
+import de.danoeh.antennapod.core.sync.SynchronizationCredentials;
 import de.danoeh.antennapod.core.sync.SynchronizationProviderViewData;
 import de.danoeh.antennapod.core.sync.SynchronizationSettings;
 import de.danoeh.antennapod.core.util.FileNameGenerator;
-import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.net.sync.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.net.sync.gpoddernet.model.GpodnetDevice;
 import io.reactivex.Completable;
@@ -44,6 +32,11 @@ import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Guides the user through the authentication process.
  */
@@ -70,7 +63,7 @@ public class GpodderAuthenticationFragment extends DialogFragment {
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
         AlertDialog.Builder dialog = new AlertDialog.Builder(getContext());
-        dialog.setTitle(GpodnetService.DEFAULT_BASE_HOST);
+        dialog.setTitle(R.string.gpodnetauth_login_butLabel);
         dialog.setNegativeButton(R.string.cancel_label, null);
         dialog.setCancelable(false);
         this.setCancelable(false);
@@ -85,23 +78,13 @@ public class GpodderAuthenticationFragment extends DialogFragment {
 
     private void setupHostView(View view) {
         final Button selectHost = view.findViewById(R.id.chooseHostButton);
-        final RadioGroup serverRadioGroup = view.findViewById(R.id.serverRadioGroup);
         final EditText serverUrlText = view.findViewById(R.id.serverUrlText);
-
-        if (!GpodnetService.DEFAULT_BASE_HOST.equals(SynchronizationCredentials.getHosturl())) {
-            serverUrlText.setText(SynchronizationCredentials.getHosturl());
-        }
-        final TextInputLayout serverUrlTextInput = view.findViewById(R.id.serverUrlTextInput);
-        serverRadioGroup.setOnCheckedChangeListener((group, checkedId) -> {
-            serverUrlTextInput.setVisibility(checkedId == R.id.customServerRadio ? View.VISIBLE : View.GONE);
-        });
         selectHost.setOnClickListener(v -> {
-            SynchronizationCredentials.clear(getContext());
-            if (serverRadioGroup.getCheckedRadioButtonId() == R.id.customServerRadio) {
-                SynchronizationCredentials.setHosturl(serverUrlText.getText().toString());
-            } else {
-                SynchronizationCredentials.setHosturl(GpodnetService.DEFAULT_BASE_HOST);
+            if (serverUrlText.getText().length() == 0) {
+                return;
             }
+            SynchronizationCredentials.clear(getContext());
+            SynchronizationCredentials.setHosturl(serverUrlText.getText().toString());
             service = new GpodnetService(AntennapodHttpClient.getHttpClient(),
                     SynchronizationCredentials.getHosturl(), SynchronizationCredentials.getDeviceID(),
                     SynchronizationCredentials.getUsername(), SynchronizationCredentials.getPassword());
@@ -116,12 +99,8 @@ public class GpodderAuthenticationFragment extends DialogFragment {
         final Button login = view.findViewById(R.id.butLogin);
         final TextView txtvError = view.findViewById(R.id.credentialsError);
         final ProgressBar progressBar = view.findViewById(R.id.progBarLogin);
-        final TextView createAccount = view.findViewById(R.id.createAccountButton);
         final TextView createAccountWarning = view.findViewById(R.id.createAccountWarning);
 
-        createAccount.setPaintFlags(createAccount.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        createAccount.setOnClickListener(v -> IntentUtils.openInBrowser(getContext(), "https://gpodder.net/register/"));
-
         if (SynchronizationCredentials.getHosturl().startsWith("http://")) {
             createAccountWarning.setVisibility(View.VISIBLE);
         }