moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

fix nullpointer in encrypttextactivity. fixes #1267

This commit is contained in:
Vincent Breitmoser 2015-05-27 18:10:18 +02:00
parent e378c47814
commit e03e1e5cfc
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
View File

@ -59,22 +59,7 @@ public class EncryptTextActivity extends BaseActivity implements
}
}, false);
// Handle intent actions
handleActions(getIntent(), savedInstanceState);
}
@Override
protected void initLayout() {
setContentView(R.layout.encrypt_text_activity);
}
/**
* Handles all actions with this intent
*
* @param intent
*/
private void handleActions(Intent intent, Bundle savedInstanceState) {
Intent intent = getIntent();
String action = intent.getAction();
Bundle extras = intent.getExtras();
String type = intent.getType();
@ -83,10 +68,6 @@ public class EncryptTextActivity extends BaseActivity implements
extras = new Bundle();
}
/*
* Android's Action
*/
// When sending to OpenKeychain Encrypt via share menu
if (Intent.ACTION_SEND.equals(action) && type != null) {
Log.logDebugBundle(extras, "extras");
@ -127,6 +108,11 @@ public class EncryptTextActivity extends BaseActivity implements
}
}
@Override
protected void initLayout() {
setContentView(R.layout.encrypt_text_activity);
}
@Override
public void onModeChanged(boolean symmetric) {
// switch fragments
@ -142,21 +128,29 @@ public class EncryptTextActivity extends BaseActivity implements
@Override
public void onSignatureKeyIdChanged(long signatureKeyId) {
mEncryptFragment.setSigningKeyId(signatureKeyId);
if (mEncryptFragment != null) {
mEncryptFragment.setSigningKeyId(signatureKeyId);
}
}
@Override
public void onEncryptionKeyIdsChanged(long[] encryptionKeyIds) {
mEncryptFragment.setEncryptionKeyIds(encryptionKeyIds);
if (mEncryptFragment != null) {
mEncryptFragment.setEncryptionKeyIds(encryptionKeyIds);
}
}
@Override
public void onEncryptionUserIdsChanged(String[] encryptionUserIds) {
mEncryptFragment.setEncryptionUserIds(encryptionUserIds);
if (mEncryptFragment != null) {
mEncryptFragment.setEncryptionUserIds(encryptionUserIds);
}
}
@Override
public void onPassphraseChanged(Passphrase passphrase) {
mEncryptFragment.setSymmetricPassphrase(passphrase);
if (mEncryptFragment != null) {
mEncryptFragment.setSymmetricPassphrase(passphrase);
}
}
}