Merge remote-tracking branch 'upstream/main'

2026-07-03 14:05:24 +02:00 · 2025-11-05 17:13:44 +01:00
parent e5c9fd05f2 c4427c198e
commit 7e1930abc5
96 changed files with 936 additions and 2770 deletions
@@ -1159,7 +1159,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity

          if (doSend) {
            if (dcContext.sendMsg(dcChat.getId(), msg) == 0) {
-              Util.runOnMain(()-> Toast.makeText(ConversationActivity.this, dcContext.getLastError(), Toast.LENGTH_LONG).show());
+              String lastError = dcContext.getLastError();
+              if (!"".equals(lastError)) {
+                Util.runOnMain(() -> Toast.makeText(ConversationActivity.this, lastError, Toast.LENGTH_LONG).show());
+              }
              future.set(chatId);
              return;
            }