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

token-import: add logging

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-09-05 05:15:21 +02:00
parent 050aed1ef5
commit 363551723b
6 changed files with 253 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/GenericOperationResult.java Normal file
View File

@@ -0,0 +1,25 @@
package org.sufficientlysecure.keychain.operations.results;
import android.os.Parcel;
public class GenericOperationResult extends OperationResult {
public GenericOperationResult(int result, OperationLog log) {
super(result, log);
}
public GenericOperationResult(Parcel source) {
super(source);
}
public static final Creator<GenericOperationResult> CREATOR = new Creator<GenericOperationResult>() {
public GenericOperationResult createFromParcel(final Parcel source) {
return new GenericOperationResult(source);
}
public GenericOperationResult[] newArray(final int size) {
return new GenericOperationResult[size];
}
};
}

30
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
View File

@@ -905,6 +905,36 @@ public abstract class OperationResult implements Parcelable {
MSG_BENCH_S2K_100MS_ITS (LogLevel.INFO, R.string.msg_bench_s2k_100ms_its),
MSG_BENCH_SUCCESS (LogLevel.OK, R.string.msg_bench_success),
MSG_RET_CURI_ERROR_IO (LogLevel.ERROR, R.string.msg_ret_curi_error_io),
MSG_RET_CURI_ERROR_NO_MATCH (LogLevel.ERROR, R.string.msg_ret_curi_error_no_match),
MSG_RET_CURI_ERROR_NOT_FOUND (LogLevel.ERROR, R.string.msg_ret_curi_error_not_found),
MSG_RET_CURI_FOUND (LogLevel.DEBUG, R.string.msg_ret_curi_found),
MSG_RET_CURI_MISMATCH (LogLevel.ERROR, R.string.msg_ret_curi_mismatch),
MSG_RET_CURI_OK (LogLevel.OK, R.string.msg_ret_curi_ok),
MSG_RET_CURI_OPEN (LogLevel.DEBUG, R.string.msg_ret_curi_open),
MSG_RET_CURI_START (LogLevel.START, R.string.msg_ret_curi_start),
MSG_RET_KS_ERROR_NOT_FOUND (LogLevel.ERROR, R.string.msg_ret_ks_error_not_found),
MSG_RET_KS_ERROR (LogLevel.ERROR, R.string.msg_ret_ks_error),
MSG_RET_KS_FP_MATCH (LogLevel.DEBUG, R.string.msg_ret_ks_fp_match),
MSG_RET_KS_FP_MISMATCH (LogLevel.ERROR, R.string.msg_ret_ks_fp_mismatch),
MSG_RET_KS_OK (LogLevel.OK, R.string.msg_ret_ks_ok),
MSG_RET_KS_START (LogLevel.START, R.string.msg_ret_ks_start),
MSG_RET_LOCAL_SEARCH(LogLevel.DEBUG, R.string.msg_ret_local_search),
MSG_RET_LOCAL_FP_MATCH (LogLevel.DEBUG, R.string.msg_ret_local_fp_match),
MSG_RET_LOCAL_FP_MISMATCH (LogLevel.ERROR, R.string.msg_ret_local_fp_mismatch),
MSG_RET_LOCAL_NOT_FOUND (LogLevel.ERROR, R.string.msg_ret_local_not_found),
MSG_RET_LOCAL_OK (LogLevel.OK, R.string.msg_ret_local_ok),
MSG_RET_LOCAL_SECRET (LogLevel.INFO, R.string.msg_ret_local_secret),
MSG_RET_LOCAL_START (LogLevel.START, R.string.msg_ret_local_start),
MSG_RET_URI_ERROR_NO_MATCH(LogLevel.ERROR, R.string.msg_ret_uri_error_no_match),
MSG_RET_URI_ERROR_FETCH (LogLevel.ERROR, R.string.msg_ret_uri_error_fetch),
MSG_RET_URI_ERROR_PARSE (LogLevel.ERROR, R.string.msg_ret_uri_error_parse),
MSG_RET_URI_FETCHING (LogLevel.DEBUG, R.string.msg_ret_uri_fetching),
MSG_RET_URI_OK (LogLevel.OK, R.string.msg_ret_uri_ok),
MSG_RET_URI_START (LogLevel.START, R.string.msg_ret_uri_start),
MSG_RET_URI_NULL (LogLevel.ERROR, R.string.msg_ret_uri_null),
MSG_RET_URI_TEST (LogLevel.DEBUG, R.string.msg_ret_uri_test),
;
public final int mMsgId;