diff options
Diffstat (limited to 'org_apg/src/org/thialfihar/android/apg/ui')
| -rw-r--r-- | org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java | 6 | ||||
| -rw-r--r-- | org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java index 138eaba38..aebc958a0 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/EditKeyActivity.java @@ -61,7 +61,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener; import java.util.Iterator; import java.util.Vector; -public class EditKeyActivity extends SherlockFragmentActivity { // extends BaseActivity { +public class EditKeyActivity extends SherlockFragmentActivity { private Intent mIntent = null; private ActionBar mActionBar; @@ -207,10 +207,10 @@ public class EditKeyActivity extends SherlockFragmentActivity { // extends BaseA Bundle data = message.getData(); PGPSecretKeyRing masterKeyRing = Utils .BytesToPGPSecretKeyRing(data - .getByteArray(ApgHandler.NEW_KEY)); + .getByteArray(ApgHandler.RESULT_NEW_KEY)); PGPSecretKeyRing subKeyRing = Utils .BytesToPGPSecretKeyRing(data - .getByteArray(ApgHandler.NEW_KEY2)); + .getByteArray(ApgHandler.RESULT_NEW_KEY2)); // add master key Iterator<PGPSecretKey> masterIt = masterKeyRing.getSecretKeys(); diff --git a/org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java b/org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java index 7efdf0b3d..7c19317bd 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/widget/SectionView.java @@ -285,7 +285,7 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor // get new key from data bundle returned from service Bundle data = message.getData(); PGPSecretKeyRing newKeyRing = Utils.BytesToPGPSecretKeyRing(data - .getByteArray(ApgHandler.NEW_KEY)); + .getByteArray(ApgHandler.RESULT_NEW_KEY)); boolean isMasterKey = (mEditors.getChildCount() == 0); |