Some fixes

3 files changed, 11 insertions, 2 deletions

diff --git a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
index 7a39946da..4f92c1e84 100644
--- a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
@@ -464,7 +464,7 @@ public class PinnedTimelineHelper {
                                 break;
                             case NITTER:
                                 item.setIcon(R.drawable.nitter);
-                                if (pinnedTimeline.remoteInstance.displayName.trim().length() > 0) {
+                                if (pinnedTimeline.remoteInstance.displayName != null && pinnedTimeline.remoteInstance.displayName.trim().length() > 0) {
                                     item.setTitle(pinnedTimeline.remoteInstance.displayName);
                                 } else {
                                     item.setTitle(pinnedTimeline.remoteInstance.host);
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
index baa1a162c..24d837d5f 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
@@ -2615,7 +2615,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                     holder.bindingArt.artMedia.setScaleType(ImageView.ScaleType.FIT_CENTER);
                     holder.bindingArt.artMedia.setLayoutParams(lp);
                     RequestBuilder<Drawable> requestBuilder = prepareRequestBuilder(context, status.art_attachment, mediaW * ratio, mediaH * ratio, 1.0f, 1.0f, status.sensitive, true);
-                    requestBuilder.into(holder.bindingArt.artMedia);
+                    requestBuilder.load(status.art_attachment.preview_url).into(holder.bindingArt.artMedia);
                 }
 
             }
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/464.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/464.txt
new file mode 100644
index 000000000..e53c48692
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/464.txt
@@ -0,0 +1,9 @@
+Added:
+
+
+Changed:
+
+
+Fixed:
+- Fix a crash with Art timelines
+- Fix a crash with pinned timelines
\ No newline at end of file