moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity

Ripple

Browse Source
This commit is contained in:
Dominik Schürmann 2015-03-10 02:13:36 +01:00
parent ae1c80e8b3
commit b3257e0ffa
24 changed files with 40 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
View File

@ -386,7 +386,7 @@ public class ContactHelper {
// Do not store expired or revoked keys in contact db - and remove them if they already exist // Do not store expired or revoked keys in contact db - and remove them if they already exist
if (isExpired || isRevoked) { if (isExpired || isRevoked) {
Log.d(Constants.TAG, "Expired or revoked: Deleting " + rawContactId); Log.d(Constants.TAG, "Expired or revoked: Deleting rawContactId " + rawContactId);
if (rawContactId != -1) { if (rawContactId != -1) {
deleteRawContactById(resolver, rawContactId); deleteRawContactById(resolver, rawContactId);
} }
@ -423,8 +423,6 @@ public class ContactHelper {
/** /**
* Delete all raw contacts associated to OpenKeychain. * Delete all raw contacts associated to OpenKeychain.
* <p/>
* TODO: Does this work?
*/ */
private static int debugDeleteRawContacts(ContentResolver resolver) { private static int debugDeleteRawContacts(ContentResolver resolver) {
//allows us to actually wipe the RawContact from the device, otherwise would be just flagged //allows us to actually wipe the RawContact from the device, otherwise would be just flagged

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

@ -72,7 +72,7 @@
<TextView <TextView
android:id="@+id/api_account_settings_create_key" android:id="@+id/api_account_settings_create_key"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp" android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"

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

@ -77,7 +77,7 @@
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
android:paddingRight="4dp" android:paddingRight="4dp"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView

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

@ -23,6 +23,6 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_close_grey_24dp" android:src="@drawable/ic_close_grey_24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>

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

@ -113,7 +113,7 @@
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical" android:gravity="center_vertical"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
</LinearLayout> </LinearLayout>

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

@ -32,7 +32,7 @@
android:id="@+id/decrypt_file_browse" android:id="@+id/decrypt_file_browse"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem"> android:background="?android:selectableItemBackground">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -81,7 +81,7 @@
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:text="@string/btn_decrypt_verify_file" android:text="@string/btn_decrypt_verify_file"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:drawableRight="@drawable/ic_save_grey_24dp" android:drawableRight="@drawable/ic_save_grey_24dp"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:gravity="center_vertical" android:gravity="center_vertical"

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

@ -75,7 +75,7 @@
android:clickable="true" android:clickable="true"
android:layout_marginLeft="32dp" android:layout_marginLeft="32dp"
android:paddingRight="4dp" android:paddingRight="4dp"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
@ -121,7 +121,7 @@
android:drawableRight="@drawable/ic_vpn_key_grey_24dp" android:drawableRight="@drawable/ic_vpn_key_grey_24dp"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:gravity="center_vertical" android:gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>

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

@ -48,7 +48,7 @@
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -79,7 +79,7 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_content_copy_grey_24dp" android:src="@drawable/ic_content_copy_grey_24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>

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

@ -56,5 +56,5 @@
android:src="@drawable/ic_close_grey_24dp" android:src="@drawable/ic_close_grey_24dp"
android:clickable="true" android:clickable="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
style="@style/SelectableItem"/> android:background="?android:selectableItemBackground"/>
</RelativeLayout> </RelativeLayout>

6
OpenKeychain/src/main/res/layout/first_time_activity.xml
View File

@ -43,7 +43,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
<View <View
android:layout_width="1dp" android:layout_width="1dp"
@ -67,7 +67,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>
@ -87,7 +87,7 @@
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center" android:gravity="center"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:layout_gravity="center_horizontal" /> android:layout_gravity="center_horizontal" />
</LinearLayout> </LinearLayout>

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

@ -77,7 +77,7 @@
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -31,7 +31,7 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_search_grey_24dp" android:src="@drawable/ic_search_grey_24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
<View <View
android:layout_width="1dip" android:layout_width="1dip"
@ -48,7 +48,7 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_settings_grey_24dp" android:src="@drawable/ic_settings_grey_24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>

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

@ -10,7 +10,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -40,7 +40,7 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_content_paste_grey_24dp" android:src="@drawable/ic_content_paste_grey_24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>

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

@ -10,7 +10,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -40,7 +40,7 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_nfc_white_24dp" android:src="@drawable/ic_nfc_white_24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>

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

@ -60,7 +60,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/ic_repeat_grey_24dp" android:src="@drawable/ic_repeat_grey_24dp"
android:padding="12dp" android:padding="12dp"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>

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

@ -33,7 +33,7 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:clickable="true" android:clickable="true"
android:onClick="noPassphrase" android:onClick="noPassphrase"
style="@style/SelectableItem"/> android:background="?android:selectableItemBackground"/>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@ -51,7 +51,7 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:clickable="true" android:clickable="true"
android:onClick="passphrase" android:onClick="passphrase"
style="@style/SelectableItem"/> android:background="?android:selectableItemBackground"/>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dip" android:layout_height="1dip"
@ -67,7 +67,7 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:clickable="true" android:clickable="true"
android:onClick="startLockpattern" android:onClick="startLockpattern"
style="@style/SelectableItem"/> android:background="?android:selectableItemBackground"/>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dip" android:layout_height="1dip"
@ -83,7 +83,7 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:clickable="true" android:clickable="true"
android:onClick="NFC" android:onClick="NFC"
style="@style/SelectableItem"/> android:background="?android:selectableItemBackground"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

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

@ -51,7 +51,7 @@
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
android:paddingRight="4dp" android:paddingRight="4dp"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView

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

@ -63,7 +63,7 @@
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>

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

@ -211,7 +211,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:text="@string/btn_view_cert_key" android:text="@string/btn_view_cert_key"
android:layout_weight="1" android:layout_weight="1"
android:drawableRight="@drawable/ic_person_grey_24dp" android:drawableRight="@drawable/ic_person_grey_24dp"

12
OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
View File

@ -27,7 +27,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -59,7 +59,7 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_content_copy_grey_24dp" android:src="@drawable/ic_content_copy_grey_24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>
@ -103,7 +103,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -133,7 +133,7 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_content_copy_grey_24dp" android:src="@drawable/ic_content_copy_grey_24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
<View <View
android:layout_width="1dip" android:layout_width="1dip"
@ -150,7 +150,7 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_repeat_grey_24dp" android:src="@drawable/ic_repeat_grey_24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>
@ -168,7 +168,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" android:background="?android:selectableItemBackground"
android:text="@string/key_view_action_upload" android:text="@string/key_view_action_upload"
android:layout_weight="1" android:layout_weight="1"
android:drawableRight="@drawable/ic_file_upload_grey_24dp" android:drawableRight="@drawable/ic_file_upload_grey_24dp"

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

@ -27,7 +27,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_close_grey_24dp" android:src="@drawable/ic_close_grey_24dp"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</FrameLayout> </FrameLayout>

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

@ -75,6 +75,6 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_close_grey_24dp" android:src="@drawable/ic_close_grey_24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/SelectableItem" /> android:background="?android:selectableItemBackground" />
</LinearLayout> </LinearLayout>

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

@ -64,6 +64,8 @@
<LinearLayout <LinearLayout
android:id='@+id/system_contact_layout' android:id='@+id/system_contact_layout'
android:clickable="true"
android:background="?android:selectableItemBackground"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">

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

@ -21,10 +21,6 @@
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
</style> </style>
<style name="SelectableItem">
<item name="android:background">@drawable/selector_transparent_button</item>
</style>
<style name="FabMenuStyle"> <style name="FabMenuStyle">
<item name="android:background">@drawable/fab_label_background</item> <item name="android:background">@drawable/fab_label_background</item>
<item name="android:textColor">@color/white</item> <item name="android:textColor">@color/white</item>