aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-03-04 20:58:53 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-03-04 20:58:53 +0100
commitfe8044d18172faf21ac8085c823eb4f8e13a35ae (patch)
treeb2adea579f3db08ca163c1adf788694c140e7bf3 /OpenPGP-Keychain
parent06f9134eb1c386446d56fe58fa49c35b7482ed86 (diff)
downloadopen-keychain-fe8044d18172faf21ac8085c823eb4f8e13a35ae.tar.gz
open-keychain-fe8044d18172faf21ac8085c823eb4f8e13a35ae.tar.bz2
open-keychain-fe8044d18172faf21ac8085c823eb4f8e13a35ae.zip
2.3.1 beta2
Diffstat (limited to 'OpenPGP-Keychain')
-rw-r--r--OpenPGP-Keychain/src/main/AndroidManifest.xml4
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml
index cec1422d9..76c4c6a2e 100644
--- a/OpenPGP-Keychain/src/main/AndroidManifest.xml
+++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.sufficientlysecure.keychain"
android:installLocation="auto"
- android:versionCode="23101"
- android:versionName="2.3.1 beta1">
+ android:versionCode="23102"
+ android:versionName="2.3.1 beta2">
<!--
General remarks
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index a81576687..42288ca37 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -752,7 +752,7 @@ public class DecryptActivity extends DrawerActivity {
Messenger messenger = new Messenger(saveHandler);
intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
- // show progressDialogUpdater dialog
+ // show progress dialog
saveHandler.showProgressDialog(this);
// start service with intent