Merge pull request #2915 from cketti/fix_add_email_dialog

Fix crash when adding additional email address while creating a key

.tx/config

@@ -1,34 +1,46 @@
 [main]
-host = https://www.transifex.com
-lang_map = he: iw, zh_TW: zh-rTW, es_MX: es-rMX, pt_BR: pt-rBR, nl_BE: nl-rBE
+host     = https://www.transifex.com
+lang_map = nl_BE: nl-rBE, he: iw, zh_TW: zh-rTW, es_MX: es-rMX, pt_BR: pt-rBR, pt_PT: pt-rPT
 
-[open-keychain.strings]
-file_filter = OpenKeychain/src/main/res/values-<lang>/strings.xml
-source_file = OpenKeychain/src/main/res/values/strings.xml
-source_lang = en
+[o:otf:p:open-keychain:r:advanced]
+file_filter            = OpenKeychain/src/main/res/raw-<lang>/advanced.md
+source_file            = OpenKeychain/src/main/res/raw/advanced.md
+source_lang            = en
+replace_edited_strings = false
+keep_translations      = false
 
-[open-keychain.advanced]
-file_filter = OpenKeychain/src/main/res/raw-<lang>/advanced.md
-source_file = OpenKeychain/src/main/res/raw/advanced.md
-source_lang = en
+[o:otf:p:open-keychain:r:help-about]
+file_filter            = OpenKeychain/src/main/res/raw-<lang>/help_about.md
+source_file            = OpenKeychain/src/main/res/raw/help_about.md
+source_lang            = en
+replace_edited_strings = false
+keep_translations      = false
 
-[open-keychain.help-about]
-file_filter = OpenKeychain/src/main/res/raw-<lang>/help_about.md
-source_file = OpenKeychain/src/main/res/raw/help_about.md
-source_lang = en
+[o:otf:p:open-keychain:r:help-certification]
+file_filter            = OpenKeychain/src/main/res/raw-<lang>/help_certification.md
+source_file            = OpenKeychain/src/main/res/raw/help_certification.md
+source_lang            = en
+replace_edited_strings = false
+keep_translations      = false
 
-[open-keychain.help-changelog]
-file_filter = OpenKeychain/src/main/res/raw-<lang>/help_changelog.md
-source_file = OpenKeychain/src/main/res/raw/help_changelog.md
-source_lang = en
+[o:otf:p:open-keychain:r:help-changelog]
+file_filter            = OpenKeychain/src/main/res/raw-<lang>/help_changelog.md
+source_file            = OpenKeychain/src/main/res/raw/help_changelog.md
+source_lang            = en
+replace_edited_strings = false
+keep_translations      = false
 
-[open-keychain.help-certification]
-file_filter = OpenKeychain/src/main/res/raw-<lang>/help_certification.md
-source_file = OpenKeychain/src/main/res/raw/help_certification.md
-source_lang = en
+[o:otf:p:open-keychain:r:help-start]
+file_filter            = OpenKeychain/src/main/res/raw-<lang>/help_start.md
+source_file            = OpenKeychain/src/main/res/raw/help_start.md
+source_lang            = en
+replace_edited_strings = false
+keep_translations      = false
 
-[open-keychain.help-start]
-file_filter = OpenKeychain/src/main/res/raw-<lang>/help_start.md
-source_file = OpenKeychain/src/main/res/raw/help_start.md
-source_lang = en
+[o:otf:p:open-keychain:r:strings]
+file_filter            = OpenKeychain/src/main/res/values-<lang>/strings.xml
+source_file            = OpenKeychain/src/main/res/values/strings.xml
+source_lang            = en
+replace_edited_strings = false
+keep_translations      = false
 

OpenKeychain/build.gradle

@@ -95,8 +95,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 34
-        versionCode 60300
-        versionName "6.0.3"
+        versionCode 60400
+        versionName "6.0.4"
         applicationId "org.sufficientlysecure.keychain"
         // the androidjunitrunner is broken regarding coverage, see here:
         // https://code.google.com/p/android/issues/detail?id=170607

OpenKeychain/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/NotificationChannelManager.java

@@ -11,7 +11,6 @@ import androidx.annotation.StringRes;
 
 
 public class NotificationChannelManager {
-    public static final String KEYSERVER_SYNC = "keyserverSync";
     public static final String PERMISSION_REQUESTS = "permissionRequests";
     public static final String PASSPHRASE_CACHE = "passphraseCache";
     public static final String ORBOT = "orbot";
@@ -37,7 +36,6 @@ public class NotificationChannelManager {
             return;
         }
 
-        createNotificationChannel(KEYSERVER_SYNC, R.string.notify_channel_keysync, NotificationManager.IMPORTANCE_MIN);
         createNotificationChannel(PERMISSION_REQUESTS, R.string.notify_channel_permission, NotificationManager.IMPORTANCE_MIN);
         createNotificationChannel(PASSPHRASE_CACHE, R.string.notify_channel_passcache, NotificationManager.IMPORTANCE_NONE);
         createNotificationChannel(ORBOT, R.string.notify_channel_orbot, NotificationManager.IMPORTANCE_DEFAULT);

OpenKeychain/src/main/res/anim/fade_in_down.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="-10" android:toYDelta="0"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="200"
-        />
-    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
-        android:interpolator="@android:anim/accelerate_interpolator"
-        android:duration="200"
-        />
-</set>

OpenKeychain/src/main/res/anim/fade_in_up.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="10" android:toYDelta="0"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="200"
-        />
-    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
-        android:interpolator="@android:anim/accelerate_interpolator"
-        android:duration="200"
-        />
-</set>

OpenKeychain/src/main/res/anim/fade_out_delayed.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
-        android:interpolator="@android:anim/accelerate_interpolator"
-        android:duration="300"
-        android:startOffset="400"
-        />
-</set>

OpenKeychain/src/main/res/anim/fade_out_down.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="0.0" android:toYDelta="10"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="200"
-        />
-    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="150"
-        />
-</set>

OpenKeychain/src/main/res/anim/fade_out_up.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="0.0" android:toYDelta="-10"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="200"
-        />
-    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="150"
-        />
-</set>

OpenKeychain/src/main/res/anim/qr_code_zoom_enter.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator">
-    <scale
-        android:fromXScale="0.5"
-        android:toXScale="1.0"
-        android:fromYScale="0.5"
-        android:toYScale="1.0"
-        android:pivotX="50%p"
-        android:pivotY="50%p"
-        android:duration="@android:integer/config_mediumAnimTime" />
-    <alpha
-        android:fromAlpha="0"
-        android:toAlpha="1.0"
-        android:duration="@android:integer/config_mediumAnimTime" />
-</set>

OpenKeychain/src/main/res/anim/qr_code_zoom_exit.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:zAdjustment="top">
-    <scale
-        android:fromXScale="1.0"
-        android:toXScale="0.5"
-        android:fromYScale="1.0"
-        android:toYScale="0.5"
-        android:pivotX="50%p"
-        android:pivotY="50%p"
-        android:duration="@android:integer/config_mediumAnimTime" />
-    <alpha
-        android:fromAlpha="1.0"
-        android:toAlpha="0"
-        android:duration="@android:integer/config_mediumAnimTime" />
-</set>