diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-14 00:11:23 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-14 00:11:23 +0200 |
| commit | 179f48a4dee1ac0f571b31024281bc7ca7d45cc4 (patch) | |
| tree | 22d31380082009009a150acce9bfafd61e1427d3 /OpenKeychain/src/main/java/org | |
| parent | d5c9021b892185ce9e23a11515bffa1662fed6dd (diff) | |
| download | open-keychain-179f48a4dee1ac0f571b31024281bc7ca7d45cc4.tar.gz open-keychain-179f48a4dee1ac0f571b31024281bc7ca7d45cc4.tar.bz2 open-keychain-179f48a4dee1ac0f571b31024281bc7ca7d45cc4.zip | |
First work on decrypt
Diffstat (limited to 'OpenKeychain/src/main/java/org')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOldActivity.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java) | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index db78a36c1..ab1c6a462 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -22,6 +22,7 @@ import android.os.Environment; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.sufficientlysecure.keychain.remote.ui.AppsListActivity; import org.sufficientlysecure.keychain.ui.DecryptActivity; +import org.sufficientlysecure.keychain.ui.DecryptOldActivity; import org.sufficientlysecure.keychain.ui.EncryptFileActivity; import org.sufficientlysecure.keychain.ui.EncryptTextActivity; import org.sufficientlysecure.keychain.ui.KeyListActivity; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOldActivity.java index 998ed34cd..f6dfed5d7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOldActivity.java @@ -33,7 +33,7 @@ import org.sufficientlysecure.keychain.util.Log; import java.util.regex.Matcher; -public class DecryptActivity extends DrawerActivity { +public class DecryptOldActivity extends DrawerActivity { /* Intents */ public static final String ACTION_DECRYPT = OpenKeychainIntents.DECRYPT; @@ -64,7 +64,7 @@ public class DecryptActivity extends DrawerActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.decrypt_activity); + setContentView(R.layout.decrypt_activity_old); initView(); |