diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-06 03:37:57 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-05-06 03:37:57 +0200 |
| commit | d2998ea80db5a7dee97ae5fc2301db3a13e472b9 (patch) | |
| tree | 7877e6907fcc14b74caa27991ec0e6ded9e2c946 /OpenKeychain | |
| parent | 8de6589c9d4d6b9278ed4f46da7adbb6b81f1e30 (diff) | |
| download | open-keychain-d2998ea80db5a7dee97ae5fc2301db3a13e472b9.tar.gz open-keychain-d2998ea80db5a7dee97ae5fc2301db3a13e472b9.tar.bz2 open-keychain-d2998ea80db5a7dee97ae5fc2301db3a13e472b9.zip | |
Rename for consistency
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | 5 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiKeyImportFragment.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiImportFragment.java) | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java index dfb94ebb9..e0b728bd4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java @@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.ui; import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import org.sufficientlysecure.keychain.R; @@ -84,7 +83,7 @@ public class CreateKeyActivity extends BaseNfcActivity { String nfcUserId = intent.getStringExtra(EXTRA_NFC_USER_ID); byte[] nfcAid = intent.getByteArrayExtra(EXTRA_NFC_AID); - Fragment frag2 = CreateKeyYubiImportFragment.createInstance( + Fragment frag2 = CreateKeyYubiKeyImportFragment.createInstance( nfcFingerprints, nfcAid, nfcUserId); loadFragment(frag2, FragAction.START); @@ -131,7 +130,7 @@ public class CreateKeyActivity extends BaseNfcActivity { finish(); } catch (PgpKeyNotFoundException e) { - Fragment frag = CreateKeyYubiImportFragment.createInstance( + Fragment frag = CreateKeyYubiKeyImportFragment.createInstance( scannedFingerprints, nfcAid, userId); loadFragment(frag, FragAction.TO_RIGHT); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiImportFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiKeyImportFragment.java index db62d53c5..4c7d1dfbd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiImportFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiKeyImportFragment.java @@ -48,7 +48,7 @@ import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.util.Preferences; -public class CreateKeyYubiImportFragment extends Fragment implements NfcListenerFragment { +public class CreateKeyYubiKeyImportFragment extends Fragment implements NfcListenerFragment { private static final String ARG_FINGERPRINT = "fingerprint"; public static final String ARG_AID = "aid"; @@ -67,7 +67,7 @@ public class CreateKeyYubiImportFragment extends Fragment implements NfcListener public static Fragment createInstance(byte[] scannedFingerprints, byte[] nfcAid, String userId) { - CreateKeyYubiImportFragment frag = new CreateKeyYubiImportFragment(); + CreateKeyYubiKeyImportFragment frag = new CreateKeyYubiKeyImportFragment(); Bundle args = new Bundle(); args.putByteArray(ARG_FINGERPRINT, scannedFingerprints); |