cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ImportKeys: Avoid adding two times the same top fragment

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-24 12:21:43 +02:00
parent 702888bbe4
commit ab3aaf3cb4
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
View File

@@ -269,9 +269,11 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
} }
private void startTopFileFragment() { private void startTopFileFragment() {
Fragment importFileFragment = ImportKeysFileFragment.newInstance(); FragmentManager fM = getSupportFragmentManager();
getSupportFragmentManager().beginTransaction().add(importFileFragment, TAG_FRAG_TOP) if (fM.findFragmentByTag(TAG_FRAG_TOP) == null) {
.commit(); Fragment importFileFragment = ImportKeysFileFragment.newInstance();
fM.beginTransaction().add(importFileFragment, TAG_FRAG_TOP).commit();
}
} }
/** /**
@@ -286,10 +288,12 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
private void startTopCloudFragment(String query, boolean disableQueryEdit, private void startTopCloudFragment(String query, boolean disableQueryEdit,
Preferences.CloudSearchPrefs cloudSearchPrefs) { Preferences.CloudSearchPrefs cloudSearchPrefs) {
Fragment importCloudFragment = ImportKeysCloudFragment.newInstance(query, disableQueryEdit, FragmentManager fM = getSupportFragmentManager();
cloudSearchPrefs); if (fM.findFragmentByTag(TAG_FRAG_TOP) == null) {
getSupportFragmentManager().beginTransaction().add(importCloudFragment, TAG_FRAG_TOP) Fragment importCloudFragment = ImportKeysCloudFragment.newInstance(query,
.commit(); disableQueryEdit, cloudSearchPrefs);
fM.beginTransaction().add(importCloudFragment, TAG_FRAG_TOP).commit();
}
} }
private boolean isFingerprintValid(String fingerprint) { private boolean isFingerprintValid(String fingerprint) {