fix for non-printable file name of an attachment

tinode · Dec 17, 2024 · 88b9bfb · 88b9bfb
1 parent 698d181
commit 88b9bfb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/app/src/main/java/co/tinode/tindroid/MessagesAdapter.java b/app/src/main/java/co/tinode/tindroid/MessagesAdapter.java
@@ -1262,8 +1262,12 @@ private boolean clickAttachment(Map<String, Object> data) {
                 }
             }
 
+            if (fname != null) {
+                fname = fname.trim();
+            }
             if (TextUtils.isEmpty(fname)) {
                 fname = mActivity.getString(R.string.default_attachment_name);
+                fname += Long.toString(System.currentTimeMillis() % 10000);
             }
 
             AttachmentHandler.enqueueDownloadAttachment(mActivity,

diff --git a/app/src/main/java/co/tinode/tindroid/VideoViewFragment.java b/app/src/main/java/co/tinode/tindroid/VideoViewFragment.java
@@ -298,6 +298,9 @@ public boolean onMenuItemSelected(@NonNull MenuItem item) {
             String filename = args.getString(AttachmentHandler.ARG_FILE_NAME);
             String mime = args.getString(AttachmentHandler.ARG_MIME_TYPE);
 
+            if (filename != null) {
+                filename = filename.trim();
+            }
             if (TextUtils.isEmpty(filename)) {
                 filename = getResources().getString(R.string.tinode_video);
                 filename += Long.toString(System.currentTimeMillis() % 10000);