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

incorporate feedback

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-05-02 20:02:53 +02:00
parent d6f8357a76
commit f8e6e08410
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
View File

@@ -39,6 +39,7 @@ import android.os.ParcelFileDescriptor;
import android.os.RemoteException; import android.os.RemoteException;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils;
import org.bouncycastle.bcpg.ArmoredOutputStream; import org.bouncycastle.bcpg.ArmoredOutputStream;
import org.openintents.openpgp.AutocryptPeerUpdate; import org.openintents.openpgp.AutocryptPeerUpdate;
@@ -719,7 +720,7 @@ public class OpenPgpService extends Service {
String preferredUserId = data.getStringExtra(OpenPgpApi.EXTRA_USER_ID); String preferredUserId = data.getStringExtra(OpenPgpApi.EXTRA_USER_ID);
PendingIntent pi; PendingIntent pi;
// the new dialog doesn't really work if we don't have a user id to work with. just show the old... // the new dialog doesn't really work if we don't have a user id to work with. just show the old...
if (preferredUserId == null) { if (TextUtils.isEmpty(preferredUserId)) {
pi = mApiPendingIntentFactory.createSelectSignKeyIdLegacyPendingIntent(data, currentPkg, null); pi = mApiPendingIntentFactory.createSelectSignKeyIdLegacyPendingIntent(data, currentPkg, null);
} else { } else {
byte[] packageSignature = mApiPermissionHelper.getPackageCertificateOrError(currentPkg); byte[] packageSignature = mApiPermissionHelper.getPackageCertificateOrError(currentPkg);

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

@@ -78,7 +78,7 @@
android:inAnimation="@anim/fade_in" android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out" android:outAnimation="@anim/fade_out"
android:measureAllChildren="false" android:measureAllChildren="false"
custom:initialView="03"> custom:initialView="01">
<Space <Space
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -202,7 +202,7 @@
style="?android:textAppearanceMedium" style="?android:textAppearanceMedium"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@android:string/cancel" android:text="@string/select_identity_cancel"
/> />
</LinearLayout> </LinearLayout>

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

@@ -1992,7 +1992,7 @@
<string name="use_key">Use key: %s</string> <string name="use_key">Use key: %s</string>
<string name="use_key_no_name">Use key: <![CDATA[<no name>]]></string> <string name="use_key_no_name">Use key: <![CDATA[<no name>]]></string>
<string name="title_select_key">%s wants to set up end-to-end encryption for this address:</string> <string name="title_select_key">%s wants to set up end-to-end encryption for this address:</string>
<string name="select_identity_cancel">Cancel</string> <string name="select_identity_cancel">Disable</string>
<string name="select_identity_create">Create a key for me</string> <string name="select_identity_create">Create a key for me</string>
<string name="error_save_key_internal">"Internal error saving key!"</string> <string name="error_save_key_internal">"Internal error saving key!"</string>
<string name="menu_list_unrelated_keys">List unrelated keys</string> <string name="menu_list_unrelated_keys">List unrelated keys</string>