From 47ba5cbf477419b2be1daa1d170fc8389c3691f7 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 12 Apr 2020 09:55:15 +0200 Subject: Prepare release 2.34.2 --- app/build.gradle | 4 ++-- app/src/main/assets/changelogs/360.txt | 3 ++- app/src/main/java/app/fedilab/android/client/Entities/Status.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8327fc23e..0750d683a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 19 targetSdkVersion 29 - versionCode 359 - versionName "2.34.1" + versionCode 360 + versionName "2.34.2" multiDexEnabled true renderscriptTargetApi 28 as int renderscriptSupportModeEnabled true diff --git a/app/src/main/assets/changelogs/360.txt b/app/src/main/assets/changelogs/360.txt index d2c164b6b..4c3b093ba 100644 --- a/app/src/main/assets/changelogs/360.txt +++ b/app/src/main/assets/changelogs/360.txt @@ -5,4 +5,5 @@ Added: Fixed: - Crash when playing Youtube videos in timelines - Announcements not displayed -- A crash due to recent changes \ No newline at end of file +- A crash due to recent changes +- +Fix a crash due to polls \ No newline at end of file diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java index 1b690e369..223599eb1 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java @@ -929,7 +929,7 @@ public class Status implements Parcelable { } public static void makeEmojiPoll(final Context context, Poll poll) { - if (((Activity) context).isFinishing() || poll == null) + if (((Activity) context).isFinishing() || poll == null || poll.getOptionsList() == null) return; final List emojis = poll.getEmojis(); SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); -- cgit v1.2.3