Instance fixes when not available

3 files changed, 90 insertions, 51 deletions

diff --git a/app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java b/app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
index 65190d6e6..5381e8279 100644
--- a/app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
@@ -124,17 +124,26 @@ public class InstanceHealthActivity extends BaseActivity {
 
     private void checkInstance() {
 
-        if (instance == null)
+        if (instance == null){
+            LinearLayout main_container = findViewById(R.id.main_container);
+            TextView no_instance = findViewById(R.id.no_instance);
+            instance_container.setVisibility(View.VISIBLE);
+            main_container.setVisibility(View.GONE);
+            no_instance.setVisibility(View.VISIBLE);
+            loader.setVisibility(View.GONE);
             return;
+        }
+
         new Thread(new Runnable() {
             @Override
             public void run() {
                 try {
                     HashMap<String, String> parameters = new HashMap<>();
                     parameters.put("name", instance.trim());
-                    final String response = new HttpsConnection(InstanceHealthActivity.this, instance).get("https://instances.social/api/1.0/instances/show", 30, parameters, Helper.THEKINRAR_SECRET_TOKEN);
-                    if (response != null)
+                    final String response = new HttpsConnection(InstanceHealthActivity.this, instance).get("https://instances.social/api/1.0/instances/show", 5, parameters, Helper.THEKINRAR_SECRET_TOKEN);
+                    if (response != null) {
                         instanceSocial = API.parseInstanceSocialResponse(getApplicationContext(), new JSONObject(response));
+                    }
                     runOnUiThread(new Runnable() {
                         @SuppressLint({"SetTextI18n", "DefaultLocale"})
                         public void run() {
@@ -160,7 +169,17 @@ public class InstanceHealthActivity extends BaseActivity {
                         }
                     });
 
-                } catch (Exception ignored) {
+                } catch (Exception e) {
+                    runOnUiThread(new Runnable() {
+                        public void run() {
+                            LinearLayout main_container = findViewById(R.id.main_container);
+                            TextView no_instance = findViewById(R.id.no_instance);
+                            instance_container.setVisibility(View.VISIBLE);
+                            main_container.setVisibility(View.GONE);
+                            no_instance.setVisibility(View.VISIBLE);
+                            loader.setVisibility(View.GONE);
+                        }
+                    });
                 }
             }
         }).start();
diff --git a/app/src/main/res/layout/activity_instance_social.xml b/app/src/main/res/layout/activity_instance_social.xml
index 4d6151770..58e39eafb 100644
--- a/app/src/main/res/layout/activity_instance_social.xml
+++ b/app/src/main/res/layout/activity_instance_social.xml
@@ -28,58 +28,76 @@
         android:orientation="vertical"
         android:visibility="gone">
 
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textSize="20sp" />
-
-        <TextView
-            android:id="@+id/values"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="10dp"
-            android:gravity="center" />
-
-
+            android:orientation="vertical"
+            android:id="@+id/main_container">
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/values"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp"
+                android:gravity="center" />
+
+
+            <TextView
+                android:id="@+id/checked_at"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp" />
+
+            <TextView
+                android:id="@+id/up"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+
+            <TextView
+                android:id="@+id/uptime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp" />
+
+            <TextView
+                android:id="@+id/ref_instance"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="5dp"
+                android:layout_weight="1"
+                android:text="via instances.social"
+                tools:ignore="HardcodedText" />
+        </LinearLayout>
         <TextView
-            android:id="@+id/checked_at"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="10dp" />
-
-        <TextView
-            android:id="@+id/up"
-            android:layout_width="wrap_content"
+            android:layout_marginTop="50dp"
+            android:layout_marginBottom="50dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="10dp"
+            android:gravity="center"
             android:textSize="16sp"
-            android:textStyle="bold" />
-
-
-        <TextView
-            android:id="@+id/uptime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:id="@+id/no_instance"
+            android:visibility="gone"
+            android:autoLink="web"
             android:layout_gravity="center"
-            android:layout_marginTop="10dp" />
-
-        <TextView
-            android:id="@+id/ref_instance"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_gravity="end|center_vertical"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="5dp"
-            android:layout_weight="1"
-            android:text="via instances.social"
-            tools:ignore="HardcodedText" />
-
+            android:text="@string/no_instance_reccord"
+            />
         <Button
             android:id="@+id/close"
             style="@style/Base.Widget.AppCompat.Button.Colored"
@@ -93,6 +111,7 @@
             android:textSize="16sp" />
     </LinearLayout>
 
+
     <RelativeLayout
         android:id="@+id/loader"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f599ee0a3..94d31a166 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1175,4 +1175,5 @@
     <string name="poll_finish_in">End in %s</string>
     <string name="release_note_title">What\'s new in %s</string>
     <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
 </resources>
\ No newline at end of file