Mirrors/nc-photos
1
0
Fork 0
mirror of https://gitlab.com/nkming2/nc-photos.git synced 2025-02-24 18:38:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix dangling lock if app killed before unlocking

Browse source
This commit is contained in:
Ming Ming 2022-04-23 00:06:28 +08:00
parent 886bcf10ae
commit a4b7f2adfe
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
plugin/android/src/main/kotlin/com/nkming/nc_photos/plugin/LockChannelHandler.kt
View file

@ -1,5 +1,6 @@
package com.nkming.nc_photos.plugin package com.nkming.nc_photos.plugin
import android.util.Log
import io.flutter.plugin.common.MethodCall import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.MethodChannel
@ -21,6 +22,24 @@ class LockChannelHandler : MethodChannel.MethodCallHandler {
const val CHANNEL = "${K.LIB_ID}/lock" const val CHANNEL = "${K.LIB_ID}/lock"
private val locks = mutableMapOf<Int, Boolean>() private val locks = mutableMapOf<Int, Boolean>()
private const val TAG = "LockChannelHandler"
}
/**
* Dismiss this handler instance
*
* All dangling locks locked via this instance will automatically be
* unlocked
*/
fun dismiss() {
for (id in _lockedIds) {
if (locks[id] == true) {
Log.w(TAG, "[dismiss] Automatically unlocking id: $id")
locks[id] = false
}
}
_lockedIds.clear()
} }
override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) { override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
@ -48,6 +67,7 @@ class LockChannelHandler : MethodChannel.MethodCallHandler {
private fun tryLock(lockId: Int, result: MethodChannel.Result) { private fun tryLock(lockId: Int, result: MethodChannel.Result) {
if (locks[lockId] != true) { if (locks[lockId] != true) {
locks[lockId] = true locks[lockId] = true
_lockedIds.add(lockId)
result.success(true) result.success(true)
} else { } else {
result.success(false) result.success(false)
@ -57,6 +77,7 @@ class LockChannelHandler : MethodChannel.MethodCallHandler {
private fun unlock(lockId: Int, result: MethodChannel.Result) { private fun unlock(lockId: Int, result: MethodChannel.Result) {
if (locks[lockId] == true) { if (locks[lockId] == true) {
locks[lockId] = false locks[lockId] = false
_lockedIds.remove(lockId)
result.success(null) result.success(null)
} else { } else {
result.error( result.error(
@ -66,4 +87,6 @@ class LockChannelHandler : MethodChannel.MethodCallHandler {
) )
} }
} }
private val _lockedIds = mutableListOf<Int>()
} }

7
plugin/android/src/main/kotlin/com/nkming/nc_photos/plugin/NcPhotosPlugin.kt
View file

@ -9,11 +9,11 @@ class NcPhotosPlugin : FlutterPlugin {
override fun onAttachedToEngine( override fun onAttachedToEngine(
@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding @NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding
) { ) {
// this may get called more than once lockChannelHandler = LockChannelHandler()
lockChannel = MethodChannel( lockChannel = MethodChannel(
flutterPluginBinding.binaryMessenger, LockChannelHandler.CHANNEL flutterPluginBinding.binaryMessenger, LockChannelHandler.CHANNEL
) )
lockChannel.setMethodCallHandler(LockChannelHandler()) lockChannel.setMethodCallHandler(lockChannelHandler)
notificationChannel = MethodChannel( notificationChannel = MethodChannel(
flutterPluginBinding.binaryMessenger, flutterPluginBinding.binaryMessenger,
@ -41,6 +41,7 @@ class NcPhotosPlugin : FlutterPlugin {
override fun onDetachedFromEngine( override fun onDetachedFromEngine(
@NonNull binding: FlutterPlugin.FlutterPluginBinding @NonNull binding: FlutterPlugin.FlutterPluginBinding
) { ) {
lockChannelHandler.dismiss()
lockChannel.setMethodCallHandler(null) lockChannel.setMethodCallHandler(null)
notificationChannel.setMethodCallHandler(null) notificationChannel.setMethodCallHandler(null)
nativeEventChannel.setStreamHandler(null) nativeEventChannel.setStreamHandler(null)
@ -51,4 +52,6 @@ class NcPhotosPlugin : FlutterPlugin {
private lateinit var notificationChannel: MethodChannel private lateinit var notificationChannel: MethodChannel
private lateinit var nativeEventChannel: EventChannel private lateinit var nativeEventChannel: EventChannel
private lateinit var nativeEventMethodChannel: MethodChannel private lateinit var nativeEventMethodChannel: MethodChannel
private lateinit var lockChannelHandler: LockChannelHandler
} }