qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unregister receiver in SelectCurrentDbActivity, closes https://github.com/PhilippC/keepass2android/issues/1111

Browse Source
This commit is contained in:
Philipp Crocoll
2020-01-15 05:30:36 +01:00
parent b7c8baacc9
commit dd0c950474
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/keepass2android/SelectCurrentDbActivity.cs
View File

@@ -259,6 +259,16 @@ namespace keepass2android
} }
protected override void OnStop()
{
if (_intentReceiver != null)
{
UnregisterReceiver(_intentReceiver);
_intentReceiver = null;
}
base.OnStop();
}
private bool GetIocFromViewIntent(Intent intent) private bool GetIocFromViewIntent(Intent intent)
{ {
IOConnectionInfo ioc = new IOConnectionInfo(); IOConnectionInfo ioc = new IOConnectionInfo();
@@ -437,7 +447,8 @@ namespace keepass2android
//by leaving the app with the back button, the user probably wants to cancel the task //by leaving the app with the back button, the user probably wants to cancel the task
//The activity might be resumed (through Android's recent tasks list), then use a NullTask: //The activity might be resumed (through Android's recent tasks list), then use a NullTask:
AppTask = new NullTask(); AppTask = new NullTask();
Finish(); if (!IsFinishing)
Finish();
} }
protected override void OnActivityResult(int requestCode, Result resultCode, Intent data) protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
@@ -497,11 +508,13 @@ namespace keepass2android
case KeePass.ExitCloseAfterTaskComplete: case KeePass.ExitCloseAfterTaskComplete:
// Do not lock the database // Do not lock the database
SetResult(KeePass.ExitCloseAfterTaskComplete); SetResult(KeePass.ExitCloseAfterTaskComplete);
Finish(); if (!IsFinishing)
Finish();
break; break;
case KeePass.ExitClose: case KeePass.ExitClose:
SetResult(KeePass.ExitClose); SetResult(KeePass.ExitClose);
Finish(); if (!IsFinishing)
Finish();
break; break;
case KeePass.ExitReloadDb: case KeePass.ExitReloadDb: