From e9d2a39098f9aaca39cbd06466d3449519466215 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Thu, 16 Jan 2025 20:03:43 +0100
Subject: [PATCH 1/3] avoid null in attachment filename

---
 .../org/thoughtcrime/securesms/ConversationActivity.java    | 2 +-
 .../org/thoughtcrime/securesms/audio/AudioRecorder.java     | 2 +-
 .../securesms/providers/PersistentBlobProvider.java         | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index 3a8fdd92d..75bf927ff 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1178,7 +1178,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   @Override
   public void onImageCapture(@NonNull final byte[] imageBytes) {
     setMedia(PersistentBlobProvider.getInstance()
-                                   .create(this, imageBytes, MediaUtil.IMAGE_JPEG, null),
+                                   .create(this, imageBytes, MediaUtil.IMAGE_JPEG, "image.jpeg"),
              MediaType.IMAGE);
     quickAttachmentDrawer.hide(false);
   }
diff --git a/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java b/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
index 826511012..3ef451e62 100644
--- a/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
+++ b/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
@@ -48,7 +48,7 @@ public class AudioRecorder {
         ParcelFileDescriptor fds[] = ParcelFileDescriptor.createPipe();
 
         captureUri  = blobProvider.create(context, new ParcelFileDescriptor.AutoCloseInputStream(fds[0]),
-                                          MediaUtil.AUDIO_AAC, null, null);
+                                          MediaUtil.AUDIO_AAC, "voice.aac", null);
         audioCodec  = new AudioCodec(context);
 
         audioCodec.start(new ParcelFileDescriptor.AutoCloseOutputStream(fds[1]));
diff --git a/src/main/java/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java b/src/main/java/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
index f4000c2f9..31bbdf152 100644
--- a/src/main/java/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
+++ b/src/main/java/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
@@ -72,6 +72,9 @@ public class PersistentBlobProvider {
                     @Nullable String fileName)
   {
     final long id = System.currentTimeMillis();
+    if (fileName == null) {
+      fileName = "file." + MediaUtil.getExtensionFromMimeType(mimeType);
+    }
     return create(context, new ByteArrayInputStream(blobBytes), id, mimeType, fileName, (long) blobBytes.length);
   }
 
@@ -81,6 +84,9 @@ public class PersistentBlobProvider {
                     @Nullable String fileName,
                     @Nullable Long   fileSize)
   {
+    if (fileName == null) {
+      fileName = "file." + MediaUtil.getExtensionFromMimeType(mimeType);
+    }
     return create(context, input, System.currentTimeMillis(), mimeType, fileName, fileSize);
   }
 

From 83b16e5f4be2514cf6b9f95640a676eadd52575b Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Thu, 16 Jan 2025 23:41:37 +0100
Subject: [PATCH 2/3] do not force ppl to create blank issues

see https://github.com/deltachat/deltachat-ios/pull/2525
for screenshots and reasoning
---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 0b1f2a066..1c61bf563 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Feature requests
     url: https://support.delta.chat/c/features/6

From a7c3bc7ac55a79d523776b65537b1de831299f73 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 17 Jan 2025 17:37:16 +0100
Subject: [PATCH 3/3] add missing desktop strings

---
 src/main/res/values/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8f7c0d71b..4b4759fa3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -37,6 +37,7 @@
     <string name="close_window">Close Window</string>
     <string name="forward">Forward</string>
     <string name="create">Create</string>
+    <string name="reset">Reset</string>
     <string name="later">Later</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Resend</string>
@@ -45,6 +46,7 @@
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
     <string name="unarchive">Unarchive</string>
     <string name="mute">Mute</string>
+    <string name="muted">Muted</string>
     <string name="ephemeral_messages">Disappearing Messages</string>
     <string name="ephemeral_messages_hint">Applies to all members of this chat if they use Delta Chat; they can still copy, save, and forward messages or use other e-mail clients.</string>
     <string name="save">Save</string>
@@ -184,6 +186,12 @@
     <string name="webxdc_apps">Apps</string>
     <string name="webxdc_store_url">App Picker URL</string>
     <string name="webxdc_store_url_explain">If set, the URL will be used as the App Picker instead of the default one</string>
+    <string name="home">Home</string>
+    <string name="games">Games</string>
+    <string name="tools">Tools</string>
+    <string name="app_size">Size</string>
+    <string name="app_date_published">Published</string>
+    <string name="add_to_chat">Add to Chat</string>
     <string name="unknown">Unknown</string>
 
     <string name="green">Green</string>
@@ -719,6 +727,7 @@
     <string name="pref_appearance">Appearance</string>
     <string name="pref_theme">Theme</string>
     <string name="pref_language">Language</string>
+    <string name="pref_use_system_ui_font">Use System Font</string>
     <string name="pref_incognito_keyboard">Incognito Keyboard</string>
     <!-- Translators: Must indicate that there is no guarantee as the system may not honor our request. -->
     <string name="pref_incognito_keyboard_explain">Request keyboard to disable personalized learning</string>