* For #7343 Do not allow multiple share to same device * For #7343 Check current destination before dismissing sharemaster
parent
718c211a86
commit
666b3d9627
|
@ -128,9 +128,11 @@ class DefaultShareController(
|
||||||
showFailureWithRetryOption { shareToDevicesWithRetry(shareOperation) }
|
showFailureWithRetryOption { shareToDevicesWithRetry(shareOperation) }
|
||||||
ShareController.Result.DISMISSED
|
ShareController.Result.DISMISSED
|
||||||
}
|
}
|
||||||
|
if (navController.currentDestination?.id == R.id.shareFragment) {
|
||||||
dismiss(result)
|
dismiss(result)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
|
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
|
||||||
fun showSuccess() {
|
fun showSuccess() {
|
||||||
|
|
|
@ -42,6 +42,7 @@ class AccountDeviceViewHolder(
|
||||||
// nothing we are offline
|
// nothing we are offline
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
it.setOnClickListener(null)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue