aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java11
-rw-r--r--OpenKeychain/src/main/res/layout/multi_certify_item.xml53
-rw-r--r--OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml34
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml6
4 files changed, 32 insertions, 72 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
index 7a4d77145..50cdb0e04 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
@@ -69,8 +69,7 @@ public class MultiUserIdsAdapter extends CursorAdapter {
@Override
public void bindView(View view, Context context, Cursor cursor) {
- View vHeader = view.findViewById(R.id.user_id_header);
- TextView vHeaderId = (TextView) view.findViewById(R.id.user_id_header_id);
+ TextView vHeaderId = (TextView) view.findViewById(R.id.user_id_header);
TextView vName = (TextView) view.findViewById(R.id.user_id_item_name);
TextView vAddresses = (TextView) view.findViewById(R.id.user_id_item_addresses);
@@ -84,10 +83,12 @@ public class MultiUserIdsAdapter extends CursorAdapter {
if (isHeader == 1) {
long masterKeyId = cursor.getLong(0);
- vHeader.setVisibility(View.VISIBLE);
- vHeaderId.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(mContext, masterKeyId));
+ vHeaderId.setVisibility(View.VISIBLE);
+ String message = mContext.getString(R.string.section_uids_to_certify) +
+ KeyFormattingUtils.beautifyKeyIdWithPrefix(mContext, masterKeyId);
+ vHeaderId.setText(message);
} else {
- vHeader.setVisibility(View.GONE);
+ vHeaderId.setVisibility(View.GONE);
}
{ // first one
diff --git a/OpenKeychain/src/main/res/layout/multi_certify_item.xml b/OpenKeychain/src/main/res/layout/multi_certify_item.xml
index c578473d3..71838c2fc 100644
--- a/OpenKeychain/src/main/res/layout/multi_certify_item.xml
+++ b/OpenKeychain/src/main/res/layout/multi_certify_item.xml
@@ -6,50 +6,29 @@
android:orientation="vertical"
android:singleLine="true">
- <LinearLayout android:id="@+id/user_id_header"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:clickable="true"
- android:layout_marginLeft="8dip"
- android:layout_marginTop="16dip">
-
- <LinearLayout android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/user_id_header_id"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="ID: 0123 4567 890a bcde"
- android:textAppearance="?android:attr/textAppearanceMedium"
- />
-
- </LinearLayout>
-
- <View
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"
- android:paddingLeft="24dip"
- android:paddingRight="24dip"
- android:layout_marginBottom="4dip"/>
-
- </LinearLayout>
+ <TextView android:id="@+id/user_id_header"
+ style="@style/SectionHeader"
+ android:text="Identities for Key ID: 0123 4567 890a bcde"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:clickable="true"
+ android:layout_marginLeft="8dip"
+ android:layout_marginTop="8dip"/>
<LinearLayout android:id="@+id/user_id_body"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:singleLine="true"
- android:layout_marginLeft="8dip"
- android:layout_marginTop="4dip">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:singleLine="true"
+ android:layout_marginLeft="8dip"
+ android:layout_marginTop="4dip">
<CheckBox
android:id="@+id/user_id_item_check_box"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:gravity="top|center"
android:clickable="false"
android:focusable="false" />
diff --git a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
index d2335cbe9..851464dd3 100644
--- a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
@@ -10,37 +10,17 @@
android:paddingRight="16dp"
android:orientation="vertical">
- <LinearLayout
+ <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
- android:orientation="horizontal">
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/imageView"
- android:src="@drawable/ic_action_person"
- android:layout_gravity="center_vertical" />
-
- <TextView
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/certify_text"
- android:id="@+id/textView"
- android:layout_weight="1" />
-
- </LinearLayout>
-
- <TextView
- style="@style/SectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/section_uids_to_certify" />
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/certify_text"
+ android:id="@+id/textView"
+ android:layout_weight="1" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/view_key_user_ids"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d32787c9b..638205b28 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -137,7 +137,7 @@
<string name="label_name">"Name"</string>
<string name="label_comment">"Comment"</string>
<string name="label_email">"Email"</string>
- <string name="label_send_key">"Synchronize with public keyservers"</string>
+ <string name="label_send_key">"Share your certification with the cloud"</string>
<string name="label_fingerprint">"Fingerprint"</string>
<string name="expiry_date_dialog_title">"Set expiry date"</string>
<string name="label_first_keyserver_is_used">"(First keyserver listed is preferred)"</string>
@@ -1013,8 +1013,8 @@
<string name="unknown_uid">"&lt;unknown&gt;"</string>
<string name="empty_certs">"No certificates for this key"</string>
<string name="certs_text">"Only validated self-certificates and validated certificates created with your keys are displayed here."</string>
- <string name="section_uids_to_certify">"Identities"</string>
- <string name="certify_text">"Do the selected identities match the persons you are exchanging keys with? Deselect all unknown ones."</string>
+ <string name="section_uids_to_certify">"Identities for "</string>
+ <string name="certify_text">"The keys you’re importing contain “identities”: names and emails. If these match what you expected, you can say so by “certifying” them. If they don’t match, you probably shouldn’t use these keys."</string>
<string name="label_revocation">"Revocation Reason"</string>
<string name="label_verify_status">"Verification Status"</string>
<string name="label_cert_type">"Type"</string>