From 2c093b3e0de564df52f08b525ffd042763a4fce8 Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Sat, 24 Apr 2010 02:16:45 +0000
Subject: [PATCH] clean up for release, AsciiArmour was a Button instead of
 CheckBox... fixed

---
 .../android/apg/EncryptFileActivity.java          | 15 ++++++++-------
 src/org/thialfihar/android/apg/MainActivity.java  |  3 +--
 .../android/apg/SelectPublicKeyListActivity.java  |  1 -
 .../android/apg/SelectSecretKeyListActivity.java  |  1 -
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/org/thialfihar/android/apg/EncryptFileActivity.java b/src/org/thialfihar/android/apg/EncryptFileActivity.java
index 3f7db2b72..6db2ffb6d 100644
--- a/src/org/thialfihar/android/apg/EncryptFileActivity.java
+++ b/src/org/thialfihar/android/apg/EncryptFileActivity.java
@@ -30,7 +30,6 @@ import java.security.SignatureException;
 import java.util.Collections;
 import java.util.Vector;
 
-import org.bouncycastle2.bcpg.HashAlgorithmTags;
 import org.bouncycastle2.openpgp.PGPEncryptedData;
 import org.bouncycastle2.openpgp.PGPException;
 import org.bouncycastle2.openpgp.PGPPublicKeyRing;
@@ -75,7 +74,7 @@ public class EncryptFileActivity extends BaseActivity {
     private Spinner mAlgorithm = null;
     private EditText mPassPhrase = null;
     private EditText mPassPhraseAgain = null;
-    private Button mAsciiArmour = null;
+    private CheckBox mAsciiArmour = null;
     private Button mEncryptButton = null;
 
     private long mEncryptionKeyIds[] = null;
@@ -237,7 +236,8 @@ public class EncryptFileActivity extends BaseActivity {
         if (mInputFilename == null || !mInputFilename.equals(currentFilename)) {
             mInputFilename = mFilename.getText().toString();
             File file = new File(mInputFilename);
-            mOutputFilename = Constants.path.app_dir + "/" + file.getName() + ".gpg";
+            String ending = (mAsciiArmour.isChecked() ? ".asc" : ".gpg");
+            mOutputFilename = Constants.path.app_dir + "/" + file.getName() + ending;
         }
 
         if (mInputFilename.equals("")) {
@@ -262,8 +262,9 @@ public class EncryptFileActivity extends BaseActivity {
             }
 
             boolean encryptIt = mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0;
-            if (getSecretKeyId() == 0 && !encryptIt) {
-                Toast.makeText(this, "Select a signature key or encryption keys.",
+            // for now only support encryption
+            if (!encryptIt) {
+                Toast.makeText(this, "Select at least one encryption key.",
                                Toast.LENGTH_SHORT).show();
                 return;
             }
@@ -328,13 +329,13 @@ public class EncryptFileActivity extends BaseActivity {
                 boolean encryptIt = mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0;
 
                 if (encryptIt) {
-                    Apg.encrypt(in, out, mAsciiArmour.isSelected(),
+                    Apg.encrypt(in, out, mAsciiArmour.isChecked(),
                                 mEncryptionKeyIds, getSecretKeyId(),
                                 Apg.getPassPhrase(), this,
                                 PGPEncryptedData.AES_256, null);
                 }
             } else {
-                Apg.encrypt(in, out, mAsciiArmour.isSelected(),
+                Apg.encrypt(in, out, mAsciiArmour.isChecked(),
                             null, 0, null, this,
                             ((Choice) mAlgorithm.getSelectedItem()).getId(),
                             mPassPhrase.getText().toString());
diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java
index 5562d6a7a..e98601333 100644
--- a/src/org/thialfihar/android/apg/MainActivity.java
+++ b/src/org/thialfihar/android/apg/MainActivity.java
@@ -18,7 +18,6 @@ package org.thialfihar.android.apg;
 
 import org.thialfihar.android.apg.provider.Accounts;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ContentValues;
@@ -223,7 +222,7 @@ public class MainActivity extends BaseActivity {
                 SpannableString info =
                         new SpannableString("Read the warnings!\n\n" +
                                             "Changes:\n" +
-                                            " * OI File Manager support\n" +
+                                            " * OI File Manager support (install from Market)\n" +
                                             " * file encryption/decryption\n" +
                                             "\n" +
                                             "WARNING: be careful editing your existing keys, as they " +
diff --git a/src/org/thialfihar/android/apg/SelectPublicKeyListActivity.java b/src/org/thialfihar/android/apg/SelectPublicKeyListActivity.java
index 7874555df..495e57742 100644
--- a/src/org/thialfihar/android/apg/SelectPublicKeyListActivity.java
+++ b/src/org/thialfihar/android/apg/SelectPublicKeyListActivity.java
@@ -22,7 +22,6 @@ import java.util.Vector;
 import org.bouncycastle2.openpgp.PGPPublicKey;
 import org.bouncycastle2.openpgp.PGPPublicKeyRing;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
diff --git a/src/org/thialfihar/android/apg/SelectSecretKeyListActivity.java b/src/org/thialfihar/android/apg/SelectSecretKeyListActivity.java
index 2d117e5f3..a0335075c 100644
--- a/src/org/thialfihar/android/apg/SelectSecretKeyListActivity.java
+++ b/src/org/thialfihar/android/apg/SelectSecretKeyListActivity.java
@@ -25,7 +25,6 @@ import org.bouncycastle2.openpgp.PGPSecretKey;
 import org.bouncycastle2.openpgp.PGPSecretKeyRing;
 import org.thialfihar.android.apg.utils.IterableIterator;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;