moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

fix fragment handling in ViewKeyActivity

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
This commit is contained in:
Vincent Breitmoser 2015-05-16 23:05:58 +02:00
parent 8c97bee14c
commit 022fde29ae
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@ -274,9 +274,19 @@ public class ViewKeyActivity extends BaseNfcActivity implements
result.createNotify(this).show(); result.createNotify(this).show();
} }
startFragment(savedInstanceState, mDataUri); // Fragments are stored, no need to recreate those
if (savedInstanceState != null) {
return;
}
if (savedInstanceState == null && getIntent().hasExtra(EXTRA_NFC_AID)) { FragmentManager manager = getSupportFragmentManager();
// Create an instance of the fragment
final ViewKeyFragment frag = ViewKeyFragment.newInstance(mDataUri);
manager.beginTransaction()
.replace(R.id.view_key_fragment, frag)
.commit();
if (getIntent().hasExtra(EXTRA_NFC_AID)) {
Intent intent = getIntent(); Intent intent = getIntent();
byte[] nfcFingerprints = intent.getByteArrayExtra(EXTRA_NFC_FINGERPRINTS); byte[] nfcFingerprints = intent.getByteArrayExtra(EXTRA_NFC_FINGERPRINTS);
String nfcUserId = intent.getStringExtra(EXTRA_NFC_USER_ID); String nfcUserId = intent.getStringExtra(EXTRA_NFC_USER_ID);
@ -291,26 +301,6 @@ public class ViewKeyActivity extends BaseNfcActivity implements
setContentView(R.layout.view_key_activity); setContentView(R.layout.view_key_activity);
} }
private void startFragment(Bundle savedInstanceState, Uri dataUri) {
// However, if we're being restored from a previous state,
// then we don't need to do anything and should return or else
// we could end up with overlapping fragments.
if (savedInstanceState != null) {
return;
}
// Create an instance of the fragment
ViewKeyFragment frag = ViewKeyFragment.newInstance(dataUri);
// Add the fragment to the 'fragment_container' FrameLayout
// NOTE: We use commitAllowingStateLoss() to prevent weird crashes!
getSupportFragmentManager().beginTransaction()
.replace(R.id.view_key_fragment, frag)
.commitAllowingStateLoss();
// do it immediately!
getSupportFragmentManager().executePendingTransactions();
}
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
@ -435,12 +425,6 @@ public class ViewKeyActivity extends BaseNfcActivity implements
startActivityForResult(intent, 0); startActivityForResult(intent, 0);
} }
@Override
protected void onSaveInstanceState(Bundle outState) {
//Note:-Done due to the same weird crashes as for commitAllowingStateLoss()
//super.onSaveInstanceState(outState);
}
private void showQrCodeDialog() { private void showQrCodeDialog() {
Intent qrCodeIntent = new Intent(this, QrCodeViewActivity.class); Intent qrCodeIntent = new Intent(this, QrCodeViewActivity.class);