Remove some deprecation warnings
This commit is contained in:
parent
d3f0d059f8
commit
65ecdd19ca
GPG Key ID:
007F84120107191E
|
|
@ -1,5 +1,5 @@
|
|||
package sushi.hardcore.droidfs.file_operations
|
||||
|
||||
import android.app.Notification
|
||||
import androidx.core.app.NotificationCompat
|
||||
|
||||
class FileOperationNotification(val notificationBuilder: Notification.Builder, val notificationId: Int)
|
||||
class FileOperationNotification(val notificationBuilder: NotificationCompat.Builder, val notificationId: Int)
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
package sushi.hardcore.droidfs.file_operations
|
||||
|
||||
import android.app.*
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.graphics.drawable.Icon
|
||||
import android.net.Uri
|
||||
import android.os.*
|
||||
import androidx.core.app.NotificationCompat
|
||||
import androidx.core.app.NotificationManagerCompat
|
||||
import androidx.documentfile.provider.DocumentFile
|
||||
import sushi.hardcore.droidfs.GocryptfsVolume
|
||||
import sushi.hardcore.droidfs.R
|
||||
|
|
@ -23,7 +23,7 @@ class FileOperationService : Service() {
|
|||
|
||||
private val binder = LocalBinder()
|
||||
private lateinit var gocryptfsVolume: GocryptfsVolume
|
||||
private lateinit var notificationManager: NotificationManager
|
||||
private lateinit var notificationManager: NotificationManagerCompat
|
||||
private var notifications = HashMap<Int, Boolean>()
|
||||
private var lastNotificationId = 0
|
||||
|
||||
|
|
@ -41,41 +41,38 @@ class FileOperationService : Service() {
|
|||
private fun showNotification(message: Int, total: Int?): FileOperationNotification {
|
||||
++lastNotificationId
|
||||
if (!::notificationManager.isInitialized){
|
||||
notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
notificationManager = NotificationManagerCompat.from(this)
|
||||
}
|
||||
val notificationBuilder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
val channel = NotificationChannel(NOTIFICATION_CHANNEL_ID, getString(R.string.file_operations), NotificationManager.IMPORTANCE_LOW)
|
||||
notificationManager.createNotificationChannel(channel)
|
||||
Notification.Builder(this, NOTIFICATION_CHANNEL_ID)
|
||||
} else {
|
||||
Notification.Builder(this)
|
||||
}
|
||||
val cancelIntent = Intent(this, NotificationBroadcastReceiver::class.java).apply {
|
||||
val bundle = Bundle()
|
||||
bundle.putBinder("binder", LocalBinder())
|
||||
bundle.putInt("notificationId", lastNotificationId)
|
||||
putExtra("bundle", bundle)
|
||||
action = ACTION_CANCEL
|
||||
}
|
||||
val cancelPendingIntent = PendingIntent.getBroadcast(this, 0, cancelIntent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
val notificationAction = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
Notification.Action.Builder(
|
||||
Icon.createWithResource(this, R.drawable.icon_close),
|
||||
getString(R.string.cancel),
|
||||
cancelPendingIntent
|
||||
)
|
||||
} else {
|
||||
Notification.Action.Builder(
|
||||
R.drawable.icon_close,
|
||||
getString(R.string.cancel),
|
||||
cancelPendingIntent
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
notificationManager.createNotificationChannel(
|
||||
NotificationChannel(
|
||||
NOTIFICATION_CHANNEL_ID,
|
||||
getString(R.string.file_operations),
|
||||
NotificationManager.IMPORTANCE_LOW
|
||||
)
|
||||
)
|
||||
}
|
||||
val notificationBuilder = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
|
||||
notificationBuilder
|
||||
.setContentTitle(getString(message))
|
||||
.setSmallIcon(R.mipmap.icon_launcher)
|
||||
.setOngoing(true)
|
||||
.addAction(notificationAction.build())
|
||||
.addAction(NotificationCompat.Action(
|
||||
R.drawable.icon_close,
|
||||
getString(R.string.cancel),
|
||||
PendingIntent.getBroadcast(
|
||||
this,
|
||||
0,
|
||||
Intent(this, NotificationBroadcastReceiver::class.java).apply {
|
||||
val bundle = Bundle()
|
||||
bundle.putBinder("binder", LocalBinder())
|
||||
bundle.putInt("notificationId", lastNotificationId)
|
||||
putExtra("bundle", bundle)
|
||||
action = ACTION_CANCEL
|
||||
},
|
||||
PendingIntent.FLAG_UPDATE_CURRENT
|
||||
)
|
||||
))
|
||||
if (total != null) {
|
||||
notificationBuilder
|
||||
.setContentText("0/$total")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package sushi.hardcore.droidfs.file_viewers
|
||||
|
||||
import com.google.android.exoplayer2.SimpleExoPlayer
|
||||
import com.google.android.exoplayer2.ExoPlayer
|
||||
import sushi.hardcore.droidfs.databinding.ActivityAudioPlayerBinding
|
||||
import java.io.File
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ class AudioPlayer: MediaPlayer(){
|
|||
return "audio"
|
||||
}
|
||||
|
||||
override fun bindPlayer(player: SimpleExoPlayer) {
|
||||
override fun bindPlayer(player: ExoPlayer) {
|
||||
binding.audioController.player = player
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@ import sushi.hardcore.droidfs.R
|
|||
import sushi.hardcore.droidfs.widgets.CustomAlertDialogBuilder
|
||||
|
||||
abstract class MediaPlayer: FileViewerActivity() {
|
||||
private lateinit var player: SimpleExoPlayer
|
||||
private lateinit var player: ExoPlayer
|
||||
|
||||
override fun viewFile() {
|
||||
initializePlayer()
|
||||
}
|
||||
|
||||
abstract fun bindPlayer(player: SimpleExoPlayer)
|
||||
abstract fun bindPlayer(player: ExoPlayer)
|
||||
protected open fun onPlaylistIndexChanged() {}
|
||||
protected open fun onPlayerReady() {}
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ abstract class MediaPlayer: FileViewerActivity() {
|
|||
}
|
||||
|
||||
private fun initializePlayer(){
|
||||
player = SimpleExoPlayer.Builder(this).build()
|
||||
player = ExoPlayer.Builder(this).build()
|
||||
bindPlayer(player)
|
||||
createPlaylist()
|
||||
for (e in mappedPlaylist) {
|
||||
|
|
@ -58,8 +58,8 @@ abstract class MediaPlayer: FileViewerActivity() {
|
|||
}
|
||||
}
|
||||
override fun onPositionDiscontinuity(reason: Int) {
|
||||
if (player.currentWindowIndex != currentPlaylistIndex) {
|
||||
playlistNext(player.currentWindowIndex == (currentPlaylistIndex+1)%mappedPlaylist.size)
|
||||
if (player.currentMediaItemIndex != currentPlaylistIndex) {
|
||||
playlistNext(player.currentMediaItemIndex == (currentPlaylistIndex+1) % mappedPlaylist.size)
|
||||
onPlaylistIndexChanged()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package sushi.hardcore.droidfs.file_viewers
|
||||
|
||||
import android.content.pm.ActivityInfo
|
||||
import com.google.android.exoplayer2.SimpleExoPlayer
|
||||
import com.google.android.exoplayer2.ExoPlayer
|
||||
import sushi.hardcore.droidfs.databinding.ActivityVideoPlayerBinding
|
||||
|
||||
class VideoPlayer: MediaPlayer() {
|
||||
|
|
@ -17,7 +17,7 @@ class VideoPlayer: MediaPlayer() {
|
|||
super.viewFile()
|
||||
}
|
||||
|
||||
override fun bindPlayer(player: SimpleExoPlayer) {
|
||||
override fun bindPlayer(player: ExoPlayer) {
|
||||
binding.videoPlayer.player = player
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue