cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs

Browse Source
This commit is contained in:
Tim Bray
2014-09-12 08:34:51 -07:00
parent 36ef8a9a62
commit 1c32d1df88
26 changed files with 500 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
OpenKeychain/src/main/res/drawable/button_rounded_blue.xml Normal file
View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape android:shape="rectangle" >
<padding
android:bottom="2dip"
android:left="2dip"
android:right="2dip"
android:top="2dip" />
<corners android:radius="6dip" />
<solid android:color="#4747a4" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle" >
<padding
android:bottom="2dip"
android:left="2dip"
android:right="2dip"
android:top="2dip" />
<corners android:radius="6dip" />
<solid android:color="#4747a4"/>
</shape>
</item>
<item >
<shape android:shape="rectangle" >
<padding
android:bottom="2dip"
android:left="2dip"
android:right="2dip"
android:top="2dip" />
<corners android:radius="6dip" />
<solid android:color="#5c5cb8" />
</shape>
</item>
</selector>

27
OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml → OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
View File

@@ -11,12 +11,12 @@
android:orientation="horizontal">
<AutoCompleteTextView
android:id="@+id/import_server_query"
android:id="@+id/cloud_import_server_query"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="top|left"
android:hint="@string/hint_keyserver_search_hint"
android:hint="@string/hint_cloud_search_hint"
android:imeOptions="actionSearch"
android:inputType="textNoSuggestions"
android:singleLine="true"
@@ -26,7 +26,7 @@
android:layout_gravity="center_vertical" />
<ImageButton
android:id="@+id/import_server_search"
android:id="@+id/cloud_import_server_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
@@ -43,7 +43,7 @@
android:background="?android:attr/listDivider" />
<ImageButton
android:id="@+id/import_server_config_button"
android:id="@+id/cloud_import_server_config_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
@@ -53,24 +53,5 @@
</LinearLayout>
<LinearLayout
android:id="@+id/import_server_config"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<Spinner
android:id="@+id/import_server_spinner"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>

32
OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
View File

@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<EditText
android:id="@+id/import_keybase_query"
android:layout_marginLeft="8dp"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="top|left"
android:hint="@string/hint_keybase_search_hint"
android:imeOptions="actionSearch"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:lines="1"
android:maxLines="1"
android:minLines="1"
android:layout_gravity="center_vertical" />
<ImageButton
android:id="@+id/import_keybase_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_search"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
</LinearLayout>

2
OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
View File

@@ -30,6 +30,8 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="8dp"
android:paddingTop="2dp"
android:gravity="top|center"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false" />

25
OpenKeychain/src/main/res/layout/key_server_preference.xml
View File

@@ -12,7 +12,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal" >
<RelativeLayout
<LinearLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginBottom="6sp"
@@ -21,6 +21,7 @@
android:layout_marginTop="6sp"
android:layout_weight="1"
android:background="@android:drawable/menuitem_background"
android:orientation="vertical"
android:focusable="true" >
<TextView
@@ -35,20 +36,28 @@
android:id="@+id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@android:id/title"
android:layout_below="@android:id/title"
android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
<Button
android:id="@+id/shuffle"
android:layout_width="wrap_content"
android:layout_height="31dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dip"
android:layout_marginRight="6dip"
android:text="shuffle"
android:textColor="#ffffffff"
android:textStyle="bold"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:background="@drawable/button_rounded_blue"
/>
<ImageButton
android:id="@+id/add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="10dp"
android:layout_marginLeft="4dip"
android:layout_marginRight="6dip"
android:src="@drawable/plus"
android:background="@drawable/button_rounded_green"/>
</LinearLayout>

8
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -16,6 +16,7 @@
<string name="title_add_subkey">"Add subkey"</string>
<string name="title_edit_key">"Edit Key"</string>
<string name="title_preferences">"Preferences"</string>
<string name="title_cloud_search_preferences">"Cloud Search Preferences"</string>
<string name="title_api_registered_apps">"Apps"</string>
<string name="title_key_server_preference">"Keyserver Preference"</string>
<string name="title_change_passphrase">"Change Passphrase"</string>
@@ -39,6 +40,7 @@
<!-- section -->
<string name="section_user_ids">"Identities"</string>
<string name="section_keys">"Subkeys"</string>
<string name="section_cloud_search">"Cloud search"</string>
<string name="section_general">"General"</string>
<string name="section_defaults">"Defaults"</string>
<string name="section_advanced">"Advanced"</string>
@@ -125,6 +127,8 @@
<string name="label_send_key">"Upload key to selected keyserver after certification"</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>
<string name="label_preferred">"preferred"</string>
<string name="user_id_no_name">"&lt;no name&gt;"</string>
<string name="none">"&lt;none&gt;"</string>
@@ -323,7 +327,7 @@
<!-- action strings -->
<string name="hint_keyserver_search_hint">"Name/Email/Key ID…"</string>
<string name="hint_keybase_search_hint">"Name/Email/Proof/Key…"</string>
<string name="hint_cloud_search_hint">"Name/Email/Proof/Key…"</string>
<!-- key bit length selections -->
<string name="key_size_512">"512"</string>
@@ -364,9 +368,9 @@
<!-- Import -->
<string name="import_tab_keyserver">"Keyserver"</string>
<string name="import_tab_cloud">"Search Cloud"</string>
<string name="import_tab_direct">"File/Clipboard"</string>
<string name="import_tab_qr_code">"QR Code/NFC"</string>
<string name="import_tab_keybase">"Keybase.io"</string>
<string name="import_import">"Import selected keys"</string>
<string name="import_qr_code_wrong">"QR Code malformed! Please try again!"</string>
<string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short (&lt; 16 characters)"</string>

13
OpenKeychain/src/main/res/xml/adv_preferences.xml
View File

@@ -1,5 +1,11 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/section_defaults">
<org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
android:entries="@array/passphrase_cache_ttl_entries"
android:entryValues="@array/passphrase_cache_ttl_values"
android:key="passphraseCacheTtl"
android:persistent="false"
android:title="@string/label_passphrase_cache_ttl" />
<org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
android:key="defaultEncryptionAlgorithm"
android:persistent="false"
@@ -28,11 +34,4 @@
android:title="@string/label_write_version_header"
android:summary="@string/label_write_version_header_summary" />
</PreferenceCategory>
<CheckBoxPreference
android:key="useDefaultYubikeyPin"
android:persistent="false"
android:defaultValue="true"
android:title="@string/label_use_default_yubikey_pin"
android:summary="@string/label_label_use_default_yubikey_pin_summary" />
</PreferenceScreen>

20
OpenKeychain/src/main/res/xml/cloud_search_prefs.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<CheckBoxPreference
android:title="Search Keyserver"
android:defaultValue="true"
android:summary="Search HKP keyserver"
android:key="search_keyserver_pref" />
<CheckBoxPreference
android:title="Search Keybase.io"
android:defaultValue="true"
android:summary="Search Keybase.io index"
android:key="search_keybase_pref" />
<PreferenceScreen
android:key="keyServers"
android:persistent="false"
android:title="@string/label_keyservers" />
</PreferenceScreen>

15
OpenKeychain/src/main/res/xml/gen_preferences.xml
View File

@@ -1,15 +0,0 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/section_general">
<org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
android:entries="@array/passphrase_cache_ttl_entries"
android:entryValues="@array/passphrase_cache_ttl_values"
android:key="passphraseCacheTtl"
android:persistent="false"
android:title="@string/label_passphrase_cache_ttl" />
<PreferenceScreen
android:key="keyServers"
android:persistent="false"
android:title="@string/label_keyservers" />
</PreferenceCategory>
</PreferenceScreen>

4
OpenKeychain/src/main/res/xml/preference_headers.xml
View File

@@ -1,7 +1,7 @@
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
<header
android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$GeneralPrefsFragment"
android:title="@string/section_general" />
android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$CloudSearchPrefsFragment"
android:title="@string/section_cloud_search" />
<header
android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$AdvancedPrefsFragment"
android:title="@string/section_advanced" />