diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-21 15:51:07 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-21 15:51:07 +0100 |
| commit | 9a653d6a9ca44505f2379b73a357d0ffc4bc98cf (patch) | |
| tree | ad6082781e4adc1e3c903e7deee9da12f49b30de /OpenPGP-Keychain-API/example-app | |
| parent | f6da3e80e60d4d6e2b478e23f761626acda808fe (diff) | |
| download | open-keychain-9a653d6a9ca44505f2379b73a357d0ffc4bc98cf.tar.gz open-keychain-9a653d6a9ca44505f2379b73a357d0ffc4bc98cf.tar.bz2 open-keychain-9a653d6a9ca44505f2379b73a357d0ffc4bc98cf.zip | |
fix intent demo crash, remove unused layout
Diffstat (limited to 'OpenPGP-Keychain-API/example-app')
| -rw-r--r-- | OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java | 2 | ||||
| -rw-r--r-- | OpenPGP-Keychain-API/example-app/src/main/res/layout/intent.xml | 93 |
2 files changed, 1 insertions, 94 deletions
diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java b/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java index 27fe09099..55457b658 100644 --- a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java +++ b/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java @@ -60,7 +60,7 @@ public class IntentActivity extends PreferenceActivity { mImportKey = (Preference) findPreference("IMPORT_KEY"); mImportKeyFromKeyserver = (Preference) findPreference("IMPORT_KEY_FROM_KEYSERVER"); mImportKeyFromQrCode = (Preference) findPreference("IMPORT_KEY_FROM_QR_CODE"); - mOpenpgp4fpr = (Preference) findPreference("mOpenpgp4fpr"); + mOpenpgp4fpr = (Preference) findPreference("openpgp4fpr"); mEncrypt.setOnPreferenceClickListener(new OnPreferenceClickListener() { diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/layout/intent.xml b/OpenPGP-Keychain-API/example-app/src/main/res/layout/intent.xml deleted file mode 100644 index ed416a05f..000000000 --- a/OpenPGP-Keychain-API/example-app/src/main/res/layout/intent.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > - - <Button - android:id="@+id/Button02" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="encrypt" - android:text="Encrypt" /> - - <Button - android:id="@+id/intent_demo_create_new_key" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="createNewKeyOnClick" - android:text="Create new key" /> - - <Button - android:id="@+id/intent_demo_select_secret_key" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="selectSecretKeyOnClick" - android:text="Select secret key" /> - - <Button - android:id="@+id/intent_demo_select_encryption_key" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="selectEncryptionKeysOnClick" - android:text="Select encryption key(s)" /> - - <EditText - android:id="@+id/intent_demo_message" - android:layout_width="match_parent" - android:layout_height="150dip" - android:text="message" - android:textAppearance="@android:style/TextAppearance.Small" /> - - <EditText - android:id="@+id/intent_demo_ciphertext" - android:layout_width="match_parent" - android:layout_height="150dip" - android:text="ciphertext" - android:textAppearance="@android:style/TextAppearance.Small" /> - - <Button - android:id="@+id/intent_demo_encrypt" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="encrypt" - android:text="Encrypt" /> - - <Button - android:id="@+id/intent_demo_encrypt" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="encryptAndReturnOnClick" - android:text="Encrypt and return result" /> - - <Button - android:id="@+id/intent_demo_decrypt" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="decryptOnClick" - android:text="Decrypt" /> - - <Button - android:id="@+id/intent_demo_decrypt" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="decryptAndReturnOnClick" - android:text="Decrypt and return result" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="APG Data:" /> - - <TextView - android:id="@+id/intent_demo_data" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:minLines="10" /> - </LinearLayout> - -</ScrollView>
\ No newline at end of file |