followup changes to save file feature

- extract dialog to SaveToStorageDialogFragment - add ability to save files of other mimetypes than images - use MaterialAlertDialogBuilder - save files to matching folders depending on mimeType - show toast - change download icon Signed-off-by: Marcel Hibbe <[email protected]>
nextcloud · Nov 8, 2023 · 640007b · 640007b
1 parent 2f24c13
commit 640007b
Show file tree

Hide file tree

Showing 16 changed files with 332 additions and 164 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -152,17 +152,17 @@
             android:theme="@style/AppTheme.CallLauncher" />
 
         <activity
-            android:name=".activities.FullScreenImageActivity"
+            android:name=".fullscreenfile.FullScreenImageActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@style/FullScreenImageTheme"/>
 
         <activity
-            android:name=".activities.FullScreenMediaActivity"
+            android:name=".fullscreenfile.FullScreenMediaActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@style/FullScreenMediaTheme"/>
 
         <activity
-            android:name=".activities.FullScreenTextViewerActivity"
+            android:name=".fullscreenfile.FullScreenTextViewerActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@style/FullScreenTextTheme"/>
 

diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -34,7 +34,6 @@ import android.annotation.SuppressLint
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.AssetFileDescriptor
@@ -157,7 +156,6 @@ import com.nextcloud.talk.events.UserMentionClickEvent
 import com.nextcloud.talk.events.WebSocketCommunicationEvent
 import com.nextcloud.talk.extensions.loadAvatarOrImagePreview
 import com.nextcloud.talk.jobs.DownloadFileToCacheWorker
-import com.nextcloud.talk.jobs.SaveFileToStorageWorker
 import com.nextcloud.talk.jobs.ShareOperationWorker
 import com.nextcloud.talk.jobs.UploadAndShareFilesWorker
 import com.nextcloud.talk.location.LocationPickerActivity
@@ -191,6 +189,7 @@ import com.nextcloud.talk.ui.bottom.sheet.ProfileBottomSheet
 import com.nextcloud.talk.ui.dialog.AttachmentDialog
 import com.nextcloud.talk.ui.dialog.DateTimePickerFragment
 import com.nextcloud.talk.ui.dialog.MessageActionsDialog
+import com.nextcloud.talk.ui.dialog.SaveToStorageDialogFragment
 import com.nextcloud.talk.ui.dialog.ShowReactionsDialog
 import com.nextcloud.talk.ui.recyclerview.MessageSwipeActions
 import com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback
@@ -2020,44 +2019,6 @@ class ChatActivity :
             }
     }
 
-    @SuppressLint("LongLogTag")
-    private fun saveImageToStorage(
-        message: ChatMessage
-    ) {
-        message.openWhenDownloaded = false
-        adapter?.update(message)
-
-        val fileName = message.selectedIndividualHashMap!!["name"]
-        val sourceFilePath = applicationContext.cacheDir.path
-        val fileId = message.selectedIndividualHashMap!!["id"]
-
-        val workers = WorkManager.getInstance(context).getWorkInfosByTag(fileId!!)
-        try {
-            for (workInfo in workers.get()) {
-                if (workInfo.state == WorkInfo.State.RUNNING || workInfo.state == WorkInfo.State.ENQUEUED) {
-                    Log.d(TAG, "SaveFileToStorageWorker for $fileId is already running or scheduled")
-                    return
-                }
-            }
-        } catch (e: ExecutionException) {
-            Log.e(TAG, "Error when checking if worker already exists", e)
-        } catch (e: InterruptedException) {
-            Log.e(TAG, "Error when checking if worker already exists", e)
-        }
-
-        val data: Data = Data.Builder()
-            .putString(SaveFileToStorageWorker.KEY_FILE_NAME, fileName)
-            .putString(SaveFileToStorageWorker.KEY_SOURCE_FILE_PATH, "$sourceFilePath/$fileName")
-            .build()
-
-        val saveWorker: OneTimeWorkRequest = OneTimeWorkRequest.Builder(SaveFileToStorageWorker::class.java)
-            .setInputData(data)
-            .addTag(fileId)
-            .build()
-
-        WorkManager.getInstance().enqueue(saveWorker)
-    }
-
     @SuppressLint("SimpleDateFormat")
     private fun setVoiceRecordFileName() {
         val simpleDateFormat = SimpleDateFormat(FILE_DATE_PATTERN)
@@ -4147,27 +4108,14 @@ class ChatActivity :
         }
     }
 
-    private fun saveImage(message: ChatMessage) {
-        if (permissionUtil.isFilesPermissionGranted()) {
-            saveImageToStorage(message)
-        } else {
-            UploadAndShareFilesWorker.requestStoragePermission(this@ChatActivity)
-        }
-    }
-
     private fun showSaveToStorageWarning(message: ChatMessage) {
-        val builder = AlertDialog.Builder(this)
-        builder.setTitle(R.string.nc_dialog_save_to_storage_title)
-        builder.setMessage(R.string.nc_dialog_save_to_storage_content)
-        builder.setPositiveButton(R.string.nc_dialog_save_to_storage_yes) { dialog: DialogInterface, _: Int ->
-            saveImage(message)
-            dialog.dismiss()
-        }
-        builder.setNegativeButton(R.string.nc_dialog_save_to_storage_no) { dialog: DialogInterface, _: Int ->
-            dialog.dismiss()
-        }
-        val dialog = builder.create()
-        dialog.show()
+        val saveFragment: DialogFragment = SaveToStorageDialogFragment.newInstance(
+            message.selectedIndividualHashMap!!["name"]!!
+        )
+        saveFragment.show(
+            supportFragmentManager,
+            SaveToStorageDialogFragment.TAG
+        )
     }
 
     fun checkIfSaveable(message: ChatMessage) {
@@ -4608,5 +4556,6 @@ class ChatActivity :
         private const val TYPING_STOPPED_SIGNALING_MESSAGE_TYPE = "stoppedTyping"
         private const val CALL_STARTED_ID = -2
         private const val MILISEC_15: Long = 15
+        private const val LINEBREAK = "\n"
     }
 }
diff --git a/...alk/activities/FullScreenImageActivity.kt → ...fullscreenfile/FullScreenImageActivity.kt b/...alk/activities/FullScreenImageActivity.kt → ...fullscreenfile/FullScreenImageActivity.kt
@@ -24,18 +24,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.talk.activities
+package com.nextcloud.talk.fullscreenfile
 
-import android.annotation.SuppressLint
-import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.FileProvider
 import androidx.core.view.ViewCompat
@@ -44,28 +41,25 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
-import androidx.work.Data
-import androidx.work.OneTimeWorkRequest
-import androidx.work.WorkInfo
-import androidx.work.WorkManager
+import androidx.fragment.app.DialogFragment
+import autodagger.AutoInjector
 import com.google.android.material.snackbar.Snackbar
 import com.nextcloud.talk.BuildConfig
 import com.nextcloud.talk.R
+import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.databinding.ActivityFullScreenImageBinding
-import com.nextcloud.talk.jobs.SaveFileToStorageWorker
-import com.nextcloud.talk.ui.theme.ViewThemeUtils
+import com.nextcloud.talk.ui.dialog.SaveToStorageDialogFragment
 import com.nextcloud.talk.utils.BitmapShrinker
 import com.nextcloud.talk.utils.Mimetype.IMAGE_PREFIX_GENERIC
 import pl.droidsonroids.gif.GifDrawable
 import java.io.File
-import java.util.concurrent.ExecutionException
 
+@AutoInjector(NextcloudTalkApplication::class)
 class FullScreenImageActivity : AppCompatActivity() {
     lateinit var binding: ActivityFullScreenImageBinding
     private lateinit var windowInsetsController: WindowInsetsControllerCompat
     private lateinit var path: String
     private var showFullscreen = false
-    lateinit var viewThemeUtils: ViewThemeUtils
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_preview, menu)
@@ -98,7 +92,13 @@ class FullScreenImageActivity : AppCompatActivity() {
             }
 
             R.id.save -> {
-                showWarningDialog()
+                val saveFragment: DialogFragment = SaveToStorageDialogFragment.newInstance(
+                    intent.getStringExtra("FILE_NAME").toString()
+                )
+                saveFragment.show(
+                    supportFragmentManager,
+                    SaveToStorageDialogFragment.TAG
+                )
                 true
             }
 
@@ -108,24 +108,9 @@ class FullScreenImageActivity : AppCompatActivity() {
         }
     }
 
-    private fun showWarningDialog() {
-        val builder = AlertDialog.Builder(this)
-        builder.setTitle(R.string.nc_dialog_save_to_storage_title)
-        builder.setMessage(R.string.nc_dialog_save_to_storage_content)
-        builder.setPositiveButton(R.string.nc_dialog_save_to_storage_yes) { dialog: DialogInterface, which: Int ->
-            val fileName = intent.getStringExtra("FILE_NAME").toString()
-            saveImageToStorage(fileName)
-            dialog.dismiss()
-        }
-        builder.setNegativeButton(R.string.nc_dialog_save_to_storage_no) { dialog: DialogInterface, which: Int ->
-            dialog.dismiss()
-        }
-        val dialog = builder.create()
-        dialog.show()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
 
         binding = ActivityFullScreenImageBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -222,38 +207,6 @@ class FullScreenImageActivity : AppCompatActivity() {
         }
     }
 
-    @SuppressLint("LongLogTag")
-    private fun saveImageToStorage(
-        fileName: String
-    ) {
-        val sourceFilePath = applicationContext.cacheDir.path
-
-        val workers = WorkManager.getInstance(this).getWorkInfosByTag(fileName)
-        try {
-            for (workInfo in workers.get()) {
-                if (workInfo.state == WorkInfo.State.RUNNING || workInfo.state == WorkInfo.State.ENQUEUED) {
-                    return
-                }
-            }
-        } catch (e: ExecutionException) {
-            Log.e(TAG, "Error when checking if worker already exists", e)
-        } catch (e: InterruptedException) {
-            Log.e(TAG, "Error when checking if worker already exists", e)
-        }
-
-        val data: Data = Data.Builder()
-            .putString(SaveFileToStorageWorker.KEY_FILE_NAME, fileName)
-            .putString(SaveFileToStorageWorker.KEY_SOURCE_FILE_PATH, "$sourceFilePath/$fileName")
-            .build()
-
-        val saveWorker: OneTimeWorkRequest = OneTimeWorkRequest.Builder(SaveFileToStorageWorker::class.java)
-            .setInputData(data)
-            .addTag(fileName)
-            .build()
-
-        WorkManager.getInstance().enqueue(saveWorker)
-    }
-
     companion object {
         private const val TAG = "FullScreenImageActivity"
         private const val HUNDRED_MB = 100 * 1024 * 1024

diff --git a/...alk/activities/FullScreenMediaActivity.kt → ...fullscreenfile/FullScreenMediaActivity.kt b/...alk/activities/FullScreenMediaActivity.kt → ...fullscreenfile/FullScreenMediaActivity.kt
@@ -24,7 +24,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.talk.activities
+package com.nextcloud.talk.fullscreenfile
 
 import android.content.Intent
 import android.os.Bundle
@@ -43,6 +43,7 @@ import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.marginBottom
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
+import androidx.fragment.app.DialogFragment
 import androidx.media3.common.MediaItem
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
@@ -53,6 +54,7 @@ import com.nextcloud.talk.BuildConfig
 import com.nextcloud.talk.R
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.databinding.ActivityFullScreenMediaBinding
+import com.nextcloud.talk.ui.dialog.SaveToStorageDialogFragment
 import com.nextcloud.talk.utils.Mimetype.VIDEO_PREFIX_GENERIC
 import java.io.File
 
@@ -78,6 +80,7 @@ class FullScreenMediaActivity : AppCompatActivity() {
                 onBackPressedDispatcher.onBackPressed()
                 true
             }
+
             R.id.share -> {
                 val shareUri = FileProvider.getUriForFile(
                     this,
@@ -95,6 +98,18 @@ class FullScreenMediaActivity : AppCompatActivity() {
 
                 true
             }
+
+            R.id.save -> {
+                val saveFragment: DialogFragment = SaveToStorageDialogFragment.newInstance(
+                    intent.getStringExtra("FILE_NAME").toString()
+                )
+                saveFragment.show(
+                    supportFragmentManager,
+                    SaveToStorageDialogFragment.TAG
+                )
+                true
+            }
+
             else -> {
                 super.onOptionsItemSelected(item)
             }