From a562019916881eac2b3e444c87d4d433ab62fe42 Mon Sep 17 00:00:00 2001 From: septs Date: Mon, 16 Dec 2024 13:12:53 +0800 Subject: [PATCH 1/2] fix: share file name display --- .../src/main/java/im/angry/openeuicc/util/UiUtils.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt index c8e481c..56f62df 100644 --- a/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt +++ b/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt @@ -1,5 +1,6 @@ package im.angry.openeuicc.util +import android.content.ClipData import android.content.Context import android.content.Intent import android.content.res.Resources @@ -101,10 +102,14 @@ fun T.setupLogSaving( setMessage(R.string.logs_saved_message) setNegativeButton(R.string.no) { _, _ -> } setPositiveButton(R.string.yes) { _, _ -> - val intent = Intent().apply { - action = Intent.ACTION_SEND + val fileName = getLogFileName() + + val intent = Intent(Intent.ACTION_SEND).apply { type = "text/plain" + clipData = ClipData.newUri(context.contentResolver, fileName, uri) + putExtra(Intent.EXTRA_TITLE, fileName) putExtra(Intent.EXTRA_STREAM, uri) + addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) } context.startActivity(Intent.createChooser(intent, null)) -- 2.45.3 From 650c3fd65c4a15c380cc052768f17353578cc88e Mon Sep 17 00:00:00 2001 From: septs Date: Wed, 18 Dec 2024 10:46:34 +0800 Subject: [PATCH 2/2] fix: accept reviews --- .../src/main/java/im/angry/openeuicc/util/UiUtils.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt index 56f62df..a73d7fe 100644 --- a/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt +++ b/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt @@ -82,6 +82,8 @@ fun T.setupLogSaving( getLogFileName: () -> String, getLogText: () -> String ): () -> Unit { + var lastFileName = "untitled" + val launchSaveIntent = registerForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { uri -> if (uri == null) return@registerForActivityResult @@ -102,12 +104,10 @@ fun T.setupLogSaving( setMessage(R.string.logs_saved_message) setNegativeButton(R.string.no) { _, _ -> } setPositiveButton(R.string.yes) { _, _ -> - val fileName = getLogFileName() - val intent = Intent(Intent.ACTION_SEND).apply { type = "text/plain" - clipData = ClipData.newUri(context.contentResolver, fileName, uri) - putExtra(Intent.EXTRA_TITLE, fileName) + clipData = ClipData.newUri(context.contentResolver, lastFileName, uri) + putExtra(Intent.EXTRA_TITLE, lastFileName) putExtra(Intent.EXTRA_STREAM, uri) addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) } @@ -118,6 +118,7 @@ fun T.setupLogSaving( } return { - launchSaveIntent.launch(getLogFileName()) + lastFileName = getLogFileName() + launchSaveIntent.launch(lastFileName) } } \ No newline at end of file -- 2.45.3