From dd119449f323d859685a0c1034be2aa261817387 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 19 Jan 2024 17:06:20 +0100
Subject: [PATCH] Fix Peertube instances search

---
 .../peertube/activities/PeertubeMainActivity.java    | 12 +++---------
 .../android/peertube/client/RetrofitPeertubeAPI.java |  3 +++
 .../fragment/FragmentLoginPickInstancePeertube.java  |  1 -
 .../layout/fragment_login_pick_instance_peertube.xml |  1 -
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java b/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java
index 9c9fccc08..96c7a8d2e 100644
--- a/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/peertube/activities/PeertubeMainActivity.java
@@ -227,7 +227,6 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
                 }
                 return true;
             });
-            startInForeground();
         } else {
             binding.navView.setOnItemSelectedListener(item -> {
                 int itemId = item.getItemId();
@@ -247,7 +246,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
                 return true;
             });
         }
-
+        startInForeground();
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayShowTitleEnabled(false);
         }
@@ -513,13 +512,8 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
     private void startInForeground() {
         Intent notificationIntent = new Intent(this, RetrieveInfoService.class);
         try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                startForegroundService(notificationIntent);
-            } else {
-                startService(notificationIntent);
-            }
-        } catch (Exception ignored) {
-        }
+            startService(notificationIntent);
+        } catch (Exception ignored) {}
     }
 
     @Override
diff --git a/app/src/main/java/app/fedilab/android/peertube/client/RetrofitPeertubeAPI.java b/app/src/main/java/app/fedilab/android/peertube/client/RetrofitPeertubeAPI.java
index 0d4fae8a6..ae3ed7377 100644
--- a/app/src/main/java/app/fedilab/android/peertube/client/RetrofitPeertubeAPI.java
+++ b/app/src/main/java/app/fedilab/android/peertube/client/RetrofitPeertubeAPI.java
@@ -18,6 +18,7 @@ import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_ID;
 import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;
 import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE;
 import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;
+import static app.fedilab.android.peertube.helper.Helper.peertubeInformation;
 
 import android.app.Activity;
 import android.content.Context;
@@ -27,6 +28,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 import android.webkit.MimeTypeMap;
 import android.webkit.URLUtil;
 
@@ -866,6 +868,7 @@ public class RetrofitPeertubeAPI {
                             String value = (String) obj.get(key);
                             data.put(Integer.valueOf(key), value);
                         } catch (JSONException ignored) {
+                            ignored.printStackTrace();
                         }
                     }
                     peertubeInformation.setCategories(data);
diff --git a/app/src/main/java/app/fedilab/android/peertube/fragment/FragmentLoginPickInstancePeertube.java b/app/src/main/java/app/fedilab/android/peertube/fragment/FragmentLoginPickInstancePeertube.java
index 010315347..db0149f76 100644
--- a/app/src/main/java/app/fedilab/android/peertube/fragment/FragmentLoginPickInstancePeertube.java
+++ b/app/src/main/java/app/fedilab/android/peertube/fragment/FragmentLoginPickInstancePeertube.java
@@ -87,7 +87,6 @@ public class FragmentLoginPickInstancePeertube extends Fragment implements Insta
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = FragmentLoginPickInstancePeertubeBinding.inflate(inflater, container, false);
 
-
         if (peertubeInformation == null || peertubeInformation.getLanguages() == null) {
             new Thread(() -> {
                 peertubeInformation = new PeertubeInformation();
diff --git a/app/src/main/res/layouts/peertube/layout/fragment_login_pick_instance_peertube.xml b/app/src/main/res/layouts/peertube/layout/fragment_login_pick_instance_peertube.xml
index 07078334c..133a5e5c5 100644
--- a/app/src/main/res/layouts/peertube/layout/fragment_login_pick_instance_peertube.xml
+++ b/app/src/main/res/layouts/peertube/layout/fragment_login_pick_instance_peertube.xml
@@ -18,7 +18,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/fab_margin"
     android:background="?android:windowBackground">
 
     <com.google.android.material.card.MaterialCardView