fix: upload failure toast is shown multiple times

Author: or-else

app/src/main/java/co/tinode/tindroid/AttachmentHandler.java

@@ -82,6 +82,7 @@ public class AttachmentHandler extends Worker {
     final static String ARG_PROGRESS = "progress";
     final static String ARG_FILE_SIZE = "fileSize";
     final static String ARG_ERROR = "error";
+    final static String ARG_FATAL = "fatal";
     final static String ARG_MIME_TYPE = "mime";
     final static String ARG_AVATAR = "square_img";
     final static String ARG_IMAGE_WIDTH = "width";
@@ -426,9 +427,9 @@ private ListenableWorker.Result uploadMessageAttachment(final Context context, f
 
             if (uploadDetails.fileSize == 0) {
                 Log.w(TAG, "File size is zero; uri=" + uri + "; file=" + filePath);
-                store.msgDiscard(topic, msgId);
                 return ListenableWorker.Result.failure(
-                        result.putString(ARG_ERROR, context.getString(R.string.unable_to_attach_file)).build());
+                        result.putBoolean(ARG_FATAL, true)
+                                .putString(ARG_ERROR, context.getString(R.string.unable_to_attach_file)).build());
             }
 
             if (fname == null) {
@@ -457,6 +458,7 @@ private ListenableWorker.Result uploadMessageAttachment(final Context context, f
                                         R.string.attachment_too_large,
                                         UiUtils.bytesToHumanSize(uploadDetails.fileSize),
                                         UiUtils.bytesToHumanSize(maxFileUploadSize)))
+                                .putBoolean(ARG_FATAL, true)
                                 .build());
             } else {
                 if (is == null) {

app/src/main/java/co/tinode/tindroid/MessagesFragment.java

@@ -77,6 +77,7 @@
 import androidx.work.WorkManager;
 
 import co.tinode.tindroid.db.BaseDb;
+import co.tinode.tindroid.db.SqlStore;
 import co.tinode.tindroid.db.StoredTopic;
 import co.tinode.tindroid.format.SendForwardedFormatter;
 import co.tinode.tindroid.format.SendReplyFormatter;
@@ -85,6 +86,7 @@
 import co.tinode.tindroid.widgets.WaveDrawable;
 import co.tinode.tinodesdk.ComTopic;
 import co.tinode.tinodesdk.PromisedReply;
+import co.tinode.tinodesdk.Storage;
 import co.tinode.tinodesdk.Tinode;
 import co.tinode.tinodesdk.model.AccessChange;
 import co.tinode.tinodesdk.model.Acs;
@@ -454,7 +456,13 @@ public void afterTextChanged(Editable editable) {
                                 }
                                 if (topicName.equals(mTopicName)) {
                                     long msgId = failure.getLong(AttachmentHandler.ARG_MSG_ID, -1L);
-                                    if (BaseDb.getInstance().getStore().getMessageById(msgId) != null) {
+                                    boolean fatal = failure.getBoolean(AttachmentHandler.ARG_FATAL, false);
+                                    SqlStore store = BaseDb.getInstance().getStore();
+                                    Storage.Message msg = store.getMessageById(msgId);
+                                    if (fatal && msg != null) {
+                                        store.msgDiscard(mTopic, msgId);
+                                    }
+                                    if (msg != null) {
                                         runMessagesLoader(mTopicName);
                                         String error = failure.getString(AttachmentHandler.ARG_ERROR);
                                         Toast.makeText(activity, error, Toast.LENGTH_SHORT).show();

app/src/main/java/co/tinode/tindroid/db/SqlStore.java

@@ -294,7 +294,8 @@ public Storage.Message msgReceived(Topic topic, Subscription sub, MsgServerData
         return msg;
     }
 
-    private Storage.Message insertMessage(Topic topic, Drafty data, Map<String, Object> head, BaseDb.Status initialStatus) {
+    private Storage.Message insertMessage(Topic topic, Drafty data, Map<String, Object> head,
+                                          BaseDb.Status initialStatus) {
         StoredMessage msg = new StoredMessage();
         SQLiteDatabase db = mDbh.getWritableDatabase();