From 83a5d5f8f863d6df790b3fe5f406e5702b796183 Mon Sep 17 00:00:00 2001
From: Rick Deckard <deckardb76@gmail.com>
Date: Tue, 28 Dec 2010 10:36:41 +0000
Subject: [PATCH 1/9] Update italian translations

---
 res/values-it/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b252606c4..d1d76f09d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -141,6 +141,7 @@
     <string name="expired">scaduto</string>
     <string name="notValid">non valido</string>
     <string name="nKeyServers">%s key server(s)</string>
+    <string name="fingerprint">fingerprint</string>
 
     <!-- choice_lowerCase: capitalized firwst word, no punctuation -->
     <string name="choice_none">Nessuno</string>
@@ -154,6 +155,10 @@
     <string name="choice_10mins">10 min</string>
     <string name="choice_20mins">20 min</string>
     <string name="choice_40mins">40 min</string>
+    <string name="choice_1hour">1 ora</string>
+    <string name="choice_2hours">2 ore</string>
+    <string name="choice_4hours">4 ore</string>
+    <string name="choice_8hours">8 ore</string>
     <string name="choice_untilQuit">tutta la sessione</string>
     <string name="choice_language_system">Default di sistema</string>
 
@@ -223,6 +228,7 @@
     <string name="error_noKnownEncryptionFound">non è stato trovato nessun tipo di crittazione valido</string>
     <string name="error_externalStorageNotReady">la scheda di memoria non è pronta o non è utilizzabile</string>
     <string name="error_accountNotFound">acconto \'%s\' non trovato</string>
+    <string name="error_accountReadingNotAllowed">accesso in lettura all'\account negato</string>
     <string name="error_addingAccountFailed">non è stato possibile aggiungere l\'acconto \'%s\'</string>
     <string name="error_invalidEmail">mail non valida \'%s\'</string>
     <string name="error_keySizeMinimum512bit">la dimensione della chiave deve essere almeno di 512bit</string>

From 1edac5a61ee36d466daeb91dea86b4ff3c2a2ccf Mon Sep 17 00:00:00 2001
From: Markus Doits <markus.doits@gmail.com>
Date: Wed, 29 Dec 2010 12:11:25 +0000
Subject: [PATCH 2/9] Allow progress-meter to be null

No need to force people to use progressmeter
---
 src/org/thialfihar/android/apg/Apg.java | 146 ++++++++++++++++--------
 1 file changed, 96 insertions(+), 50 deletions(-)

diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java
index b7d327077..cf71185e1 100644
--- a/src/org/thialfihar/android/apg/Apg.java
+++ b/src/org/thialfihar/android/apg/Apg.java
@@ -400,7 +400,8 @@ public class Apg {
             throws Apg.GeneralException, NoSuchProviderException, PGPException,
             NoSuchAlgorithmException, SignatureException, IOException, Database.GeneralException {
 
-        progress.setProgress(R.string.progress_buildingKey, 0, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_buildingKey, 0, 100);
 
         Security.addProvider(new BouncyCastleProvider());
 
@@ -461,7 +462,8 @@ public class Apg {
             keys.add(editor.getValue());
         }
 
-        progress.setProgress(R.string.progress_preparingMasterKey, 10, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_preparingMasterKey, 10, 100);
         KeyEditor keyEditor = (KeyEditor) keyEditors.getChildAt(0);
         int usageId = keyEditor.getUsage();
         boolean canSign = (usageId == Id.choice.usage.sign_only ||
@@ -481,7 +483,8 @@ public class Apg {
             masterKey.extractPrivateKey(oldPassPhrase.toCharArray(),
                                         new BouncyCastleProvider());
 
-        progress.setProgress(R.string.progress_certifyingMasterKey, 20, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_certifyingMasterKey, 20, 100);
         for (int i = 0; i < userIds.size(); ++i) {
             String userId = userIds.get(i);
 
@@ -525,7 +528,8 @@ public class Apg {
             hashedPacketsGen.setKeyExpirationTime(true, numDays * 86400);
         }
 
-        progress.setProgress(R.string.progress_buildingMasterKeyRing, 30, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_buildingMasterKeyRing, 30, 100);
         PGPKeyRingGenerator keyGen =
                 new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION,
                                         masterKeyPair, mainUserId,
@@ -533,9 +537,11 @@ public class Apg {
                                         hashedPacketsGen.generate(), unhashedPacketsGen.generate(),
                                         new SecureRandom(), new BouncyCastleProvider().getName());
 
-        progress.setProgress(R.string.progress_addingSubKeys, 40, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_addingSubKeys, 40, 100);
         for (int i = 1; i < keys.size(); ++i) {
-            progress.setProgress(40 + 50 * (i - 1)/ (keys.size() - 1), 100);
+            if( progress != null )
+                progress.setProgress(40 + 50 * (i - 1)/ (keys.size() - 1), 100);
             PGPSecretKey subKey = keys.get(i);
             keyEditor = (KeyEditor) keyEditors.getChildAt(i);
             PGPPublicKey subPublicKey = subKey.getPublicKey();
@@ -584,11 +590,13 @@ public class Apg {
         PGPSecretKeyRing secretKeyRing = keyGen.generateSecretKeyRing();
         PGPPublicKeyRing publicKeyRing = keyGen.generatePublicKeyRing();
 
-        progress.setProgress(R.string.progress_savingKeyRing, 90, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_savingKeyRing, 90, 100);
         mDatabase.saveKeyRing(secretKeyRing);
         mDatabase.saveKeyRing(publicKeyRing);
 
-        progress.setProgress(R.string.progress_done, 100, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_done, 100, 100);
     }
 
     public static Bundle importKeyRings(Activity context, int type,
@@ -598,9 +606,11 @@ public class Apg {
         Bundle returnData = new Bundle();
 
         if (type == Id.type.secret_key) {
-            progress.setProgress(R.string.progress_importingSecretKeys, 0, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_importingSecretKeys, 0, 100);
         } else {
-            progress.setProgress(R.string.progress_importingPublicKeys, 0, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_importingPublicKeys, 0, 100);
         }
 
         if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
@@ -671,7 +681,8 @@ public class Apg {
                     } else if (retValue == Id.return_value.bad) {
                         ++badKeys;
                     }
-                    progress.setProgress((int)(100 * progressIn.position() / data.getSize()), 100);
+                    if( progress != null )
+                        progress.setProgress((int)(100 * progressIn.position() / data.getSize()), 100);
                     obj = objectFactory.nextObject();
                 }
             }
@@ -683,7 +694,8 @@ public class Apg {
         returnData.putInt("updated", oldKeys);
         returnData.putInt("bad", badKeys);
 
-        progress.setProgress(R.string.progress_done, 100, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_done, 100, 100);
 
         return returnData;
     }
@@ -695,9 +707,11 @@ public class Apg {
         Bundle returnData = new Bundle();
 
         if (keyRingIds.size() == 1) {
-            progress.setProgress(R.string.progress_exportingKey, 0, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_exportingKey, 0, 100);
         } else {
-            progress.setProgress(R.string.progress_exportingKeys, 0, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_exportingKeys, 0, 100);
         }
 
         if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
@@ -707,7 +721,8 @@ public class Apg {
 
         int numKeys = 0;
         for (int i = 0; i < keyRingIds.size(); ++i) {
-            progress.setProgress(i * 100 / keyRingIds.size(), 100);
+            if( progress != null )
+                progress.setProgress(i * 100 / keyRingIds.size(), 100);
             Object obj = mDatabase.getKeyRing(keyRingIds.get(i));
             PGPPublicKeyRing publicKeyRing;
             PGPSecretKeyRing secretKeyRing;
@@ -726,7 +741,8 @@ public class Apg {
         out.close();
         returnData.putInt("exported", numKeys);
 
-        progress.setProgress(R.string.progress_done, 100, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_done, 100, 100);
 
         return returnData;
     }
@@ -1236,15 +1252,16 @@ public class Apg {
             if (signaturePassPhrase == null) {
                 throw new GeneralException(context.getString(R.string.error_noSignaturePassPhrase));
             }
-            progress.setProgress(R.string.progress_extractingSignatureKey, 0, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_extractingSignatureKey, 0, 100);
             signaturePrivateKey = signingKey.extractPrivateKey(signaturePassPhrase.toCharArray(),
                                                                new BouncyCastleProvider());
             if (signaturePrivateKey == null) {
                 throw new GeneralException(context.getString(R.string.error_couldNotExtractPrivateKey));
             }
         }
-
-        progress.setProgress(R.string.progress_preparingStreams, 5, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_preparingStreams, 5, 100);
         // encrypt and compress input file content
         PGPEncryptedDataGenerator cPk =
                 new PGPEncryptedDataGenerator(symmetricAlgorithm, true, new SecureRandom(),
@@ -1266,7 +1283,8 @@ public class Apg {
         PGPV3SignatureGenerator signatureV3Generator = null;
 
         if (signatureKeyId != 0) {
-            progress.setProgress(R.string.progress_preparingSignature, 10, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_preparingSignature, 10, 100);
             if (forceV3Signature) {
                 signatureV3Generator =
                     new PGPV3SignatureGenerator(signingKey.getPublicKey().getAlgorithm(),
@@ -1307,8 +1325,8 @@ public class Apg {
         // file name not needed, so empty string
         OutputStream pOut = literalGen.open(bcpgOut, PGPLiteralData.BINARY, "",
                                             new Date(), new byte[1 << 16]);
-
-        progress.setProgress(R.string.progress_encrypting, 20, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_encrypting, 20, 100);
         long done = 0;
         int n = 0;
         byte[] buffer = new byte[1 << 16];
@@ -1324,14 +1342,16 @@ public class Apg {
             }
             done += n;
             if (data.getSize() != 0) {
-                progress.setProgress((int) (20 + (95 - 20) * done / data.getSize()), 100);
+                if( progress != null )
+                    progress.setProgress((int) (20 + (95 - 20) * done / data.getSize()), 100);
             }
         }
 
         literalGen.close();
 
         if (signatureKeyId != 0) {
-            progress.setProgress(R.string.progress_generatingSignature, 95, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_generatingSignature, 95, 100);
             if (forceV3Signature) {
                 signatureV3Generator.generate().encode(pOut);
             } else {
@@ -1346,7 +1366,8 @@ public class Apg {
             armorOut.close();
         }
 
-        progress.setProgress(R.string.progress_done, 100, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_done, 100, 100);
     }
 
     public static void signText(Context context,
@@ -1385,9 +1406,11 @@ public class Apg {
         if (signaturePrivateKey == null) {
             throw new GeneralException(context.getString(R.string.error_couldNotExtractPrivateKey));
         }
-        progress.setProgress(R.string.progress_preparingStreams, 0, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_preparingStreams, 0, 100);
 
-        progress.setProgress(R.string.progress_preparingSignature, 30, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_preparingSignature, 30, 100);
 
         PGPSignatureGenerator signatureGenerator = null;
         PGPV3SignatureGenerator signatureV3Generator = null;
@@ -1411,7 +1434,8 @@ public class Apg {
             signatureGenerator.setHashedSubpackets(spGen.generate());
         }
 
-        progress.setProgress(R.string.progress_signing, 40, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_signing, 40, 100);
 
         armorOut.beginClearText(hashAlgorithm);
 
@@ -1454,7 +1478,8 @@ public class Apg {
         }
         armorOut.close();
 
-        progress.setProgress(R.string.progress_done, 100, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_done, 100, 100);
     }
 
     public static void generateSignature(Context context,
@@ -1501,9 +1526,11 @@ public class Apg {
         if (signaturePrivateKey == null) {
             throw new GeneralException(context.getString(R.string.error_couldNotExtractPrivateKey));
         }
-        progress.setProgress(R.string.progress_preparingStreams, 0, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_preparingStreams, 0, 100);
 
-        progress.setProgress(R.string.progress_preparingSignature, 30, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_preparingSignature, 30, 100);
 
         PGPSignatureGenerator signatureGenerator = null;
         PGPV3SignatureGenerator signatureV3Generator = null;
@@ -1532,7 +1559,8 @@ public class Apg {
             signatureGenerator.setHashedSubpackets(spGen.generate());
         }
 
-        progress.setProgress(R.string.progress_signing, 40, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_signing, 40, 100);
 
         InputStream inStream = data.getInputStream();
         if (binary) {
@@ -1575,7 +1603,8 @@ public class Apg {
         out.close();
         outStream.close();
 
-        progress.setProgress(R.string.progress_done, 100, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_done, 100, 100);
     }
 
     public static long getDecryptionKeyId(Context context, InputData data)
@@ -1669,7 +1698,8 @@ public class Apg {
         long signatureKeyId = 0;
 
         int currentProgress = 0;
-        progress.setProgress(R.string.progress_readingData, currentProgress, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_readingData, currentProgress, 100);
 
         if (o instanceof PGPEncryptedDataList) {
             enc = (PGPEncryptedDataList) o;
@@ -1704,12 +1734,14 @@ public class Apg {
                 throw new GeneralException(context.getString(R.string.error_noSymmetricEncryptionPacket));
             }
 
-            progress.setProgress(R.string.progress_preparingStreams, currentProgress, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_preparingStreams, currentProgress, 100);
             clear = pbe.getDataStream(passPhrase.toCharArray(), new BouncyCastleProvider());
             encryptedData = pbe;
             currentProgress += 5;
         } else {
-            progress.setProgress(R.string.progress_findingKey, currentProgress, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_findingKey, currentProgress, 100);
             PGPPublicKeyEncryptedData pbe = null;
             PGPSecretKey secretKey = null;
             Iterator it = enc.getEncryptedDataObjects();
@@ -1731,7 +1763,8 @@ public class Apg {
             }
 
             currentProgress += 5;
-            progress.setProgress(R.string.progress_extractingKey, currentProgress, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_extractingKey, currentProgress, 100);
             PGPPrivateKey privateKey = null;
             try {
                 privateKey = secretKey.extractPrivateKey(passPhrase.toCharArray(),
@@ -1743,7 +1776,8 @@ public class Apg {
                 throw new GeneralException(context.getString(R.string.error_couldNotExtractPrivateKey));
             }
             currentProgress += 5;
-            progress.setProgress(R.string.progress_preparingStreams, currentProgress, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_preparingStreams, currentProgress, 100);
             clear = pbe.getDataStream(privateKey, new BouncyCastleProvider());
             encryptedData = pbe;
             currentProgress += 5;
@@ -1756,7 +1790,8 @@ public class Apg {
         int signatureIndex = -1;
 
         if (dataChunk instanceof PGPCompressedData) {
-            progress.setProgress(R.string.progress_decompressingData, currentProgress, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_decompressingData, currentProgress, 100);
             PGPObjectFactory fact =
                     new PGPObjectFactory(((PGPCompressedData) dataChunk).getDataStream());
             dataChunk = fact.nextObject();
@@ -1765,7 +1800,8 @@ public class Apg {
         }
 
         if (dataChunk instanceof PGPOnePassSignatureList) {
-            progress.setProgress(R.string.progress_processingSignature, currentProgress, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_processingSignature, currentProgress, 100);
             returnData.putBoolean(EXTRA_SIGNATURE, true);
             PGPOnePassSignatureList sigList = (PGPOnePassSignatureList) dataChunk;
             for (int i = 0; i < sigList.size(); ++i) {
@@ -1802,7 +1838,8 @@ public class Apg {
         }
 
         if (dataChunk instanceof PGPLiteralData) {
-            progress.setProgress(R.string.progress_decrypting, currentProgress, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_decrypting, currentProgress, 100);
             PGPLiteralData literalData = (PGPLiteralData) dataChunk;
             OutputStream out = outStream;
 
@@ -1838,11 +1875,13 @@ public class Apg {
                     currentProgress = (int)(startProgress + (endProgress - startProgress) *
                                         (data.getStreamPosition() - startPos) / (data.getSize() - startPos));
                 }
-                progress.setProgress(currentProgress, 100);
+                if( progress != null )
+                    progress.setProgress(currentProgress, 100);
             }
 
             if (signature != null) {
-                progress.setProgress(R.string.progress_verifyingSignature, 90, 100);
+                if( progress != null )
+                    progress.setProgress(R.string.progress_verifyingSignature, 90, 100);
                 PGPSignatureList signatureList = (PGPSignatureList) plainFact.nextObject();
                 PGPSignature messageSignature = (PGPSignature) signatureList.get(signatureIndex);
                 if (signature.verify(messageSignature)) {
@@ -1855,7 +1894,8 @@ public class Apg {
 
         // TODO: add integrity somewhere
         if (encryptedData.isIntegrityProtected()) {
-            progress.setProgress(R.string.progress_verifyingIntegrity, 95, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_verifyingIntegrity, 95, 100);
             if (encryptedData.verify()) {
                 // passed
             } else {
@@ -1865,7 +1905,8 @@ public class Apg {
             // no integrity check
         }
 
-        progress.setProgress(R.string.progress_done, 100, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_done, 100, 100);
         return returnData;
     }
 
@@ -1878,7 +1919,8 @@ public class Apg {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         ArmoredInputStream aIn = new ArmoredInputStream(data.getInputStream());
 
-        progress.setProgress(R.string.progress_done, 0, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_done, 0, 100);
 
         // mostly taken from ClearSignedFileProcessor
         ByteArrayOutputStream lineOut = new ByteArrayOutputStream();
@@ -1903,7 +1945,8 @@ public class Apg {
 
         returnData.putBoolean(EXTRA_SIGNATURE, true);
 
-        progress.setProgress(R.string.progress_processingSignature, 60, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_processingSignature, 60, 100);
         PGPObjectFactory pgpFact = new PGPObjectFactory(aIn);
 
         PGPSignatureList sigList = (PGPSignatureList) pgpFact.nextObject();
@@ -1950,7 +1993,8 @@ public class Apg {
 
         if (signature == null) {
             returnData.putBoolean(EXTRA_SIGNATURE_UNKNOWN, true);
-            progress.setProgress(R.string.progress_done, 100, 100);
+            if( progress != null )
+                progress.setProgress(R.string.progress_done, 100, 100);
             return returnData;
         }
 
@@ -1976,7 +2020,8 @@ public class Apg {
 
         returnData.putBoolean(EXTRA_SIGNATURE_SUCCESS, signature.verify());
 
-        progress.setProgress(R.string.progress_done, 100, 100);
+        if( progress != null )
+            progress.setProgress(R.string.progress_done, 100, 100);
         return returnData;
     }
 
@@ -2234,7 +2279,8 @@ public class Apg {
         int pos = 0;
         String msg = context.getString(R.string.progress_deletingSecurely, file.getName());
         while (pos < length) {
-            progress.setProgress(msg, (int)(100 * pos / length), 100);
+            if( progress != null )
+                progress.setProgress(msg, (int)(100 * pos / length), 100);
             random.nextBytes(data);
             raf.write(data);
             pos += data.length;

From 86e06eeabeaff5e9470ec23b2cc02ebd74fd15d9 Mon Sep 17 00:00:00 2001
From: Markus Doits <markus.doits@gmail.com>
Date: Thu, 30 Dec 2010 13:47:10 +0000
Subject: [PATCH 3/9] Allow to regenerate shared preferences

Merge of r326 to trunk
---
 src/org/thialfihar/android/apg/Preferences.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/org/thialfihar/android/apg/Preferences.java b/src/org/thialfihar/android/apg/Preferences.java
index d22565804..e704d79f3 100644
--- a/src/org/thialfihar/android/apg/Preferences.java
+++ b/src/org/thialfihar/android/apg/Preferences.java
@@ -12,9 +12,13 @@ public class Preferences {
     private static Preferences mPreferences;
     private SharedPreferences mSharedPreferences;
 
-    public static synchronized Preferences getPreferences(Context context)
+    public static synchronized Preferences getPreferences(Context context) {
+        return getPreferences(context, false);
+    }
+    
+    public static synchronized Preferences getPreferences(Context context, boolean force_new)
     {
-        if (mPreferences == null) {
+        if (mPreferences == null || force_new) {
             mPreferences = new Preferences(context);
         }
         return mPreferences;

From 36c2b860ce2e46cbfcf7a00bdda03ddc15e4cc3d Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Sat, 5 Feb 2011 16:09:01 +0000
Subject: [PATCH 4/9] strings fixes in IT and NO version

---
 res/values-it/strings.xml | 2 +-
 res/values-no/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d1d76f09d..e6f286de5 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -228,7 +228,7 @@
     <string name="error_noKnownEncryptionFound">non è stato trovato nessun tipo di crittazione valido</string>
     <string name="error_externalStorageNotReady">la scheda di memoria non è pronta o non è utilizzabile</string>
     <string name="error_accountNotFound">acconto \'%s\' non trovato</string>
-    <string name="error_accountReadingNotAllowed">accesso in lettura all'\account negato</string>
+    <string name="error_accountReadingNotAllowed">accesso in lettura all\'account negato</string>
     <string name="error_addingAccountFailed">non è stato possibile aggiungere l\'acconto \'%s\'</string>
     <string name="error_invalidEmail">mail non valida \'%s\'</string>
     <string name="error_keySizeMinimum512bit">la dimensione della chiave deve essere almeno di 512bit</string>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index 1d372f386..c40f53883 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -1,4 +1,4 @@
-cho<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
 
      Licensed under the Apache License, Version 2.0 (the "License");

From f37204321d0853ac76321a8e5b20989c4e6fb67f Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Sat, 5 Feb 2011 16:11:07 +0000
Subject: [PATCH 5/9] don't include a Preference re-instantiation for now, will
 see about that when merging apg_service

---
 src/org/thialfihar/android/apg/Preferences.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/org/thialfihar/android/apg/Preferences.java b/src/org/thialfihar/android/apg/Preferences.java
index e704d79f3..36325a126 100644
--- a/src/org/thialfihar/android/apg/Preferences.java
+++ b/src/org/thialfihar/android/apg/Preferences.java
@@ -13,12 +13,7 @@ public class Preferences {
     private SharedPreferences mSharedPreferences;
 
     public static synchronized Preferences getPreferences(Context context) {
-        return getPreferences(context, false);
-    }
-    
-    public static synchronized Preferences getPreferences(Context context, boolean force_new)
-    {
-        if (mPreferences == null || force_new) {
+        if (mPreferences == null) {
             mPreferences = new Preferences(context);
         }
         return mPreferences;

From 4e37568eab3d6158a8d0a299a6090942c2bd469e Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Sat, 5 Feb 2011 16:40:46 +0000
Subject: [PATCH 6/9] remove the null check for progress again, not needed in
 the trunk for now

---
 src/org/thialfihar/android/apg/Apg.java | 144 ++++++++----------------
 1 file changed, 48 insertions(+), 96 deletions(-)

diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java
index cf71185e1..34c2acc6b 100644
--- a/src/org/thialfihar/android/apg/Apg.java
+++ b/src/org/thialfihar/android/apg/Apg.java
@@ -400,8 +400,7 @@ public class Apg {
             throws Apg.GeneralException, NoSuchProviderException, PGPException,
             NoSuchAlgorithmException, SignatureException, IOException, Database.GeneralException {
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_buildingKey, 0, 100);
+        progress.setProgress(R.string.progress_buildingKey, 0, 100);
 
         Security.addProvider(new BouncyCastleProvider());
 
@@ -462,8 +461,7 @@ public class Apg {
             keys.add(editor.getValue());
         }
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_preparingMasterKey, 10, 100);
+        progress.setProgress(R.string.progress_preparingMasterKey, 10, 100);
         KeyEditor keyEditor = (KeyEditor) keyEditors.getChildAt(0);
         int usageId = keyEditor.getUsage();
         boolean canSign = (usageId == Id.choice.usage.sign_only ||
@@ -483,8 +481,7 @@ public class Apg {
             masterKey.extractPrivateKey(oldPassPhrase.toCharArray(),
                                         new BouncyCastleProvider());
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_certifyingMasterKey, 20, 100);
+        progress.setProgress(R.string.progress_certifyingMasterKey, 20, 100);
         for (int i = 0; i < userIds.size(); ++i) {
             String userId = userIds.get(i);
 
@@ -528,8 +525,7 @@ public class Apg {
             hashedPacketsGen.setKeyExpirationTime(true, numDays * 86400);
         }
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_buildingMasterKeyRing, 30, 100);
+        progress.setProgress(R.string.progress_buildingMasterKeyRing, 30, 100);
         PGPKeyRingGenerator keyGen =
                 new PGPKeyRingGenerator(PGPSignature.POSITIVE_CERTIFICATION,
                                         masterKeyPair, mainUserId,
@@ -537,11 +533,9 @@ public class Apg {
                                         hashedPacketsGen.generate(), unhashedPacketsGen.generate(),
                                         new SecureRandom(), new BouncyCastleProvider().getName());
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_addingSubKeys, 40, 100);
+        progress.setProgress(R.string.progress_addingSubKeys, 40, 100);
         for (int i = 1; i < keys.size(); ++i) {
-            if( progress != null )
-                progress.setProgress(40 + 50 * (i - 1)/ (keys.size() - 1), 100);
+            progress.setProgress(40 + 50 * (i - 1)/ (keys.size() - 1), 100);
             PGPSecretKey subKey = keys.get(i);
             keyEditor = (KeyEditor) keyEditors.getChildAt(i);
             PGPPublicKey subPublicKey = subKey.getPublicKey();
@@ -590,13 +584,11 @@ public class Apg {
         PGPSecretKeyRing secretKeyRing = keyGen.generateSecretKeyRing();
         PGPPublicKeyRing publicKeyRing = keyGen.generatePublicKeyRing();
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_savingKeyRing, 90, 100);
+        progress.setProgress(R.string.progress_savingKeyRing, 90, 100);
         mDatabase.saveKeyRing(secretKeyRing);
         mDatabase.saveKeyRing(publicKeyRing);
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_done, 100, 100);
+        progress.setProgress(R.string.progress_done, 100, 100);
     }
 
     public static Bundle importKeyRings(Activity context, int type,
@@ -606,11 +598,9 @@ public class Apg {
         Bundle returnData = new Bundle();
 
         if (type == Id.type.secret_key) {
-            if( progress != null )
-                progress.setProgress(R.string.progress_importingSecretKeys, 0, 100);
+            progress.setProgress(R.string.progress_importingSecretKeys, 0, 100);
         } else {
-            if( progress != null )
-                progress.setProgress(R.string.progress_importingPublicKeys, 0, 100);
+            progress.setProgress(R.string.progress_importingPublicKeys, 0, 100);
         }
 
         if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
@@ -681,8 +671,7 @@ public class Apg {
                     } else if (retValue == Id.return_value.bad) {
                         ++badKeys;
                     }
-                    if( progress != null )
-                        progress.setProgress((int)(100 * progressIn.position() / data.getSize()), 100);
+                    progress.setProgress((int)(100 * progressIn.position() / data.getSize()), 100);
                     obj = objectFactory.nextObject();
                 }
             }
@@ -694,8 +683,7 @@ public class Apg {
         returnData.putInt("updated", oldKeys);
         returnData.putInt("bad", badKeys);
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_done, 100, 100);
+        progress.setProgress(R.string.progress_done, 100, 100);
 
         return returnData;
     }
@@ -707,11 +695,9 @@ public class Apg {
         Bundle returnData = new Bundle();
 
         if (keyRingIds.size() == 1) {
-            if( progress != null )
-                progress.setProgress(R.string.progress_exportingKey, 0, 100);
+            progress.setProgress(R.string.progress_exportingKey, 0, 100);
         } else {
-            if( progress != null )
-                progress.setProgress(R.string.progress_exportingKeys, 0, 100);
+            progress.setProgress(R.string.progress_exportingKeys, 0, 100);
         }
 
         if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
@@ -721,8 +707,7 @@ public class Apg {
 
         int numKeys = 0;
         for (int i = 0; i < keyRingIds.size(); ++i) {
-            if( progress != null )
-                progress.setProgress(i * 100 / keyRingIds.size(), 100);
+            progress.setProgress(i * 100 / keyRingIds.size(), 100);
             Object obj = mDatabase.getKeyRing(keyRingIds.get(i));
             PGPPublicKeyRing publicKeyRing;
             PGPSecretKeyRing secretKeyRing;
@@ -741,8 +726,7 @@ public class Apg {
         out.close();
         returnData.putInt("exported", numKeys);
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_done, 100, 100);
+        progress.setProgress(R.string.progress_done, 100, 100);
 
         return returnData;
     }
@@ -1252,16 +1236,14 @@ public class Apg {
             if (signaturePassPhrase == null) {
                 throw new GeneralException(context.getString(R.string.error_noSignaturePassPhrase));
             }
-            if( progress != null )
-                progress.setProgress(R.string.progress_extractingSignatureKey, 0, 100);
+            progress.setProgress(R.string.progress_extractingSignatureKey, 0, 100);
             signaturePrivateKey = signingKey.extractPrivateKey(signaturePassPhrase.toCharArray(),
                                                                new BouncyCastleProvider());
             if (signaturePrivateKey == null) {
                 throw new GeneralException(context.getString(R.string.error_couldNotExtractPrivateKey));
             }
         }
-        if( progress != null )
-            progress.setProgress(R.string.progress_preparingStreams, 5, 100);
+        progress.setProgress(R.string.progress_preparingStreams, 5, 100);
         // encrypt and compress input file content
         PGPEncryptedDataGenerator cPk =
                 new PGPEncryptedDataGenerator(symmetricAlgorithm, true, new SecureRandom(),
@@ -1283,8 +1265,7 @@ public class Apg {
         PGPV3SignatureGenerator signatureV3Generator = null;
 
         if (signatureKeyId != 0) {
-            if( progress != null )
-                progress.setProgress(R.string.progress_preparingSignature, 10, 100);
+            progress.setProgress(R.string.progress_preparingSignature, 10, 100);
             if (forceV3Signature) {
                 signatureV3Generator =
                     new PGPV3SignatureGenerator(signingKey.getPublicKey().getAlgorithm(),
@@ -1325,8 +1306,7 @@ public class Apg {
         // file name not needed, so empty string
         OutputStream pOut = literalGen.open(bcpgOut, PGPLiteralData.BINARY, "",
                                             new Date(), new byte[1 << 16]);
-        if( progress != null )
-            progress.setProgress(R.string.progress_encrypting, 20, 100);
+        progress.setProgress(R.string.progress_encrypting, 20, 100);
         long done = 0;
         int n = 0;
         byte[] buffer = new byte[1 << 16];
@@ -1342,16 +1322,14 @@ public class Apg {
             }
             done += n;
             if (data.getSize() != 0) {
-                if( progress != null )
-                    progress.setProgress((int) (20 + (95 - 20) * done / data.getSize()), 100);
+                progress.setProgress((int) (20 + (95 - 20) * done / data.getSize()), 100);
             }
         }
 
         literalGen.close();
 
         if (signatureKeyId != 0) {
-            if( progress != null )
-                progress.setProgress(R.string.progress_generatingSignature, 95, 100);
+            progress.setProgress(R.string.progress_generatingSignature, 95, 100);
             if (forceV3Signature) {
                 signatureV3Generator.generate().encode(pOut);
             } else {
@@ -1366,8 +1344,7 @@ public class Apg {
             armorOut.close();
         }
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_done, 100, 100);
+        progress.setProgress(R.string.progress_done, 100, 100);
     }
 
     public static void signText(Context context,
@@ -1406,11 +1383,9 @@ public class Apg {
         if (signaturePrivateKey == null) {
             throw new GeneralException(context.getString(R.string.error_couldNotExtractPrivateKey));
         }
-        if( progress != null )
-            progress.setProgress(R.string.progress_preparingStreams, 0, 100);
+        progress.setProgress(R.string.progress_preparingStreams, 0, 100);
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_preparingSignature, 30, 100);
+        progress.setProgress(R.string.progress_preparingSignature, 30, 100);
 
         PGPSignatureGenerator signatureGenerator = null;
         PGPV3SignatureGenerator signatureV3Generator = null;
@@ -1434,8 +1409,7 @@ public class Apg {
             signatureGenerator.setHashedSubpackets(spGen.generate());
         }
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_signing, 40, 100);
+        progress.setProgress(R.string.progress_signing, 40, 100);
 
         armorOut.beginClearText(hashAlgorithm);
 
@@ -1478,8 +1452,7 @@ public class Apg {
         }
         armorOut.close();
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_done, 100, 100);
+        progress.setProgress(R.string.progress_done, 100, 100);
     }
 
     public static void generateSignature(Context context,
@@ -1526,11 +1499,9 @@ public class Apg {
         if (signaturePrivateKey == null) {
             throw new GeneralException(context.getString(R.string.error_couldNotExtractPrivateKey));
         }
-        if( progress != null )
-            progress.setProgress(R.string.progress_preparingStreams, 0, 100);
+        progress.setProgress(R.string.progress_preparingStreams, 0, 100);
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_preparingSignature, 30, 100);
+        progress.setProgress(R.string.progress_preparingSignature, 30, 100);
 
         PGPSignatureGenerator signatureGenerator = null;
         PGPV3SignatureGenerator signatureV3Generator = null;
@@ -1559,8 +1530,7 @@ public class Apg {
             signatureGenerator.setHashedSubpackets(spGen.generate());
         }
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_signing, 40, 100);
+        progress.setProgress(R.string.progress_signing, 40, 100);
 
         InputStream inStream = data.getInputStream();
         if (binary) {
@@ -1603,8 +1573,7 @@ public class Apg {
         out.close();
         outStream.close();
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_done, 100, 100);
+        progress.setProgress(R.string.progress_done, 100, 100);
     }
 
     public static long getDecryptionKeyId(Context context, InputData data)
@@ -1698,8 +1667,7 @@ public class Apg {
         long signatureKeyId = 0;
 
         int currentProgress = 0;
-        if( progress != null )
-            progress.setProgress(R.string.progress_readingData, currentProgress, 100);
+        progress.setProgress(R.string.progress_readingData, currentProgress, 100);
 
         if (o instanceof PGPEncryptedDataList) {
             enc = (PGPEncryptedDataList) o;
@@ -1734,14 +1702,12 @@ public class Apg {
                 throw new GeneralException(context.getString(R.string.error_noSymmetricEncryptionPacket));
             }
 
-            if( progress != null )
-                progress.setProgress(R.string.progress_preparingStreams, currentProgress, 100);
+            progress.setProgress(R.string.progress_preparingStreams, currentProgress, 100);
             clear = pbe.getDataStream(passPhrase.toCharArray(), new BouncyCastleProvider());
             encryptedData = pbe;
             currentProgress += 5;
         } else {
-            if( progress != null )
-                progress.setProgress(R.string.progress_findingKey, currentProgress, 100);
+            progress.setProgress(R.string.progress_findingKey, currentProgress, 100);
             PGPPublicKeyEncryptedData pbe = null;
             PGPSecretKey secretKey = null;
             Iterator it = enc.getEncryptedDataObjects();
@@ -1763,8 +1729,7 @@ public class Apg {
             }
 
             currentProgress += 5;
-            if( progress != null )
-                progress.setProgress(R.string.progress_extractingKey, currentProgress, 100);
+            progress.setProgress(R.string.progress_extractingKey, currentProgress, 100);
             PGPPrivateKey privateKey = null;
             try {
                 privateKey = secretKey.extractPrivateKey(passPhrase.toCharArray(),
@@ -1776,8 +1741,7 @@ public class Apg {
                 throw new GeneralException(context.getString(R.string.error_couldNotExtractPrivateKey));
             }
             currentProgress += 5;
-            if( progress != null )
-                progress.setProgress(R.string.progress_preparingStreams, currentProgress, 100);
+            progress.setProgress(R.string.progress_preparingStreams, currentProgress, 100);
             clear = pbe.getDataStream(privateKey, new BouncyCastleProvider());
             encryptedData = pbe;
             currentProgress += 5;
@@ -1790,8 +1754,7 @@ public class Apg {
         int signatureIndex = -1;
 
         if (dataChunk instanceof PGPCompressedData) {
-            if( progress != null )
-                progress.setProgress(R.string.progress_decompressingData, currentProgress, 100);
+            progress.setProgress(R.string.progress_decompressingData, currentProgress, 100);
             PGPObjectFactory fact =
                     new PGPObjectFactory(((PGPCompressedData) dataChunk).getDataStream());
             dataChunk = fact.nextObject();
@@ -1800,8 +1763,7 @@ public class Apg {
         }
 
         if (dataChunk instanceof PGPOnePassSignatureList) {
-            if( progress != null )
-                progress.setProgress(R.string.progress_processingSignature, currentProgress, 100);
+            progress.setProgress(R.string.progress_processingSignature, currentProgress, 100);
             returnData.putBoolean(EXTRA_SIGNATURE, true);
             PGPOnePassSignatureList sigList = (PGPOnePassSignatureList) dataChunk;
             for (int i = 0; i < sigList.size(); ++i) {
@@ -1838,8 +1800,7 @@ public class Apg {
         }
 
         if (dataChunk instanceof PGPLiteralData) {
-            if( progress != null )
-                progress.setProgress(R.string.progress_decrypting, currentProgress, 100);
+            progress.setProgress(R.string.progress_decrypting, currentProgress, 100);
             PGPLiteralData literalData = (PGPLiteralData) dataChunk;
             OutputStream out = outStream;
 
@@ -1875,13 +1836,11 @@ public class Apg {
                     currentProgress = (int)(startProgress + (endProgress - startProgress) *
                                         (data.getStreamPosition() - startPos) / (data.getSize() - startPos));
                 }
-                if( progress != null )
-                    progress.setProgress(currentProgress, 100);
+                progress.setProgress(currentProgress, 100);
             }
 
             if (signature != null) {
-                if( progress != null )
-                    progress.setProgress(R.string.progress_verifyingSignature, 90, 100);
+                progress.setProgress(R.string.progress_verifyingSignature, 90, 100);
                 PGPSignatureList signatureList = (PGPSignatureList) plainFact.nextObject();
                 PGPSignature messageSignature = (PGPSignature) signatureList.get(signatureIndex);
                 if (signature.verify(messageSignature)) {
@@ -1894,8 +1853,7 @@ public class Apg {
 
         // TODO: add integrity somewhere
         if (encryptedData.isIntegrityProtected()) {
-            if( progress != null )
-                progress.setProgress(R.string.progress_verifyingIntegrity, 95, 100);
+            progress.setProgress(R.string.progress_verifyingIntegrity, 95, 100);
             if (encryptedData.verify()) {
                 // passed
             } else {
@@ -1905,8 +1863,7 @@ public class Apg {
             // no integrity check
         }
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_done, 100, 100);
+        progress.setProgress(R.string.progress_done, 100, 100);
         return returnData;
     }
 
@@ -1919,8 +1876,7 @@ public class Apg {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         ArmoredInputStream aIn = new ArmoredInputStream(data.getInputStream());
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_done, 0, 100);
+        progress.setProgress(R.string.progress_done, 0, 100);
 
         // mostly taken from ClearSignedFileProcessor
         ByteArrayOutputStream lineOut = new ByteArrayOutputStream();
@@ -1945,8 +1901,7 @@ public class Apg {
 
         returnData.putBoolean(EXTRA_SIGNATURE, true);
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_processingSignature, 60, 100);
+        progress.setProgress(R.string.progress_processingSignature, 60, 100);
         PGPObjectFactory pgpFact = new PGPObjectFactory(aIn);
 
         PGPSignatureList sigList = (PGPSignatureList) pgpFact.nextObject();
@@ -1993,8 +1948,7 @@ public class Apg {
 
         if (signature == null) {
             returnData.putBoolean(EXTRA_SIGNATURE_UNKNOWN, true);
-            if( progress != null )
-                progress.setProgress(R.string.progress_done, 100, 100);
+            progress.setProgress(R.string.progress_done, 100, 100);
             return returnData;
         }
 
@@ -2020,8 +1974,7 @@ public class Apg {
 
         returnData.putBoolean(EXTRA_SIGNATURE_SUCCESS, signature.verify());
 
-        if( progress != null )
-            progress.setProgress(R.string.progress_done, 100, 100);
+        progress.setProgress(R.string.progress_done, 100, 100);
         return returnData;
     }
 
@@ -2279,8 +2232,7 @@ public class Apg {
         int pos = 0;
         String msg = context.getString(R.string.progress_deletingSecurely, file.getName());
         while (pos < length) {
-            if( progress != null )
-                progress.setProgress(msg, (int)(100 * pos / length), 100);
+            progress.setProgress(msg, (int)(100 * pos / length), 100);
             random.nextBytes(data);
             raf.write(data);
             pos += data.length;

From 3a22ac4197ec3190e359851b1c42259bbdd7522f Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Sat, 19 Mar 2011 18:23:54 +0000
Subject: [PATCH 7/9] applied proposed patch by mattispasch for issue 99

---
 .../android/apg/EncryptActivity.java          | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/org/thialfihar/android/apg/EncryptActivity.java b/src/org/thialfihar/android/apg/EncryptActivity.java
index 29af975bf..9ba71f570 100644
--- a/src/org/thialfihar/android/apg/EncryptActivity.java
+++ b/src/org/thialfihar/android/apg/EncryptActivity.java
@@ -18,6 +18,7 @@ package org.thialfihar.android.apg;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.security.NoSuchAlgorithmException;
@@ -30,6 +31,7 @@ import org.bouncycastle2.openpgp.PGPPublicKey;
 import org.bouncycastle2.openpgp.PGPPublicKeyRing;
 import org.bouncycastle2.openpgp.PGPSecretKey;
 import org.bouncycastle2.openpgp.PGPSecretKeyRing;
+import org.thialfihar.android.apg.provider.DataProvider;
 import org.thialfihar.android.apg.utils.Choice;
 
 import android.app.Dialog;
@@ -699,21 +701,30 @@ public class EncryptActivity extends BaseActivity {
 
             out.close();
             if (mEncryptTarget != Id.target.file) {
-                if (useAsciiArmour) {
-                    String extraData = new String(((ByteArrayOutputStream)out).toByteArray());
-                    if (mGenerateSignature) {
-                        data.putString(Apg.EXTRA_SIGNATURE_TEXT, extraData);
-                    } else {
-                        data.putString(Apg.EXTRA_ENCRYPTED_MESSAGE, extraData);
-                    }
-                } else {
-                    byte extraData[] = ((ByteArrayOutputStream)out).toByteArray();
-                    if (mGenerateSignature) {
-                        data.putByteArray(Apg.EXTRA_SIGNATURE_DATA, extraData);
-                    } else {
-                        data.putByteArray(Apg.EXTRA_ENCRYPTED_DATA, extraData);
-                    }
-                }
+            	
+            	if(out instanceof ByteArrayOutputStream) {
+            		if (useAsciiArmour) {
+                    	String extraData = new String(((ByteArrayOutputStream)out).toByteArray());
+                    	if (mGenerateSignature) {
+                        	data.putString(Apg.EXTRA_SIGNATURE_TEXT, extraData);
+                    	} else {
+                    		data.putString(Apg.EXTRA_ENCRYPTED_MESSAGE, extraData);
+                    	}
+                	} else {
+                    	byte extraData[] = ((ByteArrayOutputStream)out).toByteArray();
+                    	if (mGenerateSignature) {
+                        	data.putByteArray(Apg.EXTRA_SIGNATURE_DATA, extraData);
+                    	} else {
+                    		data.putByteArray(Apg.EXTRA_ENCRYPTED_DATA, extraData);
+                    	}
+                	}
+				} else if(out instanceof FileOutputStream) {
+					String fileName = mDataDestination.getStreamFilename();
+					String uri = "content://" + DataProvider.AUTHORITY + "/data/" + fileName;
+					data.putString(Apg.EXTRA_RESULT_URI, uri);
+				} else {
+					throw new Apg.GeneralException("No output-data found.");
+				}
             }
         } catch (IOException e) {
             error = "" + e;

From cb8d589034a9940d750a9dbaded292cced82adbd Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Sun, 11 Sep 2011 19:15:58 +0000
Subject: [PATCH 8/9] upgraded to target android-13

---
 default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.properties b/default.properties
index 51e933a98..e735ffa56 100644
--- a/default.properties
+++ b/default.properties
@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-8
+target=android-13

From 9fbda63b6f20870f9ce6875a625c4e780d250aa9 Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Sun, 11 Sep 2011 20:02:20 +0000
Subject: [PATCH 9/9] added Portuguese translation, thanks, Paulo Angelo

---
 res/values-pt/strings.xml | 361 ++++++++++++++++++++++++++++++++++++++
 res/values/arrays.xml     |   1 +
 2 files changed, 362 insertions(+)
 create mode 100644 res/values-pt/strings.xml

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
new file mode 100644
index 000000000..f64e123c2
--- /dev/null
+++ b/res/values-pt/strings.xml
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string name="app_name">APG</string>
+
+    <!-- title_lowerCase: capitalized words, no punctuation -->
+    <string name="title_mailInbox">Caixa de Entrada</string>
+    <string name="title_managePublicKeys">Gerir Chaves Públicas</string>
+    <string name="title_manageSecretKeys">Gerir Chaves Privadas</string>
+
+    <string name="title_selectRecipients">Escolher Destinatários</string>
+    <string name="title_selectSignature">Escolher Assinatura</string>
+    <string name="title_encrypt">Cifrar</string>
+    <string name="title_decrypt">Decifrar</string>
+    <string name="title_authentication">Senha</string>
+    <string name="title_createKey">Criar Chave</string>
+
+    <string name="title_editKey">Editar Chave</string>
+    <string name="title_preferences">Preferências</string>
+    <string name="title_keyServerPreference">Preferências de Servidor de Chaves</string>
+    <string name="title_changePassPhrase">Alterar Senha</string>
+    <string name="title_setPassPhrase">Definir Senha</string>
+    <string name="title_sendEmail">"Enviar Email..."</string>
+
+    <string name="title_encryptToFile">Cifrar Para Arquivo</string>
+    <string name="title_decryptToFile">Descifrar Para Arquivo</string>
+    <string name="title_addAccount">Adicionar Conta</string>
+    <string name="title_importKeys">Importar Chaves</string>
+    <string name="title_exportKey">Exportar Chave</string>
+    <string name="title_exportKeys">Exportar Chaves</string>
+
+    <string name="title_keyNotFound">Chave Não Encontrada</string>
+    <string name="title_help">Conhecendo</string>
+    <string name="title_keyServerQuery">Busca no Servidor de Chaves</string>
+    <string name="title_unknownSignatureKey">Assinatura Desconhecida</string>
+
+    <!-- section_lowerCase: capitalized words, no punctuation -->
+    <string name="section_userIds">IDs de Usuários</string>
+
+    <string name="section_keys">Chaves</string>
+    <string name="section_general">Geral</string>
+    <string name="section_defaults">Padrões</string>
+    <string name="section_advanced">Avançado</string>
+
+    <!-- btn_lowerCase: capitalized words, no punctuation -->
+    <string name="btn_signToClipboard">Assinar Para Clipboard</string>
+
+    <string name="btn_encryptToClipboard">Cifrar Para Clipboard</string>
+    <string name="btn_encryptAndEmail">Cifrar Para Email</string>
+    <string name="btn_signAndEmail">Assinar Para Email</string>
+    <string name="btn_encrypt">Cifrar</string>
+    <string name="btn_sign">Assinar</string>
+    <string name="btn_decrypt">Decifrar</string>
+
+    <string name="btn_verify">Verificar</string>
+    <string name="btn_selectEncryptKeys">Escolher Destinatários</string>
+    <string name="btn_reply">Responder</string>
+    <string name="btn_encryptMessage">Cifrar Mensagem</string>
+    <string name="btn_decryptMessage">Decifrar Mesagem</string>
+    <string name="btn_encryptFile">Cifrar Arquivo</string>
+
+    <string name="btn_decryptFile">Decifrar Arquivo</string>
+    <string name="btn_save">Salvar</string>
+    <string name="btn_doNotSave">Cancelar</string>
+    <string name="btn_delete">Apagar</string>
+    <string name="btn_noDate">Nenhuma</string>
+    <string name="btn_clearFilter">Limpar Filtro</string>
+
+    <string name="btn_changePassPhrase">Alterar Senha</string>
+    <string name="btn_setPassPhrase">Definir Senha</string>
+    <string name="btn_search">Buscar</string>
+
+    <!-- menu_lowerCase: capitalized words, no punctuation -->
+    <string name="menu_about">Sobre</string>
+    <string name="menu_addAccount">Adicionar Conta GMail</string>
+
+    <string name="menu_deleteAccount">Apagar Conta</string>
+    <string name="menu_managePublicKeys">Gerir Chaves Públicas</string>
+    <string name="menu_manageSecretKeys">Gerir Chaves Privadas</string>
+    <string name="menu_preferences">Configurações</string>
+    <string name="menu_importKeys">Importar Chaves</string>
+    <string name="menu_exportKeys">Exportar Chaves</string>
+
+    <string name="menu_exportKey">Exportar Chave</string>
+    <string name="menu_deleteKey">Apagar Chave</string>
+    <string name="menu_createKey">Criar Chave</string>
+    <string name="menu_editKey">Editar Chave</string>
+    <string name="menu_search">Buscar</string>
+    <string name="menu_help">Ajuda</string>
+
+    <string name="menu_keyServer">Servidor de Chaves</string>
+    <string name="menu_updateKey">Atualizar</string>
+
+    <!-- label_lowerCase: capitalized words, no punctuation -->
+    <string name="label_sign">Assinar</string>
+    <string name="label_message">Mensagem</string>
+    <string name="label_file">Arquivo</string>
+
+    <string name="label_passPhrase">Senha</string>
+    <string name="label_passPhraseAgain">Novamente</string>
+    <string name="label_algorithm">Algoritmo</string>
+    <string name="label_asciiArmour">Armadura ASCII</string>
+    <string name="label_selectPublicKeys">Chave(s) Pública(s)</string>
+    <string name="label_deleteAfterEncryption">Apagar Após Cifrar</string>
+
+    <string name="label_deleteAfterDecryption">Apagar Após Decifrar</string>
+    <string name="label_deleteAfterImport">Apagar Após Importar</string>
+    <string name="label_encryptionAlgorithm">Algoritmo de Cifragem</string>
+    <string name="label_hashAlgorithm">Algoritmo de Hash</string>
+    <string name="label_asymmetric">Chave Pública</string>
+    <string name="label_symmetric">Senha</string>
+
+    <string name="label_passPhraseCacheTtl">Cache de Senhas</string>
+    <string name="label_messageCompression">Compressão de Mensagem</string>
+    <string name="label_fileCompression">Compressão de Arquivo</string>
+    <string name="label_language">Língua</string>
+    <string name="label_forceV3Signature">Forçar Assinaturas V3</string>
+    <string name="label_keyServers">Servidores de Chave</string>
+
+    <string name="label_keyId">ID da Chave</string>
+    <string name="label_creation">Criação</string>
+    <string name="label_expiry">Expiração</string>
+    <string name="label_usage">Uso</string>
+    <string name="label_keySize">Tamanho da Chave</string>
+    <string name="label_mainUserId">ID do Usuário Principal</string>
+
+    <string name="label_name">Nome</string>
+    <string name="label_comment">Comentário</string>
+    <string name="label_email">Email</string>
+
+    <string name="noKeysSelected">Selecionar</string>
+    <string name="oneKeySelected">1 Selecionada</string>
+    <string name="nKeysSelected">Selecionada</string>
+
+    <string name="unknownUserId">&lt;desconhecido&gt;</string>
+    <string name="none">&lt;ninguém&gt;</string>
+    <string name="noKey">&lt;sem chave&gt;</string>
+    <string name="noDate">-</string>
+    <string name="noExpiry">&lt;não expira&gt;</string>
+    <string name="unknownStatus"></string>
+
+    <string name="canEncrypt">pode cifrar</string>
+    <string name="canSign">pode assinar</string>
+    <string name="expired">expirada</string>
+    <string name="notValid">não válida</string>
+    <string name="nKeyServers">%s servidor(es) de chave(s)</string>
+    <string name="fingerprint">fingerprint</string>
+
+    <!-- choice_lowerCase: capitalized first word, no punctuation -->
+    <string name="choice_none">Nenhum</string>
+    <string name="choice_signOnly">Assinar apenas</string>
+    <string name="choice_encryptOnly">Cifrar apenas</string>
+    <string name="choice_signAndEncrypt">Assinar e Cifrar</string>
+    <string name="choice_15secs">15 segs</string>
+
+    <string name="choice_1min">1 min</string>
+    <string name="choice_3mins">3 mins</string>
+    <string name="choice_5mins">5 mins</string>
+    <string name="choice_10mins">10 mins</string>
+    <string name="choice_20mins">20 mins</string>
+    <string name="choice_40mins">40 mins</string>
+
+    <string name="choice_1hour">1 hora</string>
+    <string name="choice_2hours">2 horas</string>
+    <string name="choice_4hours">4 horas</string>
+    <string name="choice_8hours">8 horas</string>
+    <string name="choice_untilQuit">até sair</string>
+    <string name="choice_language_system">Padrões do sistema</string>
+
+    <string name="dsa">DSA</string>
+    <string name="elgamal">ElGamal</string>
+    <string name="rsa">RSA</string>
+
+    <string name="filemanager_titleOpen">Abrir...</string>
+    <string name="filemanager_titleSave">Salvar Como...</string>
+
+    <string name="filemanager_titleEncrypt">Selecionar Arquivo para Cifrar...</string>
+    <string name="filemanager_titleDecrypt">Selecionar Arquivo para Decifrar...</string>
+    <string name="filemanager_btnOpen">Abrir</string>
+    <string name="filemanager_btnSave">Salvar</string>
+
+    <string name="warning">Advertência</string>
+    <string name="error">Erro</string>
+
+    <string name="warningMessage">Advertência: %s</string>
+    <string name="errorMessage">Erro: %s</string>
+
+    <!-- sentences -->
+    <string name="wrongPassPhrase">Chave errada.</string>
+    <string name="usingClipboardContent">Usando conteúdo do clipboard.</string>
+    <string name="keySaved">Chave salva.</string>
+
+    <string name="setAPassPhrase">Defina uma senha antes.</string>
+    <string name="noFilemanagerInstalled">Não há gerenciador de arquivos compatível instalado.</string>
+    <string name="passPhrasesDoNotMatch">A senha não confere.</string>
+    <string name="passPhraseMustNotBeEmpty">Não são permitidas senhas vazias.</string>
+    <string name="passPhraseForSymmetricEncryption">Cifragem simétrica.</string>
+    <string name="passPhraseFor">%s</string>
+
+    <string name="fileDeleteConfirmation">Tem certeza que deseja apagar\n%s?</string>
+    <string name="fileDeleteSuccessful">Apagado com sucesso.</string>
+    <string name="noFileSelected">Selecione um arquivo primeiro.</string>
+    <string name="decryptionSuccessful">Decifrado com sucesso.</string>
+    <string name="encryptionSuccessful">Cifrado com sucesso.</string>
+    <string name="encryptionToClipboardSuccessful">Cifrado para clipboard com sucesso.</string>
+
+    <string name="enterPassPhraseTwice">Insira a senha duas vezes.</string>
+    <string name="selectEncryptionKey">Selecione pelo menos uma chave de cifragem.</string>
+    <string name="selectEncryptionOrSignatureKey">Selecione pelo menos uma chave de cifragem ou uma chave de assinatura.</string>
+    <string name="specifyFileToEncryptTo">Especifique o arquivo a cifrar sobre.\nATENÇÃO! O arquivo, se existir, será sobrescrito!</string>
+    <string name="specifyFileToDecryptTo">Especifique o arquivo a decifrar sobre.\nATENÇÃO! O arquivo, se existir, será sobrescrito!</string>
+    <string name="specifyGoogleMailAccount">Especifique a conta de Email do Google que deseja adicionar.</string>
+
+    <string name="specifyFileToImportFrom">Especifique o arquivo para importação de chaves. (.asc or .gpg)</string>
+
+    <string name="specifyFileToExportTo">Especifique o arquivo de exportação.\nATENÇÃO! O arquivo, se existir, será sobrescrito!</string>
+    <string name="specifyFileToExportSecretKeysTo">Especifique o arquivo de exportação.\nATENÇÃO! Você está exportando suas chaves PRIVADAS (SECRETAS).\nATENÇÃO! O arquivo, se existir, será sobrescrito.</string>
+    <string name="keyDeletionConfirmation">Você realmente deseja apagar a chave \'%s\'?\nEssa ação não pode ser desfeita!</string>
+    <string name="secretKeyDeletionConfirmation">Você realmente deseja apagar a chave PRIVADA \'%s\'?\nEssa ação não pode ser desfeita!</string>
+    <string name="keysAddedAndUpdated">Adicionada(s) com sucesso %1$s chave(s) e atualizada(s) %2$s chave(s).</string>
+
+    <string name="keysAdded">Adicionada(s) %s chave(s) com sucesso.</string>
+    <string name="keysUpdated">Atualizada(s) %s chaves(s) com sucesso.</string>
+    <string name="noKeysAddedOrUpdated">Nenhuma chave adicionada ou atualizada.</string>
+    <string name="keyExported">1 chave exportada com sucesso.</string>
+    <string name="keysExported">%s chaves exportadas com sucesso.</string>
+    <string name="noKeysExported">Nenhuma chave exportada.</string>
+
+    <string name="keyCreationElGamalInfo">Nota: apenas as sub-chaves suportam ElGamal, e para ElGamal se usuára o tamanho mais próximo a 1536, 2048, 3072, 4096, ou 8192.</string>
+    <string name="keyNotFound">Não se pode encontrar a chave %08X.</string>
+    <string name="keysFound">%s chave(s) encontrada(s).</string>
+    <string name="unknownSignatureKeyTouchToLookUp">Assinatura desconhecida, toque para buscar a chave.</string>
+    <string name="keyEditingIsBeta">A edição de chaves ainda está na versão beta.</string>
+
+
+    <string name="badKeysEncountered">%s chave(s) secreta(s) ignoradas. Provavelmente foram exportadas com a opção\n --export-secret-subkeys\nCertifique-se de exporta com a opção\n --export-secret-keys</string>
+    <string name="lookupUnknownKey">Chave %s desconhecida, você gostaria de procurá-la em um servidor de chaves?</string>
+
+    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <string name="error_fileDeleteFailed">erro ao apagar \'%s\'</string>
+    <string name="error_fileNotFound">arquivo não encontrado</string>
+    <string name="error_noSecretKeyFound">não foi encontrado uma chave secreta adequada</string>
+
+    <string name="error_noKnownEncryptionFound">não foi encontrado tipo de cifragem conhecido</string>
+    <string name="error_externalStorageNotReady">armazenamento externo não disponível</string>
+    <string name="error_accountNotFound">conta \'%s\' não encontrada</string>
+    <string name="error_accountReadingNotAllowed">sem permissões para ler a conta</string>
+    <string name="error_addingAccountFailed">falha ao adicionar a conta \'%s\'</string>
+    <string name="error_invalidEmail">email inválido \'%s\'</string>
+
+    <string name="error_keySizeMinimum512bit">o tamanho da chave deve ser pelo menos 512bit</string>
+    <string name="error_masterKeyMustNotBeElGamal">a chave primária não pode ser do tipo ElGamal</string>
+    <string name="error_unknownAlgorithmChoice">algoritmo selecionado desconhecido</string>
+    <string name="error_userIdNeedsAName">é necessário informar um nome</string>
+    <string name="error_userIdNeedsAnEmailAddress">é necessário informar um endereço de email</string>
+    <string name="error_keyNeedsAUserId">é necessário pelo menos um id de usuário</string>
+
+    <string name="error_mainUserIdMustNotBeEmpty">id de usuário principal não pode ser vazio</string>
+    <string name="error_keyNeedsMasterKey">é necessário pelo menos uma chave primária</string>
+    <string name="error_expiryMustComeAfterCreation">data de expiração deve ser após a data de criação</string>
+    <string name="error_noEncryptionKeysOrPassPhrase">não foram inseridos chave(s) de cifragem ou senha</string>
+    <string name="error_signatureFailed">falha na assinatura</string>
+    <string name="error_noSignaturePassPhrase">senha não inserida</string>
+
+    <string name="error_noSignatureKey">chave para assinatura não inserida</string>
+    <string name="error_invalidData">dados a serem cifrados inválidos</string>
+    <string name="error_corruptData">dados corrompidos</string>
+    <string name="error_noSymmetricEncryptionPacket">não foi encontrado um pacote com criptografia simétrica</string>
+    <string name="error_wrongPassPhrase">senha inválida</string>
+    <string name="error_savingKeys">erro ao salvar chave(s)</string>
+
+    <string name="error_couldNotExtractPrivateKey">não foi possível extrair chave privada</string>
+
+    <!-- progress_lowerCase: lowercase, phrases, usually ending in '...' -->
+    <string name="progress_done">pronto.</string>
+    <string name="progress_initializing">inicializando...</string>
+    <string name="progress_saving">salvando...</string>
+    <string name="progress_importing">importando...</string>
+
+    <string name="progress_exporting">exportando...</string>
+    <string name="progress_generating">criando chave, isso pode demorar um pouco...</string>
+    <string name="progress_buildingKey">criando chave...</string>
+    <string name="progress_preparingMasterKey">preparando chave primária...</string>
+    <string name="progress_certifyingMasterKey">certificando chave primária...</string>
+    <string name="progress_buildingMasterKeyRing">criando anel de chave primária...</string>
+
+    <string name="progress_addingSubKeys">adicionando sub-chaves...</string>
+    <string name="progress_savingKeyRing">salvando anel de chaves...</string>
+    <string name="progress_importingSecretKeys">importando chaves secretas...</string>
+    <string name="progress_importingPublicKeys">importando chaves públicas...</string>
+    <string name="progress_reloadingKeys">recarregando chaves...</string>
+    <string name="progress_exportingKey">exportando chave...</string>
+
+    <string name="progress_exportingKeys">exportando chaves...</string>
+    <string name="progress_extractingSignatureKey">extraindo chave de assinatura...</string>
+    <string name="progress_extractingKey">extraindo chave...</string>
+    <string name="progress_preparingStreams">preparando fluxos...</string>
+    <string name="progress_encrypting">cifrando dados...</string>
+    <string name="progress_decrypting">decifrando dados...</string>
+
+    <string name="progress_preparingSignature">preparando assinatura...</string>
+    <string name="progress_generatingSignature">gerando assinatura...</string>
+    <string name="progress_processingSignature">processando assinatura...</string>
+    <string name="progress_verifyingSignature">verificando assinatura...</string>
+    <string name="progress_signing">assinando...</string>
+    <string name="progress_readingData">carregando dados...</string>
+
+    <string name="progress_findingKey">buscando chave...</string>
+    <string name="progress_decompressingData">descompactando dados...</string>
+    <string name="progress_verifyingIntegrity">verificando integridade...</string>
+    <string name="progress_deletingSecurely">apagando \'%s\' de forma segura...</string>
+    <string name="progress_querying">buscando...</string>
+    <string name="progress_queryingServer">buscando %s...</string>
+
+    <!-- permission strings -->
+    <string name="permission_read_key_details_label">Ler detalhes de chaves do APG.</string>
+    <string name="permission_read_key_details_description">Ler detalhes de chaves públicas e privadas salvas no APG, tais como ID da chave e ID do usuário. As chaves NÃO podem ser lidas.</string>
+
+    <!-- action strings -->
+    <string name="action_encrypt">Cifrar</string>
+    <string name="action_decrypt">Decifrar</string>
+
+    <string name="action_importPublic">Importar Chaves Públicas</string>
+    <string name="action_importSecret">Importar Chaves Privadas</string>
+
+    <string name="hint_publicKeys">Buscar Chaves Públicas</string>
+    <string name="hint_secretKeys">Buscar Chaves Privadas</string>
+    <string name="filterInfo">Filter: \"%s\"</string>
+
+    <!-- misc -->
+    <string name="fast">rápido</string>
+    <string name="slow">lento</string>
+    <string name="very_slow">muito lento</string>
+
+    <!-- texts -->
+    <!-- "OI File Manager", "ASTRO", and "K-9 Mail" must not be translated in order for the links to the market to work. -->
+    <string name="text_help">
+
+    Instale o leitor de emails K-9 para uma melhor integração. Ele suporta o APG para PGP/INLINE e permite cifragem e decifragem de emails diretamente.
+\n\nÉ recomendado o uso dos Gerenciadores de Arquivos OI ou ASTRO para ser possível a utilização do botão de buscar arquivos no APG.
+\n\nSão necessárias chaves para o APG. Importe-as pela opção do menu  \"Gerir Chaves Públicas\" ou \"Gerir Chaves Privadas\" ou crie-as no menu \"Gerir Chaves Privadas\".
+\n\nVocê também pode adicionar uma conta GMail pela opção \"Adicionar Conta\", isso simplifica a decifragem de emails.
+\n\nVerifique as opções de menus para conhecer as funcionalides disponíveis.
+    </string>
+
+</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index df87ab61c..25a4e66df 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -206,6 +206,7 @@
         <item>es</item>
         <item>it</item>
         <item>no</item>
+        <item>pt</item>
         <item>sl</item>
         <item>zh</item>
     </string-array>