Skip to content

Commit

Permalink
change singleTask to singleTop
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreacot
dreacot committed Aug 30, 2021
1 parent 97d7391 commit 6cd4ac2
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 32 deletions.
56 changes: 28 additions & 28 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
android:name=".activities.SplashScreenActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask">
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -54,26 +54,26 @@
android:name=".HomeActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.verifyseed.VerifySeedActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask"
android:launchMode="singleTop"
android:noHistory="true" />

<activity
android:name=".activities.SetupWalletActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.verifyseed.SaveSeedActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask"
android:launchMode="singleTop"
android:noHistory="true" />

<activity
Expand All @@ -90,7 +90,7 @@
<activity
android:name=".activities.CaptureActivityAnyOrientation"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:stateNotNeeded="true"
android:theme="@style/zxing_CaptureTheme"
Expand All @@ -99,12 +99,12 @@
<activity
android:name=".activities.more.SettingsActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.LogViewer"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<service
android:name=".service.SyncService"
Expand All @@ -115,91 +115,91 @@
<activity
android:name=".activities.verifyseed.SeedBackupSuccess"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.CustomCrashReport"
android:launchMode="singleInstance" />
android:launchMode="singleTop" />

<activity
android:name=".activities.License" />

<activity
android:name=".activities.security.ValidateAddress"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.security.SignMessage"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.security.VerifyMessage"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.more.SecurityTools"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.more.HelpActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.more.AboutActivity"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.more.DebugActivity"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.more.PoliteiaActivity"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.RestoreWalletActivity"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.RestoreSuccessActivity"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.WalletSettings"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.ProposalDetailsActivity"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.more.StatisticsActivity"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.more.ConnectedPeers"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.privacy.AccountMixerActivity"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.privacy.SetupPrivacy"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.privacy.SetupMixerAccounts"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<activity
android:name=".activities.privacy.ManualMixerSetup"
android:launchMode="singleTask" />
android:launchMode="singleTop" />

<provider
android:name="androidx.core.content.FileProvider"
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/com/dcrandroid/HomeActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,10 +416,12 @@ class HomeActivity : BaseActivity(), SyncProgressListener, TxAndBlockNotificatio
if (intent == null) {
return
}
val tx = intent.getSerializableExtra(Constants.TRANSACTION) as Transaction
TransactionDetailsDialog(
Transaction.from(multiWallet!!.walletWithID(tx.walletID).getTransaction(tx.hash))
).show(this)
if (intent.hasExtra(Constants.TRANSACTION)) {
val tx = intent.getSerializableExtra(Constants.TRANSACTION) as Transaction
TransactionDetailsDialog(
Transaction.from(multiWallet!!.walletWithID(tx.walletID).getTransaction(tx.hash))
).show(this)
}
}

// -- Sync Progress Listener
Expand Down

0 comments on commit 6cd4ac2

Please sign in to comment.