From 5d2c83fab303e670c319a674428f7fd8b8504203 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 16 May 2022 19:01:02 +0200
Subject: [PATCH] Fix Friendica connection issue

---
 .../main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java | 2 +-
 .../app/fedilab/android/viewmodel/mastodon/TimelinesVM.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 4d6ebaf5..bf5cdf0a 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
@@ -1060,7 +1060,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
             if (statusDraft.visibility == null) {
                 if (position > 0) {
                     statusDraft.visibility = statusList.get(position - 1).visibility;
-                } else if (BaseMainActivity.accountWeakReference.get().mastodon_account != null) {
+                } else if (BaseMainActivity.accountWeakReference.get().mastodon_account != null && BaseMainActivity.accountWeakReference.get().mastodon_account.source != null) {
                     statusDraft.visibility = BaseMainActivity.accountWeakReference.get().mastodon_account.source.privacy;
                 } else {
                     statusDraft.visibility = "public";
diff --git a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java
index 6b5b670e..9ae6b452 100644
--- a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java
+++ b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java
@@ -656,7 +656,7 @@ public class TimelinesVM extends AndroidViewModel {
                     if (getMarkerResponse.isSuccessful()) {
                         marker = getMarkerResponse.body();
                     }
-                } catch (IOException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }