From f96fdd582f55631ba3efbf735da9fd74d472a5aa Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Mon, 26 Mar 2018 21:39:04 +0200
Subject: [PATCH] Change wording on keyserver upload and disable by default for
 new keys

---
 .../keychain/ui/CreateKeyFinalFragment.java                  | 5 +----
 .../src/main/res/layout/create_key_final_fragment.xml        | 1 -
 OpenKeychain/src/main/res/values/strings.xml                 | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
index f078eb068..f8431bf3f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
@@ -149,10 +149,7 @@ public class CreateKeyFinalFragment extends Fragment {
             }
         });
 
-        // If this is a debug build, don't upload by default
-        if (Constants.DEBUG) {
-            mUploadCheckbox.setChecked(false);
-        }
+        mUploadCheckbox.setChecked(false);
 
         return view;
     }
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index dbd53db08..0cb2f92c1 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -72,7 +72,6 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:checked="true"
                 android:text="@string/create_key_upload"
                 android:id="@+id/create_key_upload" />
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index cf665768d..773cddcaf 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -707,7 +707,7 @@
     <string name="key_view_action_share_with">"Share with…"</string>
     <string name="key_view_action_share_ssh_with">"Share as SSH public key with…"</string>
     <string name="key_view_action_share_nfc">"Share over NFC"</string>
-    <string name="key_view_action_upload">"Upload to keyserver"</string>
+    <string name="key_view_action_upload">"Publish on keyserver"</string>
     <string name="key_view_tab_main">"Main Info"</string>
     <string name="key_view_tab_start">"Start"</string>
     <string name="key_view_tab_share">"Share"</string>
@@ -787,7 +787,7 @@
     <string name="edit_key_error_bad_security_token_stripped">"Cannot move key to Security Token (either stripped or already on Security Token)!"</string>
 
     <!-- Create key -->
-    <string name="create_key_upload">"Synchronize with the Internet"</string>
+    <string name="create_key_upload">"Publish on keyservers"</string>
     <string name="create_key_empty">"This field is required"</string>
     <string name="create_key_passphrases_not_equal">"Passwords do not match"</string>
     <string name="create_key_final_text">"You entered the following identity:"</string>