Merge branch 'develop' into patch-3

app/src/main/java/chat/rocket/android/fragment/add_server/InputHostnameContract.java

@@ -7,7 +7,7 @@ public interface InputHostnameContract {
   interface View extends BaseContract.View {
     void showLoader();
 
-    void hideLoader();
+    void hideLoader(Boolean isValidServerUrl);
 
     void showInvalidServerError();
 

app/src/main/java/chat/rocket/android/fragment/add_server/InputHostnameFragment.java

@@ -96,9 +96,11 @@ public class InputHostnameFragment extends AbstractFragment implements InputHost
     }
 
     @Override
-    public void hideLoader() {
-        waitingView.setVisibility(View.GONE);
-        container.setVisibility(View.VISIBLE);
+    public void hideLoader(Boolean isValidServerUrl) {
+        if(!isValidServerUrl) {
+            waitingView.setVisibility(View.GONE);
+            container.setVisibility(View.VISIBLE);
+        }
     }
 
     @Override

app/src/main/java/chat/rocket/android/fragment/add_server/InputHostnamePresenter.java

@@ -15,6 +15,7 @@ import io.reactivex.disposables.Disposable;
 
 public class InputHostnamePresenter extends BasePresenter<InputHostnameContract.View> implements InputHostnameContract.Presenter {
   private final ConnectivityManagerApi connectivityManager;
+  private boolean isValidServerUrl;
 
   public InputHostnamePresenter(ConnectivityManagerApi connectivityManager) {
     this.connectivityManager = connectivityManager;
@@ -35,10 +36,11 @@ public class InputHostnamePresenter extends BasePresenter<InputHostnameContract.
     final Disposable subscription = ServerPolicyHelper.isApiVersionValid(validationHelper)
         .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
         .observeOn(AndroidSchedulers.mainThread())
-        .doOnTerminate(() -> view.hideLoader())
+        .doOnTerminate(() -> view.hideLoader(isValidServerUrl))
         .subscribe(
             serverValidation -> {
               if (serverValidation.isValid()) {
+                isValidServerUrl=true;
                 onServerValid(hostname, serverValidation.usesSecureConnection());
               } else {
                 view.showInvalidServerError();