Fix crash after returning result for an external call (#104)
This commit is contained in:
@@ -78,8 +78,6 @@ import java.io.File
|
|||||||
|
|
||||||
class MainActivity : ComponentActivity() {
|
class MainActivity : ComponentActivity() {
|
||||||
|
|
||||||
private lateinit var sessionDir: File
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
initLibraries()
|
initLibraries()
|
||||||
@@ -220,13 +218,6 @@ class MainActivity : ComponentActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
|
||||||
super.onDestroy()
|
|
||||||
if (resolveLaunchMode(intent) == LaunchMode.EXTERNAL_SCAN_TO_PDF) {
|
|
||||||
sessionDir.deleteRecursively()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun resolveLaunchMode(intent: Intent?): LaunchMode {
|
private fun resolveLaunchMode(intent: Intent?): LaunchMode {
|
||||||
return when (intent?.action) {
|
return when (intent?.action) {
|
||||||
"org.fairscan.app.action.SCAN_TO_PDF" -> LaunchMode.EXTERNAL_SCAN_TO_PDF
|
"org.fairscan.app.action.SCAN_TO_PDF" -> LaunchMode.EXTERNAL_SCAN_TO_PDF
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import java.util.UUID
|
|||||||
|
|
||||||
class SessionViewModel(
|
class SessionViewModel(
|
||||||
app: Application,
|
app: Application,
|
||||||
launchMode: LaunchMode,
|
val launchMode: LaunchMode,
|
||||||
appContainer: AppContainer
|
appContainer: AppContainer
|
||||||
) : AndroidViewModel(app) {
|
) : AndroidViewModel(app) {
|
||||||
|
|
||||||
@@ -43,6 +43,14 @@ class SessionViewModel(
|
|||||||
)
|
)
|
||||||
|
|
||||||
val imageRepository: ImageRepository = sessionContainer.imageRepository
|
val imageRepository: ImageRepository = sessionContainer.imageRepository
|
||||||
|
|
||||||
|
override fun onCleared() {
|
||||||
|
super.onCleared()
|
||||||
|
|
||||||
|
if (launchMode == LaunchMode.EXTERNAL_SCAN_TO_PDF) {
|
||||||
|
sessionDir.deleteRecursively()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class ScanSessionContainer(
|
class ScanSessionContainer(
|
||||||
|
|||||||
Reference in New Issue
Block a user