Merge branch 'develop' into peertube_integration

5 files changed, 12 insertions, 3 deletions

diff --git a/app/build.gradle b/app/build.gradle
index d3456ce1f..7a40f5574 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 33
-        versionCode 485
-        versionName "3.20.2"
+        versionCode 486
+        versionName "3.20.3"
         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 675dbd45a..7bd7c1082 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,5 +1,10 @@
 [
   {
+    "version": "3.20.3",
+    "code": "486",
+    "note": "Added:\n- Display all following/followers lists from remote profiles\n- Display all accounts that boosted/fav from a remote message\n\nFixed:\n- Fix a crash with auto-fetch messages"
+  },
+  {
     "version": "3.20.2",
     "code": "485",
     "note": "Added:\n- Visual indicator when fetching missing messages\n- Open media description when it is missing from the warning dialog\n\nChanged:\n- Maths formula aligned to the left\n- Faster access to delete all notifications\n\nFixed:\n- Fix an issue with Nitter and some URLs\n- Fix refresh issue with notifications\n- Fix an issue when entering a Peertube instance\n- Fix jumps with Akkoma/Pleroma when media preview size is not set\n- Some crashes"
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonAccount.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonAccount.java
index 309510d4f..3acf80e2a 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonAccount.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonAccount.java
@@ -141,7 +141,7 @@ public class FragmentMastodonAccount extends Fragment {
                 fetchAccount(firstLoad, remoteAccountId);
             }
         } else {
-            fetchAccount(firstLoad, accountTimeline.id);
+            fetchAccount(firstLoad, accountTimeline != null ? accountTimeline.id : null);
         }
     }
 
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 2702a31f7..ce563d706 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1050,4 +1050,6 @@
     <string name="fetch_remote_media">Automaticky načítat vzdálená média, pokud nejsou k dispozici</string>
     <string name="reblog_missing_description">U této zprávy chybí popis médií. Opravdu ji chcete boostnout\?</string>
     <string name="warn_boost_no_media_description">Varovat před boostnutím, pokud zpráva nemá popis médií</string>
+    <string name="add_description">Přidat popis</string>
+    <string name="fetching_messages">Načítání zpráv</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 67db1d6fe..442a8c724 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1041,4 +1041,6 @@
     <string name="load_media_remotely">Medyayı uzaktan yükle</string>
     <string name="warn_boost_no_media_description">Arttırmadan önce mesajın medya açıklaması yoksa uyar</string>
     <string name="reblog_missing_description">Bu mesajın medya açıklaması eksik. Arttırmak istediğinizden emin misiniz\?</string>
+    <string name="fetching_messages">Mesajlar alınıyor</string>
+    <string name="add_description">Açıklama ekle</string>
 </resources>
\ No newline at end of file