Some change for not picking instances and add usersinditoot_fork_help

2 files changed, 69 insertions, 1 deletions

diff --git a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
index ba3c6766a..431490038 100644
--- a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
@@ -251,6 +251,72 @@ public class LoginActivity extends BaseActivity {
             Helper.changeMaterialSpinnerColor(LoginActivity.this, set_instance_type);
             set_instance_type.setItems("Mastodon", "Pleroma", "Pixelfed", "Peertube", "GNU Social", "Friendica");
             socialNetwork = UpdateAccountInfoAsyncTask.SOCIAL.MASTODON;
+
+
+            if( getIntent() == null || !getIntent().getBooleanExtra("forcedInstance", false)) {
+                //Extrat for inditoot.com
+                login_instance.setText("inditoot.com");
+                //Hide items
+                step_instance.setVisibility(View.GONE);
+                if (login_instance.getText() == null || login_instance.getText().toString().length() == 0) {
+                    TextInputLayout login_instance_layout = findViewById(R.id.login_instance_layout);
+                    login_instance_layout.setError(getString(R.string.toast_error_instance));
+                    login_instance_layout.setErrorEnabled(true);
+                    return;
+                }
+                instance = login_instance.getText().toString().trim().toLowerCase();
+                connect_button.setEnabled(false);
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        instanceNodeInfo = new API(LoginActivity.this).getNodeInfo(instance);
+
+                        runOnUiThread(new Runnable() {
+                            public void run() {
+                                connect_button.setEnabled(true);
+                                if (instanceNodeInfo != null && instanceNodeInfo.getName() != null) {
+                                    switch (instanceNodeInfo.getName()) {
+                                        case "MASTODON":
+                                            socialNetwork = UpdateAccountInfoAsyncTask.SOCIAL.MASTODON;
+                                            break;
+                                        case "PIXELFED":
+                                            socialNetwork = UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED;
+                                            break;
+                                        case "PEERTUBE":
+                                            socialNetwork = UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE;
+                                            break;
+                                        case "GNU":
+                                            socialNetwork = UpdateAccountInfoAsyncTask.SOCIAL.GNU;
+                                            break;
+                                    }
+                                    if (instanceNodeInfo.getName().equals("MASTODON") || instanceNodeInfo.getName().equals("PIXELFED")) {
+                                        client_id_for_webview = true;
+                                        retrievesClientId();
+                                    } else {
+                                        if (instanceNodeInfo.getName().equals("PEERTUBE")) {
+                                            step_login_credential.setVisibility(View.VISIBLE);
+                                            step_instance.setVisibility(View.GONE);
+                                            instance_chosen.setText(instance);
+                                            retrievesClientId();
+                                        } else if (instanceNodeInfo.getName().equals("GNU")) {
+                                            step_login_credential.setVisibility(View.VISIBLE);
+                                            step_instance.setVisibility(View.GONE);
+                                            instance_chosen.setText(instance);
+                                        }
+                                    }
+                                } else if (instanceNodeInfo != null && instanceNodeInfo.isConnectionError()) {
+                                    Toasty.error(getApplicationContext(), getString(R.string.connect_error), Toast.LENGTH_LONG).show();
+                                } else {
+                                    Toasty.error(getApplicationContext(), getString(R.string.client_error), Toast.LENGTH_LONG).show();
+                                }
+                            }
+                        });
+
+
+                    }
+                }).start();
+            }
+
             //Manage instances
             set_instance_type.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
                 @Override
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 2e09e1963..550cd52e1 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -1389,7 +1389,8 @@ public class Helper {
             changeDrawableColor(activity, R.drawable.ic_person,R.color.black);
             changeDrawableColor(activity, R.drawable.ic_cancel,R.color.black);
         }
-
+        menuAccountsOpened = true;
+        arrow.setVisibility(View.GONE);
         if( !menuAccountsOpened ){
             arrow.setImageResource(R.drawable.ic_arrow_drop_up);
             SQLiteDatabase db = Sqlite.getInstance(activity, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
@@ -2116,6 +2117,7 @@ public class Helper {
                 urlHeader = Helper.getLiveInstanceWithProtocol(activity) + account.getHeader();
             }
             ImageView owner_accounts = headerLayout.findViewById(R.id.owner_accounts);
+            owner_accounts.setVisibility(View.GONE);
             ImageView header_option_info = headerLayout.findViewById(R.id.header_option_info);
             ImageView header_option_menu = headerLayout.findViewById(R.id.header_option_menu);
             if( theme == Helper.THEME_DARK || theme == Helper.THEME_BLACK){