merge 1.0.x back into trunk

AndroidManifest.xml

@@ -17,7 +17,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.thialfihar.android.apg"
-    android:versionCode="18" android:versionName="1.0.4">
+    android:versionCode="19" android:versionName="1.0.5">
 
     <application
         android:icon="@drawable/icon"

res/layout/decrypt.xml

@@ -199,15 +199,15 @@
         <Button
             android:id="@+id/btn_reply"
             android:text="@string/btn_reply"
-            android:layout_width="wrap_content"
+            android:layout_width="0dip"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_weight="1"/>
 
         <Button
             android:id="@+id/btn_decrypt"
             android:text="@string/btn_decrypt"
-            android:layout_width="wrap_content"
+            android:layout_width="0dip"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_weight="1"/>
 
     </LinearLayout>

res/layout/edit_key.xml

@@ -45,14 +45,14 @@
         <Button
             android:id="@+id/btn_save"
             android:layout_width="0dip"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_weight="1"
             android:text="@string/btn_save"/>
 
         <Button
             android:id="@+id/btn_discard"
             android:layout_width="0dip"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_weight="1"
             android:text="@string/btn_doNotSave"/>
 

res/layout/encrypt.xml

@@ -368,14 +368,14 @@
             android:text="@string/btn_encryptToClipboard"
             android:layout_weight="1"
             android:layout_width="0dip"
-            android:layout_height="wrap_content"/>
+            android:layout_height="fill_parent"/>
 
         <Button
             android:id="@+id/btn_encrypt"
             android:text="@string/btn_encrypt"
             android:layout_weight="1"
             android:layout_width="0dip"
-            android:layout_height="wrap_content"/>
+            android:layout_height="fill_parent"/>
 
     </LinearLayout>
 

res/layout/main.xml

@@ -52,14 +52,14 @@
                 android:text="@string/btn_encryptFile"
                 android:layout_width="0dip"
                 android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                android:layout_height="fill_parent"/>
 
             <Button
                 android:id="@+id/btn_decryptFile"
                 android:text="@string/btn_decryptFile"
                 android:layout_width="0dip"
                 android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                android:layout_height="fill_parent"/>
 
         </LinearLayout>
 
@@ -73,14 +73,14 @@
                 android:text="@string/btn_encryptMessage"
                 android:layout_width="0dip"
                 android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                android:layout_height="fill_parent"/>
 
             <Button
                 android:id="@+id/btn_decryptMessage"
                 android:text="@string/btn_decryptMessage"
                 android:layout_width="0dip"
                 android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                android:layout_height="fill_parent"/>
 
         </LinearLayout>
 

res/values-de/strings.xml

@@ -23,21 +23,18 @@
     <string name="title_mailInbox">Posteingang</string>
     <string name="title_managePublicKeys">Öffentliche Schlüssel verwalten</string>
     <string name="title_manageSecretKeys">Private Schlüssel verwalten</string>
-
     <string name="title_selectRecipients">Empfänger auswählen</string>
     <string name="title_selectSignature">Signatur auswählen</string>
     <string name="title_encrypt">Verschlüsseln</string>
     <string name="title_decrypt">Entschlüsseln</string>
     <string name="title_authentification">Authentifizierung</string>
     <string name="title_createKey">Schlüssel erzeugen</string>
-
     <string name="title_editKey">Schlüssel bearbeiten</string>
     <string name="title_preferences">Einstellungen</string>
     <string name="title_changePassPhrase">Passwort ändern</string>
     <string name="title_setPassPhrase">Passwort wählen</string>
     <string name="title_sendEmail">"Mail senden ..."</string>
     <string name="title_encryptToFile">In eine Datei verschlüsseln</string>
-
     <string name="title_decryptToFile">In eine Datei entschlüsseln</string>
     <string name="title_addAccount">Konto hinzufügen</string>
     <string name="title_importKeys">Schlüssel importieren</string>
@@ -59,14 +56,12 @@
     <string name="btn_decrypt">Entschlüsseln</string>
     <string name="btn_verify">Verifizieren</string>
     <string name="btn_selectEncryptKeys">Empfänger auswählen</string>
-
     <string name="btn_reply">Antworten</string>
     <string name="btn_encryptMessage">Nachricht verschlüsseln</string>
     <string name="btn_decryptMessage">Nachricht entschlüsseln</string>
     <string name="btn_encryptFile">Datei verschlüsseln</string>
     <string name="btn_decryptFile">Datei entschlüsseln</string>
     <string name="btn_save">Speichern</string>
-
     <string name="btn_doNotSave">Abbrechen</string>
     <string name="btn_delete">Löschen</string>
     <string name="btn_noDate">Niemals</string>
@@ -74,21 +69,18 @@
 
     <!-- menu_lowerCase: capitalized words, no punctuation -->
     <string name="menu_about">Über</string>
-
     <string name="menu_addAccount">GMail-Konto hinzufügen</string>
     <string name="menu_deleteAccount">Konto entfernen</string>
     <string name="menu_managePublicKeys">Öffentliche Schlüssel verwalten</string>
     <string name="menu_manageSecretKeys">Private Schlüssel verwalten</string>
     <string name="menu_preferences">Einstellungen</string>
     <string name="menu_changePassPhrase">Passwort ändern</string>
-
     <string name="menu_setPassPhrase">Passwort wählen</string>
     <string name="menu_importKeys">Schlüssel importieren</string>
     <string name="menu_exportKeys">Mehrere Schlüssel exportieren</string>
     <string name="menu_exportKey">Einzelnen Schlüssel exportieren</string>
     <string name="menu_deleteKey">Einzelnen Schlüssel löschen</string>
     <string name="menu_createKey">Schlüssel erzeugen</string>
-
     <string name="menu_editKey">Schlüssel bearbeiten</string>
     <string name="menu_search">Suche</string>
 
@@ -96,21 +88,18 @@
     <string name="label_sign">Signieren</string>
     <string name="label_message">Nachricht</string>
     <string name="label_file">Datei</string>
-
     <string name="label_passPhrase">Passwort</string>
     <string name="label_passPhraseAgain">Wiederholen</string>
     <string name="label_algorithm">Algorithmus</string>
     <string name="label_asciiArmour">ASCII Armor</string>
     <string name="label_selectPublicKeys">Öffentliche(r) Schlüssel</string>
-    <string name="label_deleteAfterEncryption">Nach erfolgter Verschlüsselung löschen</string>
+    <string name="label_deleteAfterEncryption">Nach Verschlüsselung löschen</string>
-
+    <string name="label_deleteAfterDecryption">Nach Entschlüsselung löschen</string>
-    <string name="label_deleteAfterDecryption">Nach erfolgter Entschlüsselung löschen</string>
     <string name="label_encryptionAlgorithm">Verschlüsselungs-Algorithmus</string>
     <string name="label_hashAlgorithm">Hash-Algorithmus</string>
     <string name="label_asymmetric">Öffentlicher Schlüssel</string>
     <string name="label_symmetric">Passwort</string>
     <string name="label_passPhraseCacheTtl">Passwort-Cache</string>
-
     <string name="label_messageCompression">Nachrichten-Kompression</string>
     <string name="label_fileCompression">Datei-Kompression</string>
 

res/values-sl/strings.xml

@@ -12,7 +12,7 @@
      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.
-     
+
      Author: 359 <359@siol.com>
 -->
 

src/org/thialfihar/android/apg/Apg.java

@@ -37,6 +37,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 import java.util.regex.Pattern;

src/org/thialfihar/android/apg/MainActivity.java

@@ -192,11 +192,10 @@ public class MainActivity extends BaseActivity {
                 message.setText("Read the warnings!\n\n" +
                                 "Changes:\n" +
                                 "* k9mail integration, k9mail beta build is available on the k9mail website\n" +
-                                "* support of other file managers (e.g. ASTRO)\n" +
+                                "* German and Italian translation (thanks, cwoehrl and Fabrizio)\n" +
-                                "* Slovenian translation (thanks, 359)\n" +
+                                "* new preferences GUI\n" +
-                                "* new database, much faster, less memory usage\n" +
+                                "* much smaller package\n" +
-                                "* defined Intents and content provider for other apps\n" +
+                                "* signature bugfix\n" +
-                                "* bugfixes\n" +
                                 "\n" +
                                 "WARNING: be careful editing your existing keys, as they " +
                                 "WILL be stripped of certificates right now.\n" +