moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-08-13 15:53:53 -04:00
Code Issues Releases Wiki Activity

Merge branch 'development' of github.com:open-keychain/open-keychain into development

Browse Source
This commit is contained in:
Dominik Schürmann 2014-10-08 17:32:41 +02:00
commit 158f22a799
6 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@ -313,12 +313,7 @@ public class KeychainIntentService extends IntentService implements Progressable
DecryptVerifyResult decryptVerifyResult = builder.build().execute();
resultData.putParcelable(DecryptVerifyResult.EXTRA_RESULT, decryptVerifyResult);
/* Output */
Log.logDebugBundle(resultData, "resultData");
sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, resultData);
sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, decryptVerifyResult);
} catch (Exception e) {
sendErrorToHandler(e);
}
@ -512,11 +507,7 @@ public class KeychainIntentService extends IntentService implements Progressable
// If the edit operation didn't succeed, exit here
if (!modifyResult.success()) {
// always return SaveKeyringResult, so create one out of the EditKeyResult
SaveKeyringResult saveResult = new SaveKeyringResult(
SaveKeyringResult.RESULT_ERROR,
modifyResult.getLog(),
null);
sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, saveResult);
sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, modifyResult);
return;
}
@ -530,9 +521,9 @@ public class KeychainIntentService extends IntentService implements Progressable
log.add(LogType.MSG_OPERATION_CANCELLED, 0);
}
// If so, just stop without saving
SaveKeyringResult saveResult = new SaveKeyringResult(
SaveKeyringResult.RESULT_CANCELLED, log, null);
sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, saveResult);
modifyResult = new EditKeyResult(
EditKeyResult.RESULT_CANCELLED, log, null);
sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, modifyResult);
return;
}

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java
View File

@ -93,6 +93,11 @@ public abstract class OperationResult implements Parcelable {
}
public OperationLog getLog() {
// If there is only a single entry, and it's a compound one, return that log
if (mLog.isSingleCompound()) {
return ((SubLogEntryParcel) mLog.getFirst()).getSubResult().getLog();
}
// Otherwse, return our regular log
return mLog;
}
@ -644,6 +649,10 @@ public abstract class OperationResult implements Parcelable {
mParcels.add(new SubLogEntryParcel(subResult, subLog.getFirst().mType, indent, subLog.getFirst().mParameters));
}
boolean isSingleCompound() {
return mParcels.size() == 1 && getFirst() instanceof SubLogEntryParcel;
}
public void clear() {
mParcels.clear();
}

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
View File

@ -173,16 +173,6 @@ public class MultiCertifyKeyFragment extends LoaderFragment
}
});
// UI tidbit: "my key" is the area above the checkbox, if the user clicks there he
// probably actually wants to hit the checkbox
View vMyKeyLabel = view.findViewById(R.id.label_my_key);
vMyKeyLabel.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
mUploadKeyCheckbox.performClick();
}
});
return root;
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java
View File

@ -286,7 +286,7 @@ public class KeyFormattingUtils {
}
public static String beautifyKeyIdWithPrefix(Context context, String idHex) {
return "ID: " + beautifyKeyId(idHex);
return "Key ID: " + beautifyKeyId(idHex);
}
public static String beautifyKeyIdWithPrefix(Context context, long keyId) {

7
OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
View File

@ -60,7 +60,6 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/label_my_key"
android:paddingLeft="8dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -82,10 +81,10 @@
android:id="@+id/sign_key_upload_checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:checked="false"
android:text="@string/label_send_key" />
android:text="@string/label_send_key"
android:paddingTop="12dp"
android:paddingBottom="12dp"/>
<View
android:layout_width="match_parent"

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

@ -946,7 +946,7 @@
<string name="empty_certs">"No certificates for this key"</string>
<string name="certs_text">"Only validated self-certificates and validated certificates created with your keys are displayed here."</string>
<string name="section_uids_to_certify">"Identities"</string>
<string name="certify_text">"Are the selected identities corresponding to the persons you are exchanging keys with?\nDeselect all unknown ones."</string>
<string name="certify_text">"Do the selected identities match the persons you are exchanging keys with? Deselect all unknown ones."</string>
<string name="label_revocation">"Revocation Reason"</string>
<string name="label_verify_status">"Verification Status"</string>
<string name="label_cert_type">"Type"</string>