Remove action to delete saved image in notification
Can just open it and delete from whatever gallery app the user has which has way more functionality. Closes #8327
This commit is contained in:
parent
0d09039e5f
commit
720169dce3
@ -7,14 +7,12 @@ import android.content.Intent
|
|||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import androidx.core.net.toUri
|
import androidx.core.net.toUri
|
||||||
import com.hippo.unifile.UniFile
|
|
||||||
import eu.kanade.tachiyomi.data.backup.BackupRestoreJob
|
import eu.kanade.tachiyomi.data.backup.BackupRestoreJob
|
||||||
import eu.kanade.tachiyomi.data.download.DownloadManager
|
import eu.kanade.tachiyomi.data.download.DownloadManager
|
||||||
import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
|
import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
|
||||||
import eu.kanade.tachiyomi.data.updater.AppUpdateDownloadJob
|
import eu.kanade.tachiyomi.data.updater.AppUpdateDownloadJob
|
||||||
import eu.kanade.tachiyomi.ui.main.MainActivity
|
import eu.kanade.tachiyomi.ui.main.MainActivity
|
||||||
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
|
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
|
||||||
import eu.kanade.tachiyomi.util.storage.DiskUtil
|
|
||||||
import eu.kanade.tachiyomi.util.system.cancelNotification
|
import eu.kanade.tachiyomi.util.system.cancelNotification
|
||||||
import eu.kanade.tachiyomi.util.system.getParcelableExtraCompat
|
import eu.kanade.tachiyomi.util.system.getParcelableExtraCompat
|
||||||
import eu.kanade.tachiyomi.util.system.notificationManager
|
import eu.kanade.tachiyomi.util.system.notificationManager
|
||||||
@ -65,12 +63,6 @@ class NotificationReceiver : BroadcastReceiver() {
|
|||||||
context,
|
context,
|
||||||
intent.getStringExtra(EXTRA_URI)!!.toUri(),
|
intent.getStringExtra(EXTRA_URI)!!.toUri(),
|
||||||
)
|
)
|
||||||
// Delete image from path and dismiss notification
|
|
||||||
ACTION_DELETE_IMAGE ->
|
|
||||||
deleteImage(
|
|
||||||
context,
|
|
||||||
intent.getStringExtra(EXTRA_URI)!!.toUri(),
|
|
||||||
)
|
|
||||||
// Share backup file
|
// Share backup file
|
||||||
ACTION_SHARE_BACKUP ->
|
ACTION_SHARE_BACKUP ->
|
||||||
shareFile(
|
shareFile(
|
||||||
@ -169,16 +161,6 @@ class NotificationReceiver : BroadcastReceiver() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Called to delete image
|
|
||||||
*
|
|
||||||
* @param uri path of file
|
|
||||||
*/
|
|
||||||
private fun deleteImage(context: Context, uri: Uri) {
|
|
||||||
UniFile.fromUri(context, uri)?.delete()
|
|
||||||
DiskUtil.scanMedia(context, uri)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method called when user wants to stop a backup restore job.
|
* Method called when user wants to stop a backup restore job.
|
||||||
*
|
*
|
||||||
@ -415,26 +397,6 @@ class NotificationReceiver : BroadcastReceiver() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns [PendingIntent] that starts a service which removes an image from disk
|
|
||||||
*
|
|
||||||
* @param context context of application
|
|
||||||
* @param uri location path of file
|
|
||||||
* @return [PendingIntent]
|
|
||||||
*/
|
|
||||||
internal fun deleteImagePendingBroadcast(context: Context, uri: Uri): PendingIntent {
|
|
||||||
val intent = Intent(context, NotificationReceiver::class.java).apply {
|
|
||||||
action = ACTION_DELETE_IMAGE
|
|
||||||
putExtra(EXTRA_URI, uri.toString())
|
|
||||||
}
|
|
||||||
return PendingIntent.getBroadcast(
|
|
||||||
context,
|
|
||||||
0,
|
|
||||||
intent,
|
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns [PendingIntent] that starts a reader activity containing chapter.
|
* Returns [PendingIntent] that starts a reader activity containing chapter.
|
||||||
*
|
*
|
||||||
|
@ -83,12 +83,6 @@ class SaveImageNotifier(private val context: Context) {
|
|||||||
context.stringResource(MR.strings.action_share),
|
context.stringResource(MR.strings.action_share),
|
||||||
NotificationReceiver.shareImagePendingBroadcast(context, uri),
|
NotificationReceiver.shareImagePendingBroadcast(context, uri),
|
||||||
)
|
)
|
||||||
// Delete action
|
|
||||||
addAction(
|
|
||||||
R.drawable.ic_delete_24dp,
|
|
||||||
context.stringResource(MR.strings.action_delete),
|
|
||||||
NotificationReceiver.deleteImagePendingBroadcast(context, uri),
|
|
||||||
)
|
|
||||||
|
|
||||||
updateNotification()
|
updateNotification()
|
||||||
}
|
}
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="#FFF"
|
|
||||||
android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
|
|
||||||
</vector>
|
|
Loading…
Reference in New Issue
Block a user