key edit: fix crash when create date was after expiry date, change from gregorian calendar to calendar with creation from instance, experimental result status for decrypt activity

10 files changed, 88 insertions, 68 deletions

diff --git a/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml b/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml
index 3e0d35c9b..70faa6e83 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml
@@ -1,62 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/signature"
+    android:id="@+id/result"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clickable="true"
-    android:orientation="horizontal"
     android:padding="4dp"
     android:paddingLeft="10dp"
     android:paddingRight="10dp">
 
-    <RelativeLayout
+    <TextView
+        android:id="@+id/result_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/relativeLayout">
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="result text" />
+
+    <RelativeLayout
+        android:id="@+id/result_signature"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/ic_signature"
+        <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/signed_large" />
+            android:id="@+id/relativeLayout">
 
-        <ImageView
-            android:id="@+id/ic_signature_status"
+            <ImageView
+                android:id="@+id/ic_signature"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/signed_large" />
+
+            <ImageView
+                android:id="@+id/ic_signature_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/overlay_error" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/mainUserId"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/overlay_error" />
-    </RelativeLayout>
+            android:layout_gravity="left"
+            android:text="@string/label_main_user_id"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_toRightOf="@+id/relativeLayout" />
 
-    <TextView
-        android:id="@+id/mainUserId"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left"
-        android:text="@string/label_main_user_id"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_toRightOf="@+id/relativeLayout" />
+        <TextView
+            android:id="@+id/mainUserIdRest"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:text="Main User Id Rest"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:layout_below="@+id/mainUserId"
+            android:layout_toRightOf="@+id/relativeLayout" />
 
-    <TextView
-        android:id="@+id/mainUserIdRest"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left"
-        android:text="Main User Id Rest"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_below="@+id/mainUserId"
-        android:layout_toRightOf="@+id/relativeLayout" />
-
-    <com.beardedhen.androidbootstrap.BootstrapButton
-        android:id="@+id/lookup_key"
-        android:layout_width="wrap_content"
-        android:layout_height="50dp"
-        android:padding="4dp"
-        android:text="@string/btn_lookup_key"
-        bootstrapbutton:bb_icon_left="fa-download"
-        bootstrapbutton:bb_type="info"
-        bootstrapbutton:bb_size="small"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
-</RelativeLayout>
\ No newline at end of file
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/lookup_key"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:padding="4dp"
+            android:text="@string/btn_lookup_key"
+            bootstrapbutton:bb_icon_left="fa-download"
+            bootstrapbutton:bb_type="info"
+            bootstrapbutton:bb_size="small"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true" />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index a3394f23a..fc049842e 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -195,9 +195,9 @@
   <string name="file_delete_confirmation">¿Estás seguro de que quieres borrar\n%s?</string>
   <string name="file_delete_successful">Borrado satisfactoriamente.</string>
   <string name="no_file_selected">Selecciona un archivo antes.</string>
-  <string name="decryption_successful">Descifrado y/o verificado satisfactoriamente.</string>
-  <string name="encryption_successful">Firmado y/o cifrado satisfactoriamente.</string>
-  <string name="encryption_to_clipboard_successful">Firmado y/o cifrado al portapapeles satisfactoriamente.</string>
+  <string name="decrypt_successful">Descifrado y/o verificado satisfactoriamente.</string>
+  <string name="encrypt_sign_successful">Firmado y/o cifrado satisfactoriamente.</string>
+  <string name="encrypt_sign_clipboard_successful">Firmado y/o cifrado al portapapeles satisfactoriamente.</string>
   <string name="enter_passphrase_twice">Introduce la frase de contraseña dos veces.</string>
   <string name="select_encryption_key">Selecciona al menos una clave de cifrado.</string>
   <string name="select_encryption_or_signature_key">Selecciona al menos una clave de cifrado o de firma.</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 5d4c63432..d3dcb4129 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -195,9 +195,9 @@
   <string name="file_delete_confirmation">Êtes-vous sûr de vouloir supprimer\n%s ?</string>
   <string name="file_delete_successful">Supprimé avec succès.</string>
   <string name="no_file_selected">Choisir d\'abord un fichier.</string>
-  <string name="decryption_successful">Déchiffré et/ou vérifié avec succès</string>
-  <string name="encryption_successful">Signé et/ou chiffré avec succès</string>
-  <string name="encryption_to_clipboard_successful">Signé et/ou chiffré vers le presse-papiers avec succès</string>
+  <string name="decrypt_successful">Déchiffré et/ou vérifié avec succès</string>
+  <string name="encrypt_sign_successful">Signé et/ou chiffré avec succès</string>
+  <string name="encrypt_sign_clipboard_successful">Signé et/ou chiffré vers le presse-papiers avec succès</string>
   <string name="enter_passphrase_twice">Saisir la phrase de passe deux fois.</string>
   <string name="select_encryption_key">Choisir au moins une clef de chiffrement.</string>
   <string name="select_encryption_or_signature_key">Choisir au moins une clef de chiffrement ou de signature.</string>
diff --git a/OpenKeychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
index 4f2f67d33..cea9cdc31 100644
--- a/OpenKeychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
@@ -195,9 +195,9 @@
   <string name="file_delete_confirmation">Sei sicuro di voler cancellare\n%s?</string>
   <string name="file_delete_successful">Eliminato correttamente.</string>
   <string name="no_file_selected">Seleziona un file prima.</string>
-  <string name="decryption_successful">Decodifica e/o verifica eseguita con successo.</string>
-  <string name="encryption_successful">Firmato e/o codificato con successo.</string>
-  <string name="encryption_to_clipboard_successful">Firmato e/o codificato con successo negli appunti.</string>
+  <string name="decrypt_successful">Decodifica e/o verifica eseguita con successo.</string>
+  <string name="encrypt_sign_successful">Firmato e/o codificato con successo.</string>
+  <string name="encrypt_sign_clipboard_successful">Firmato e/o codificato con successo negli appunti.</string>
   <string name="enter_passphrase_twice">Inserisci la frase di accesso due volte.</string>
   <string name="select_encryption_key">Seleziona almeno una chiave di codifica.</string>
   <string name="select_encryption_or_signature_key">Seleziona almeno una chiave di codifica o di firma.</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 2cd0630a8..d5e880b1c 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -192,9 +192,9 @@
   <string name="file_delete_confirmation">%s を削除してもかまいませんか?</string>
   <string name="file_delete_successful">削除に成功しました。</string>
   <string name="no_file_selected">最初にファイルを選択してください。</string>
-  <string name="decryption_successful">復号化/検証に成功しました。</string>
-  <string name="encryption_successful">署名/暗号化に成功しました。</string>
-  <string name="encryption_to_clipboard_successful">クリップボードの中身の署名/暗号化に成功しました。</string>
+  <string name="decrypt_successful">復号化/検証に成功しました。</string>
+  <string name="encrypt_sign_successful">署名/暗号化に成功しました。</string>
+  <string name="encrypt_sign_clipboard_successful">クリップボードの中身の署名/暗号化に成功しました。</string>
   <string name="enter_passphrase_twice">もう一度パスフレーズを入れてください。</string>
   <string name="select_encryption_key">少なくとも1つの暗号化鍵を選択して下さい。</string>
   <string name="select_encryption_or_signature_key">少なくとも1つの暗号化鍵か署名鍵を選択して下さい。</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index efdd61e3c..deae99082 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -198,9 +198,9 @@
   <string name="file_delete_confirmation">Czy jesteś pewien że chcesz usunąć\n%s?</string>
   <string name="file_delete_successful">Usunięto pomyślnie.</string>
   <string name="no_file_selected">Najpierw wskaż plik.</string>
-  <string name="decryption_successful">Pomyślnie deszyfrowano i/lub zweryfikowano.</string>
-  <string name="encryption_successful">Pomyślnie podpisano i/lub zaszyfrowano.</string>
-  <string name="encryption_to_clipboard_successful">Pomyslnie podpisano i/lub zaszyfrowano do schowka.</string>
+  <string name="decrypt_successful">Pomyślnie deszyfrowano i/lub zweryfikowano.</string>
+  <string name="encrypt_sign_successful">Pomyślnie podpisano i/lub zaszyfrowano.</string>
+  <string name="encrypt_sign_clipboard_successful">Pomyslnie podpisano i/lub zaszyfrowano do schowka.</string>
   <string name="enter_passphrase_twice">Podaj hasło dwukrotnie.</string>
   <string name="select_encryption_key">Wybierz co najmniej jeden klucz szyfrujący.</string>
   <string name="select_encryption_or_signature_key">Wybierz co najmniej jeden klucz szyfrujący lub klucz podpisujący.</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 5fe4dd587..4d163fccb 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -195,9 +195,9 @@
   <string name="file_delete_confirmation">Вы уверены, что хотите удалить\n%s ?</string>
   <string name="file_delete_successful">Удалено.</string>
   <string name="no_file_selected">Сначала выберите файл.</string>
-  <string name="decryption_successful">Расшифровано и/или проверено.</string>
-  <string name="encryption_successful">Подписано и/или зашифровано.</string>
-  <string name="encryption_to_clipboard_successful">Подписано и/или зашифровано в буфер обмена.</string>
+  <string name="decrypt_successful">Расшифровано и/или проверено.</string>
+  <string name="encrypt_sign_successful">Подписано и/или зашифровано.</string>
+  <string name="encrypt_sign_clipboard_successful">Подписано и/или зашифровано в буфер обмена.</string>
   <string name="enter_passphrase_twice">Дважды введите пароль.</string>
   <string name="select_encryption_key">Укажите хотя бы один ключ.</string>
   <string name="select_encryption_or_signature_key">Выберите хотя бы один ключ для шифрования или подписи.</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 01551fcd9..b4241799b 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -199,9 +199,9 @@
   <string name="file_delete_confirmation">Ви справді хочете вилучити\n%s?</string>
   <string name="file_delete_successful">Успішно вилучено.</string>
   <string name="no_file_selected">Виберіть спершу файл.</string>
-  <string name="decryption_successful">Успішно розшифровано та/або перевірено.</string>
-  <string name="encryption_successful">Успішно підписано та/або перевірено.</string>
-  <string name="encryption_to_clipboard_successful">Успішно підписано та/або зашифровано до буфера обміну.</string>
+  <string name="decrypt_successful">Успішно розшифровано та/або перевірено.</string>
+  <string name="encrypt_sign_successful">Успішно підписано та/або перевірено.</string>
+  <string name="encrypt_sign_clipboard_successful">Успішно підписано та/або зашифровано до буфера обміну.</string>
   <string name="enter_passphrase_twice">Введіть двічі парольну фразу.</string>
   <string name="select_encryption_key">Виберіть принаймні один ключ шифрування.</string>
   <string name="select_encryption_or_signature_key">Виберіть принаймні один ключ шифрування або ключ підпису.</string>
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index d1dc6c1f4..f03d316db 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -4,4 +4,8 @@
     <color name="emphasis">#31b6e7</color>
     <color name="bg_gray">#cecbce</color>
 
+    <color name="result_red">#CC0000</color>
+    <color name="result_orange">#FF8800</color>
+    <color name="result_green">#669900</color>
+    <color name="result_blue">#336699</color>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 71340f6ec..3a73735cd 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -209,9 +209,10 @@
     <string name="file_delete_confirmation">Are you sure you want to delete\n%s?</string>
     <string name="file_delete_successful">Successfully deleted.</string>
     <string name="no_file_selected">Select a file first.</string>
-    <string name="decryption_successful">Successfully decrypted and/or verified.</string>
-    <string name="encryption_successful">Successfully signed and/or encrypted.</string>
-    <string name="encryption_to_clipboard_successful">Successfully signed and/or encrypted to clipboard.</string>
+    <string name="decrypt_successful">Successfully decrypted.</string>
+    <string name="decrypt_verified_successful">Successfully decrypted and/or verified.</string>
+    <string name="encrypt_sign_successful">Successfully signed and/or encrypted.</string>
+    <string name="encrypt_sign_clipboard_successful">Successfully signed and/or encrypted to clipboard.</string>
     <string name="enter_passphrase_twice">Enter the passphrase twice.</string>
     <string name="select_encryption_key">Select at least one encryption key.</string>
     <string name="select_encryption_or_signature_key">Select at least one encryption key or a signature key.</string>