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

Merge pull request #2351 from open-keychain/sql-delight

Browse Source 
Use SqlDelight in favor of ContentProviders
This commit is contained in:
Vincent Breitmoser
2018-07-04 22:58:56 +02:00
committed by GitHub
parent b1818e5cc6 1fad244c7a
commit 63b37deafa
333 changed files with 11216 additions and 17018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/res/drawable-v21/list_item_ripple.xml
View File

@@ -7,6 +7,7 @@
<item>
<selector>
<item android:state_selected="true" android:drawable="@color/pressed_gray"/>
<item android:state_activated="true" android:drawable="@color/selected_gray"/>
</selector>
</item>
</ripple>

3
OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml
View File

@@ -101,7 +101,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/duplicate_key_list"
tools:listitem="@layout/duplicate_key_item"
tools:listitem="@layout/key_choice_item"
tools:layout_height="100dp"
/>
@@ -132,7 +132,6 @@
android:layout_height="wrap_content"
android:text="Select"
android:id="@+id/button_select"
android:enabled="false"
style="?buttonBarButtonStyle" />
</LinearLayout>

3
OpenKeychain/src/main/res/layout/api_remote_select_authentication_key.xml
View File

@@ -85,7 +85,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/authentication_key_list"
tools:listitem="@layout/authentication_key_item"
tools:listitem="@layout/key_choice_item"
tools:layout_height="100dp"
/>
@@ -116,7 +116,6 @@
android:layout_height="wrap_content"
android:text="Select"
android:id="@+id/button_select"
android:enabled="false"
style="?buttonBarButtonStyle" />
</LinearLayout>

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

@@ -49,7 +49,7 @@
android:paddingRight="8dp"
android:gravity="center_vertical" />
<org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
<org.sufficientlysecure.keychain.ui.widget.KeySpinner
android:id="@+id/certify_key_spinner"
android:minHeight="56dip"
android:layout_width="match_parent"

44
OpenKeychain/src/main/res/layout/duplicate_key_item.xml
View File

@@ -1,44 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
android:id="@+id/key_list_item_icon"
tools:tint="@color/md_grey_600"
tools:src="@drawable/apps_k9"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/key_list_item_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="@string/label_main_user_id"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/key_list_item_creation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:visibility="visible"
tools:text="Created on 10/10/2010 10:00" />
</LinearLayout>
</LinearLayout>

20
OpenKeychain/src/main/res/layout/edit_key_fragment.xml
View File

@@ -40,16 +40,6 @@
android:text="@string/section_user_ids"
android:layout_weight="1" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/edit_key_user_ids"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/edit_key_user_ids_added"
android:layout_width="match_parent"
@@ -82,16 +72,6 @@
android:layout_marginTop="8dp"
android:text="@string/section_keys" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/edit_key_keys"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/edit_key_subkeys_added"
android:layout_width="match_parent"

48
OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
View File

@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingRight="16dp"
android:paddingLeft="16dp">
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
android:layout_margin="0dp">
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:background="?android:attr/editTextBackground">
<ViewAnimator
android:layout_width="wrap_content"
@@ -21,9 +22,9 @@
android:layout_gravity="center_vertical"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:paddingBottom="12dp"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out">
android:outAnimation="@anim/fade_out"
>
<ImageView
android:layout_width="wrap_content"
@@ -37,23 +38,31 @@
</ViewAnimator>
<org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
<org.sufficientlysecure.keychain.ui.chips.EncryptRecipientChipsInput
android:id="@+id/recipient_list"
android:layout_width="match_parent"
android:hint="@string/label_to"
android:minHeight="56dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
app:hint="@string/label_to"
app:maxRows="2"
/>
</LinearLayout>
<FrameLayout
android:id="@+id/anchor_dropdown_encrypt"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:padding="0dp"
android:layout_margin="0dp">
android:background="?android:attr/editTextBackground">
<ViewAnimator
android:layout_width="wrap_content"
@@ -81,22 +90,21 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
android:layout_margin="0dp"
style="@android:style/Widget.EditText">
android:layout_height="wrap_content">
<TextView
android:paddingLeft="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/md_black_1000"
android:text="@string/label_asymmetric_from"
android:paddingRight="8dp"/>
android:paddingLeft="8dp"
android:paddingRight="8dp"
/>
<org.sufficientlysecure.keychain.ui.widget.SignKeySpinner
android:id="@+id/sign"
<org.sufficientlysecure.keychain.ui.widget.KeySpinner
android:id="@+id/sign_key_spinner"
android:minHeight="56dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"

38
OpenKeychain/src/main/res/layout/authentication_key_item.xml → OpenKeychain/src/main/res/layout/key_choice_item.xml
View File

@@ -6,32 +6,46 @@
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="horizontal"
android:background="?selectableItemBackground"
android:minHeight="?listPreferredItemHeight">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
android:id="@+id/key_list_item_icon"
tools:tint="@color/md_grey_600"
tools:src="@drawable/apps_k9"
<RadioButton
android:id="@+id/radio_keychoice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:clickable="false"
/>
<CheckBox
android:id="@+id/checkbox_keychoice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:clickable="false"
tools:visibility="gone"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
>
<TextView
android:id="@+id/key_list_item_name"
android:id="@+id/text_keychoice_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="@string/label_main_user_id"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/key_list_item_creation"
android:id="@+id/text_keychoice_creation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"

3
OpenKeychain/src/main/res/layout/key_list_dummy.xml
View File

@@ -5,7 +5,8 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:orientation="horizontal"
android:focusable="true"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:background="?android:selectableItemBackground">
<LinearLayout

30
OpenKeychain/src/main/res/layout/key_list_fragment.xml
View File

@@ -34,7 +34,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -43,18 +43,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="72dp"
android:paddingLeft="16dp"
android:paddingRight="32dp"
android:paddingStart="16dp" />
<com.futuremind.recyclerviewfastscroll.FastScroller
android:id="@+id/fastscroll"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:orientation="vertical"
app:fastscroll__bubbleColor="@color/primary" />
android:paddingBottom="72dp" />
</RelativeLayout>
@@ -149,6 +138,21 @@
</com.getbase.floatingactionbutton.FloatingActionsMenu>
</RelativeLayout>
<eu.davidea.fastscroller.FastScroller
android:id="@+id/fast_scroller"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
app:fastScrollerAutoHideEnabled="true"
app:fastScrollerAutoHideDelayInMillis="1000"
app:fastScrollerBubblePosition="adjacent"
app:fastScrollerBubbleEnabled="true"
app:fastScrollerHandleAlwaysVisible="false"
app:fastScrollerIgnoreTouchesOutsideHandle="false"
tools:visibility="visible" />
</FrameLayout>

8
OpenKeychain/src/main/res/layout/key_list_header_public.xml
View File

@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:super="http://schemas.android.com/apk/lib-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
super:slm_headerDisplay="sticky|inline"
super:slm_section_sectionManager="linear"
tools:ignore="ResAuto">
android:paddingRight="12dp"
android:paddingLeft="12dp">
<TextView style="@style/SectionHeader"
android:id="@android:id/text1"

34
OpenKeychain/src/main/res/layout/key_list_item.xml
View File

@@ -8,9 +8,9 @@
android:gravity="center_vertical"
android:maxLines="1"
android:orientation="horizontal"
android:descendantFocusability="blocksDescendants"
android:background="@drawable/list_item_ripple"
android:focusable="false"
android:paddingLeft="12dp"
android:paddingRight="12dp"
tools:layout_marginTop="30dp">
<ImageView
@@ -18,6 +18,7 @@
android:layout_height="24dp"
android:layout_margin="4dp"
android:id="@+id/key_list_item_tid_icon"
android:visibility="gone"
tools:src="@drawable/apps_k9" />
<LinearLayout
@@ -26,7 +27,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:focusable="true"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="4dp"
@@ -61,34 +61,6 @@
</LinearLayout>
<LinearLayout
android:id="@+id/key_list_item_slinger_view"
android:layout_width="wrap_content"
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_gravity="center_vertical"
android:orientation="horizontal"
tools:visibility="gone">
<View
android:layout_width="1dip"
android:layout_height="match_parent"
android:gravity="right"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:background="?android:attr/listDivider" />
<ImageButton
android:id="@+id/key_list_item_slinger_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:src="@drawable/ic_repeat_grey_24dp"
android:padding="16dp"
android:background="?android:selectableItemBackground"
android:contentDescription="@string/cd_exchange_keys"/>
</LinearLayout>
<ImageView
android:id="@+id/key_list_item_status_icon"
android:layout_width="wrap_content"

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

@@ -6,7 +6,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:orientation="horizontal"
android:minHeight="44dip"
android:minHeight="?listPreferredItemHeight"
android:paddingLeft="8dp"
android:paddingRight="4dp">

4
OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
View File

@@ -132,11 +132,11 @@
android:layout_marginEnd="4dp"
android:text="@string/add_keys_my_key" />
<org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
<org.sufficientlysecure.keychain.ui.widget.KeySpinner
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/cert_key_spinner">
</org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner>
</org.sufficientlysecure.keychain.ui.widget.KeySpinner>
</LinearLayout>

5
OpenKeychain/src/main/res/layout/select_dummy_key_item.xml
View File

@@ -2,6 +2,8 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/api_select_sign_key_create_key"
android:background="?android:selectableItemBackground"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -11,4 +13,5 @@
android:drawableLeft="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true" />
android:minHeight="?listPreferredItemHeight"
/>

226
OpenKeychain/src/main/res/layout/view_cert_activity.xml
View File

@@ -1,226 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<ScrollView
android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:focusableInTouchMode="true"
android:descendantFocusability="beforeDescendants"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="14dp"
android:text="@string/section_cert" />
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_weight="1"
android:stretchColumns="1">
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:paddingRight="10dip"
android:text="@string/label_key_id" />
<TextView
android:id="@+id/signee_key"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingRight="5dip"
android:typeface="monospace" />
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:paddingRight="10dip"
android:text="@string/label_user_id" />
<TextView
android:id="@+id/signee_uid"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingRight="5dip" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:paddingRight="10dip"
android:text="@string/label_algorithm" />
<TextView
android:id="@+id/algorithm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingRight="5dip" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:paddingRight="10dip"
android:text="@string/label_cert_type" />
<TextView
android:id="@+id/signature_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingRight="5dip" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/row_reason">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:paddingRight="10dip"
android:text="@string/label_revocation" />
<TextView
android:id="@+id/reason"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingRight="5dip" />
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:paddingRight="10dip"
android:text="@string/label_creation" />
<TextView
android:id="@+id/creation"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingRight="5dip" />
</TableRow>
</TableLayout>
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="14dp"
android:text="@string/section_certifier_id" />
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginBottom="4dp"
android:layout_weight="1"
android:stretchColumns="1">
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:text="@string/label_key_id" />
<TextView
android:id="@+id/signer_key_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dip"
android:typeface="monospace" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/label_algorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:paddingRight="10dip"
android:text="@string/label_user_id" />
<TextView
android:id="@+id/signer_uid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dip" />
</TableRow>
</TableLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<TextView
android:id="@+id/view_cert_view_cert_key"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:background="?android:selectableItemBackground"
android:text="@string/btn_view_cert_key"
android:layout_weight="1"
android:drawableRight="@drawable/ic_person_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
</LinearLayout>
</ScrollView>
</RelativeLayout>

71
OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml
View File

@@ -1,71 +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="match_parent"
android:focusable="true"
android:focusableInTouchMode="true"
android:descendantFocusability="beforeDescendants"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/colorButtonRow"
android:padding="8dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/certs_text"
android:gravity="center_horizontal" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:id="@+id/view_key_status_divider" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@android:id/progress"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<ProgressBar
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center" />
</LinearLayout>
<RelativeLayout
android:id="@android:id/widget_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
<android.support.v7.widget.RecyclerView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:clipToPadding="false" />
<TextView
android:id="@android:id/empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/empty_certs"
android:visibility="gone"
android:layout_gravity="center" />
</RelativeLayout>
</FrameLayout>
</LinearLayout>

17
OpenKeychain/src/main/res/layout/view_key_adv_certs_header.xml
View File

@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground">
<TextView
android:id="@+id/stickylist_header_text"
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start|left"
tools:text="header text" />
</RelativeLayout>

52
OpenKeychain/src/main/res/layout/view_key_adv_certs_item.xml
View File

@@ -1,52 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:paddingLeft="8dp"
android:paddingStart="8dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:maxLines="1"
android:descendantFocusability="blocksDescendants"
android:background="?attr/selectableItemBackground"
android:focusable="false">
<TextView
android:id="@+id/signerName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
tools:text="signer name" />
<TextView
android:id="@+id/signerKeyId"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_below="@+id/signerName"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
tools:text="&lt;user@example.com>" />
<TextView
android:id="@+id/signStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="visible"
android:layout_above="@+id/signerKeyId"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
tools:text="status" />
</RelativeLayout>

6
OpenKeychain/src/main/res/menu/key_list.xml
View File

@@ -37,6 +37,12 @@
android:visible="false"
app:showAsAction="never" />
<item
android:id="@+id/menu_key_list_debug_bgsync"
android:title="Debug / Background Key Sync"
android:visible="false"
app:showAsAction="never" />
<item
android:id="@+id/menu_key_list_debug_first_time"
android:title="Debug / Show first time screen"

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

@@ -108,6 +108,9 @@
<string name="btn_saved">"Saved!"</string>
<string name="btn_not_matching">"Not matching"</string>
<!-- Shortcut Strings -->
<string name="shortcut_debug">Debug Actions</string>
<!-- Content Description -->
<string name="cd_encrypt_files">"Encrypt files"</string>
<string name="cd_exchange_keys">"Exchange keys"</string>
@@ -727,8 +730,6 @@
<string name="user_id_info_certified_text">"This identity has been confirmed by you."</string>
<string name="user_id_info_uncertified_title">"Not confirmed"</string>
<string name="user_id_info_uncertified_text">"This identity has not been confirmed yet. You cannot be sure if the identity really corresponds to a specific person."</string>
<string name="user_id_info_invalid_title">"Invalid"</string>
<string name="user_id_info_invalid_text">"Something is wrong with this identity!"</string>
<!-- Key trust -->
<string name="key_trust_no_cloud_evidence">"No proof from the Internet on this key’s trustworthiness."</string>
@@ -2024,4 +2025,19 @@
<string name="snack_keylist_clipboard_title">Found key data in clipboard!</string>
<string name="snack_keylist_clipboard_action">View</string>
<string name="notify_channel_keysync">Keyserver update</string>
<string name="notify_title_keysync">Updating keys…</string>
<string name="notify_title_keysync_finished">Finished updating %d keys</string>
<string name="notify_content_keysync">Key %d / %d</string>
<string name="snack_keysync_start">Started updating all keys…</string>
<string name="snack_keysync_finished">Key update successful</string>
<string name="snack_keysync_error">An error occurred while updating all keys</string>
<string name="keychoice_cannot_encrypt">This key cannot be used for encryption!</string>
<string name="keychoice_cannot_sign">This key cannot be used for signing!</string>
<string name="keychoice_insecure">This key cannot be used because it is insecure!</string>
<string name="keychoice_revoked">This key cannot be used because it is revoked!</string>
<string name="keychoice_expired">This key cannot be used because it is expired!</string>
</resources>

9
OpenKeychain/src/main/res/values/styles.xml
View File

@@ -84,4 +84,13 @@
<item name="android:text">-</item>
</style>
<style name="DebugButton" parent="@style/Widget.AppCompat.Button.Borderless">
<item name="android:clickable">true</item>
<item name="android:drawablePadding">8dp</item>
<item name="android:drawableRight">@drawable/ic_folder_grey_24dp</item>
<item name="android:gravity">center_vertical</item>
<item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
</style>
</resources>

25
OpenKeychain/src/main/res/xml/shortcuts.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
<shortcut
android:enabled="true"
android:icon="@drawable/ic_comment_text_grey600_24dp"
android:shortcutId="encrypt_text"
android:shortcutLongLabel="@string/btn_encrypt_text"
android:shortcutShortLabel="@string/btn_encrypt_text">
<intent
android:action="org.sufficientlysecure.keychain.action.ENCRYPT_TEXT"
android:targetClass="org.sufficientlysecure.keychain.ui.EncryptTextActivity"
android:targetPackage="org.sufficientlysecure.keychain" />
</shortcut>
<shortcut
android:enabled="true"
android:icon="@drawable/ic_folder_grey_24dp"
android:shortcutId="encrypt_files"
android:shortcutLongLabel="@string/btn_encrypt_files"
android:shortcutShortLabel="@string/btn_encrypt_files">
<intent
android:action="org.sufficientlysecure.keychain.action.ENCRYPT_FILES"
android:targetClass="org.sufficientlysecure.keychain.ui.EncryptFilesActivity"
android:targetPackage="org.sufficientlysecure.keychain" />
</shortcut>
</shortcuts>

3
OpenKeychain/src/main/res/xml/sync_preferences.xml
View File

@@ -1,7 +1,8 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<SwitchPreference
android:key="syncKeyserver"
android:persistent="false"
android:defaultValue="true"
android:persistent="true"
android:title="@string/label_sync_settings_keyserver_title"/>
<SwitchPreference
android:key="enableWifiSyncOnly"