diff options
Diffstat (limited to 'OpenKeychain')
3 files changed, 7 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 03fa41984..1da88018a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -288,7 +288,7 @@ public class OpenPgpService extends RemoteService { } } else if (pgpResult.success()) { Intent result = new Intent(); - if (!cleartextSign) { + if (pgpResult.getDetachedSignature() != null && !cleartextSign) { result.putExtra(OpenPgpApi.RESULT_DETACHED_SIGNATURE, pgpResult.getDetachedSignature()); } result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS); diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml index 6df5c84f5..c3f6e33cb 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -78,27 +78,27 @@ android:orientation="vertical"> <TextView + android:id="@+id/api_accounts_label" style="@style/SectionHeader" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/api_settings_allowed_keys" /> + android:visibility="gone" + android:text="@string/api_settings_accounts" /> <FrameLayout - android:id="@+id/api_allowed_keys_list_fragment" + android:id="@+id/api_accounts_list_fragment" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" /> <TextView - android:id="@+id/api_accounts_label" style="@style/SectionHeader" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="gone" - android:text="@string/api_settings_accounts" /> + android:text="@string/api_settings_allowed_keys" /> <FrameLayout - android:id="@+id/api_accounts_list_fragment" + android:id="@+id/api_allowed_keys_list_fragment" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" /> diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml index ed3e33aab..1ea0a520d 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:custom="http://schemas.android.com/apk/res-auto" - android:background="?attr/colorPrimaryDark" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -29,14 +28,12 @@ android:gravity="center_vertical" android:orientation="vertical" android:text="Name (set in-code)" - android:textColor="@color/icons" android:textAppearance="?android:attr/textAppearanceMedium" /> </RelativeLayout> <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:textColor="@color/icons" custom:foldedLabel="@string/api_settings_show_info" custom:unFoldedLabel="@string/api_settings_hide_info"> @@ -44,7 +41,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/api_settings_package_name" - android:textColor="@color/icons" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView @@ -52,14 +48,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="com.example" - android:textColor="@color/icons" android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/api_settings_package_signature" - android:textColor="@color/icons" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView @@ -67,7 +61,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Base64 encoded hash of signature" - android:textColor="@color/icons" android:textAppearance="?android:attr/textAppearanceSmall" /> </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> |