Release 3.3.0

4 files changed, 8 insertions, 8 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 04eccee4d..6bf692137 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 31
-        versionCode 406
-        versionName "3.2.1"
+        versionCode 407
+        versionName "3.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index d36fbc807..b368bd415 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,8 +1,8 @@
 [
   {
-    "version": "3.2.1",
-    "code": "406",
-    "note": "Added:\n- Settings to set all timelines at the top\n- Settings to display timelines in a list\n\nFixed:\n- Visibility issue when replying\n- Some theme issues when composing"
+    "version": "3.3.0",
+    "code": "407",
+    "note": "Added:\n- Settings to set all timelines at the top (default disabled)\n- Settings to display timelines in a list (default disabled)\n- Display counters for fav/reblog in timelines (default disabled)\n\nFixed:\n- Visibility issue when replying\n- Some theme issues when composing\n- Some crashes"
   },
   {
     "version": "3.2.0",
diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
index ad5d1623e..d19ef86fe 100644
--- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
@@ -630,10 +630,10 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
                                         item.setIcon(R.drawable.ic_person);
                                         boolean disableGif = sharedpreferences.getBoolean(getString(R.string.SET_DISABLE_GIF), false);
                                         String url = !disableGif ? account.mastodon_account.avatar : account.mastodon_account.avatar_static;
-                                        if (url.startsWith("/")) {
+                                        if (url != null && url.startsWith("/")) {
                                             url = "https://" + account.instance + account.mastodon_account.avatar;
                                         }
-                                        if (!this.isDestroyed() && !this.isFinishing()) {
+                                        if (!this.isDestroyed() && !this.isFinishing() && url != null) {
                                             if (url.contains(".gif")) {
                                                 Glide.with(BaseMainActivity.this)
                                                         .asGif()
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
index ade637597..2ca187c3f 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
@@ -788,7 +788,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
                                 accountsVM.getAccountStatuses(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountTimeline.id, null, null, null, null, null, false, true, MastodonHelper.statusesPerCall(requireActivity()))
                                         .observe(getViewLifecycleOwner(), pinnedStatuses -> accountsVM.getAccountStatuses(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountTimeline.id, null, null, null, exclude_replies, exclude_reblogs, media_only, false, MastodonHelper.statusesPerCall(requireActivity()))
                                                 .observe(getViewLifecycleOwner(), otherStatuses -> {
-                                                    if (otherStatuses != null && otherStatuses.statuses != null && pinnedStatuses != null) {
+                                                    if (otherStatuses != null && otherStatuses.statuses != null && pinnedStatuses != null && pinnedStatuses.statuses != null) {
                                                         for (Status status : pinnedStatuses.statuses) {
                                                             status.pinned = true;
                                                         }