From e9340b429adc388979210f6d784d3fa0907d3b5e Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Fri, 20 May 2022 15:53:08 +0530 Subject: [PATCH] [Share] Cleanup Sharing of bug report and backup --- .../retromusic/activities/ErrorActivity.kt | 2 +- .../fragments/backup/BackupFragment.kt | 9 ++---- .../name/monkey/retromusic/util/BackupUtil.kt | 28 ------------------- .../name/monkey/retromusic/util/MusicUtil.kt | 18 ++++++------ .../code/name/monkey/retromusic/util/Share.kt | 20 ++++++------- 5 files changed, 21 insertions(+), 56 deletions(-) delete mode 100644 app/src/main/java/code/name/monkey/retromusic/util/BackupUtil.kt diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt index 1673cb84d..99bff34cb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt @@ -64,7 +64,7 @@ class ErrorActivity : AppCompatActivity() { intent ), ".txt" ) - shareFile(this, bugReport) + shareFile(this, bugReport, "text/*") } .show() } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt index f5dc5b069..304a02ec7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt @@ -22,7 +22,7 @@ import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.extensions.showToast import code.name.monkey.retromusic.helper.BackupHelper import code.name.monkey.retromusic.helper.sanitize -import code.name.monkey.retromusic.util.BackupUtil +import code.name.monkey.retromusic.util.Share import com.afollestad.materialdialogs.input.input import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -128,12 +128,7 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC return true } R.id.action_share -> { - activity?.startActivity( - Intent.createChooser( - BackupUtil.createShareFileIntent(file, requireContext()), - null - ) - ) + Share.shareFile(requireContext(), file, "*/*") return true } R.id.action_rename -> { diff --git a/app/src/main/java/code/name/monkey/retromusic/util/BackupUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/BackupUtil.kt deleted file mode 100644 index e7a6f430a..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/util/BackupUtil.kt +++ /dev/null @@ -1,28 +0,0 @@ -package code.name.monkey.retromusic.util - -import android.content.Context -import android.content.Intent -import androidx.core.content.FileProvider -import code.name.monkey.retromusic.extensions.showToast -import java.io.File - -object BackupUtil { - fun createShareFileIntent(file: File, context: Context): Intent? { - return try { - Intent().setAction(Intent.ACTION_SEND).putExtra( - Intent.EXTRA_STREAM, - FileProvider.getUriForFile( - context, - context.applicationContext.packageName, - file - ) - ).addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION).setType("*/*") - } catch (e: IllegalArgumentException) { - e.printStackTrace() - context.showToast( - "Could not share this file." - ) - Intent() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt index feeb5c37b..4fa2d4f60 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt @@ -26,7 +26,6 @@ import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics import code.name.monkey.retromusic.repository.Repository import code.name.monkey.retromusic.repository.SongRepository -import code.name.monkey.retromusic.service.MusicService import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.withContext @@ -42,21 +41,20 @@ import java.util.regex.Pattern object MusicUtil : KoinComponent { - fun createShareSongFileIntent(song: Song, context: Context): Intent? { - return try { - Intent().setAction(Intent.ACTION_SEND).putExtra( - Intent.EXTRA_STREAM, + fun createShareSongFileIntent(song: Song, context: Context): Intent { + return Intent().apply { + action = Intent.ACTION_SEND + putExtra(Intent.EXTRA_STREAM, try { FileProvider.getUriForFile( context, context.applicationContext.packageName, File(song.data) ) - ).addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION).setType("audio/*") - } catch (e: IllegalArgumentException) { - Intent().setAction(Intent.ACTION_SEND).putExtra( - Intent.EXTRA_STREAM, + } catch (e: IllegalArgumentException) { getSongFileUri(song.id) - ).addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION).setType("audio/*") + }) + addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + type = "audio/*" } } diff --git a/app/src/main/java/code/name/monkey/retromusic/util/Share.kt b/app/src/main/java/code/name/monkey/retromusic/util/Share.kt index b33559cea..5994419bf 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/Share.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/Share.kt @@ -32,15 +32,15 @@ object Share { context.startActivity(feedIntent, null) } - fun shareFile(context: Context, file: File) { - val attachmentUri = FileProvider.getUriForFile( - context, - context.applicationContext.packageName, - file - ) - val sharingIntent = Intent(Intent.ACTION_SEND) - sharingIntent.type = "text/*" - sharingIntent.putExtra(Intent.EXTRA_STREAM, attachmentUri) - context.startActivity(Intent.createChooser(sharingIntent, "send bug report")) + fun shareFile(context: Context, file: File, mimeType: String) { + Intent(Intent.ACTION_SEND).apply { + type = mimeType + putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile( + context, + context.applicationContext.packageName, + file + )) + context.startActivity(Intent.createChooser(this, null)) + } } } \ No newline at end of file