From 1892baba629956c78ceb10cb95d1b4cb9cfe1845 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Mon, 26 Mar 2018 22:02:53 +0200
Subject: [PATCH] Change upload checkbox name and default in certify dialog,
 too

---
 .../sufficientlysecure/keychain/ui/CertifyKeyFragment.java   | 5 -----
 OpenKeychain/src/main/res/layout/certify_key_fragment.xml    | 1 -
 OpenKeychain/src/main/res/values/strings.xml                 | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
index 18acc8000..38577923a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
@@ -118,11 +118,6 @@ public class CertifyKeyFragment
             }
         });
 
-        // If this is a debug build, don't upload by default
-        if (Constants.DEBUG) {
-            mUploadKeyCheckbox.setChecked(false);
-        }
-
         return view;
     }
 
diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
index 8f0671330..d8527e408 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
@@ -62,7 +62,6 @@
             android:id="@+id/sign_key_upload_checkbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:checked="true"
             android:text="@string/label_send_key"
             android:paddingTop="12dp"
             android:paddingBottom="12dp"/>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 773cddcaf..7bfe86ba9 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -178,7 +178,7 @@
     <string name="label_main_user_id">"Primary identity"</string>
     <string name="label_name">"Name"</string>
     <string name="label_email">"Email"</string>
-    <string name="label_send_key">"Synchronize with the Internet"</string>
+    <string name="label_send_key">"Publish certification on keyservers"</string>
     <string name="label_fingerprint">"Fingerprint"</string>
     <string name="expiry_date_dialog_title">"Set expiry date"</string>
     <string name="label_keyservers_title">"Keyservers"</string>