From 86e371b4f5f5c19b99345a8433999d094cd58e73 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Tue, 8 Nov 2022 14:33:15 +0100
Subject: [PATCH] Fix some issues

---
 app/src/main/java/app/fedilab/android/helper/Helper.java     | 5 ++++-
 .../java/app/fedilab/android/ui/drawer/ComposeAdapter.java   | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

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 61843940..e6742125 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -693,6 +693,9 @@ public class Helper {
      * @param url     String url to open
      */
     public static void openBrowser(Context context, String url) {
+        if (url == null) {
+            return;
+        }
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
         boolean embedded_browser = sharedpreferences.getBoolean(context.getString(R.string.SET_EMBEDDED_BROWSER), true);
         if (embedded_browser && !url.toLowerCase().startsWith("gemini://")) {
@@ -708,7 +711,7 @@ public class Helper {
         } else {
             Intent intent = new Intent(Intent.ACTION_VIEW);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            if (url != null && !url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://") && !url.toLowerCase().startsWith("gemini://")) {
+            if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://") && !url.toLowerCase().startsWith("gemini://")) {
                 url = "http://" + url;
             }
             intent.setData(Uri.parse(url));
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index b1c4f835..f64235b2 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -1198,6 +1198,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
             if (visibility != null && statusDraft.visibility == null) {
                 statusDraft.visibility = visibility;
             }
+            boolean unlistedReplies = sharedpreferences.getBoolean(context.getString(R.string.SET_UNLISTED_REPLIES), true);
             if (statusDraft.visibility == null) {
                 if (position > 0) {
                     statusDraft.visibility = statusList.get(position - 1).visibility;
@@ -1206,10 +1207,11 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 } else {
                     statusDraft.visibility = "public";
                 }
-                boolean unlistedReplies = sharedpreferences.getBoolean(context.getString(R.string.SET_UNLISTED_REPLIES), true);
                 if (position == 0 && unlistedReplies && statusDraft.visibility.equalsIgnoreCase("public") && statusList.size() > 1) {
                     statusDraft.visibility = "unlisted";
                 }
+            } else if (position == statusCount && unlistedReplies && statusDraft.visibility.equalsIgnoreCase("public") && statusList.size() > 1) {
+                statusDraft.visibility = "unlisted";
             }
 
             switch (statusDraft.visibility.toLowerCase()) {