Merge branch 'adb/issue-3701' of https://github.com/deltachat/deltachat-android into adb/issue-3701

CHANGELOG.md

@@ -7,6 +7,7 @@
   the contact's profile gives a much better overview
 * Disable AEAP to enable us to overhaul some things - there are big changes underway in this area, which will come in a few months
 * don't display email address in contact list and member list for contacts with green-checkmark
+* avoid crash in Notifications preferences if ringtone title can't be read
 
 ## v1.56.1
 2025-03

src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java

@@ -423,7 +423,12 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
   private void progressError(String data2) {
     if (progressDialog != null) {
-      progressDialog.dismiss();
+      try {
+        progressDialog.dismiss();
+      } catch (IllegalArgumentException e) {
+        // see https://stackoverflow.com/a/5102572/4557005
+        Log.w(TAG, e);
+      }
     }
     WelcomeActivity.maybeShowConfigurationError(this, data2);
   }

src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java

@@ -14,6 +14,7 @@ import android.os.Bundle;
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -31,6 +32,7 @@ import org.thoughtcrime.securesms.util.Prefs;
 
 public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragment {
 
+  private static final String TAG = NotificationsPreferenceFragment.class.getSimpleName();
   private static final int REQUEST_CODE_NOTIFICATION_SELECTED = 1;
 
   private CheckBoxPreference ignoreBattery;
@@ -159,7 +161,17 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
         Ringtone tone = RingtoneManager.getRingtone(getActivity(), value);
 
         if (tone != null) {
-          preference.setSummary(tone.getTitle(getActivity()));
+          String summary;
+          try {
+            summary = tone.getTitle(getActivity());
+          } catch (SecurityException e) {
+            // this could happen in some phones when user selects ringtone from
+            // external storage and later removes the read from external storage permission
+            // and later this method is called from initializeRingtoneSummary()
+            summary = "<no access>";
+            Log.w(TAG, e);
+          }
+          preference.setSummary(summary);
         }
       }
 

src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java

@@ -303,7 +303,7 @@ final class UriGlideRenderer implements Renderer {
 
   @Override
   public void writeToParcel(Parcel dest, int flags) {
-    dest.writeString(imageUri.toString());
+    dest.writeString(imageUri!=null? imageUri.toString() : "");
     dest.writeInt(decryptable ? 1 : 0);
     dest.writeInt(maxWidth);
     dest.writeInt(maxHeight);