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

removed debug logs, added licenses

Browse Source
This commit is contained in:
Adithya Abraham Philip
2015-06-24 07:27:33 +05:30
parent 5f170e5819
commit 7bc21b8b9d
13 changed files with 191 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@@ -21,7 +21,6 @@ package org.sufficientlysecure.keychain.ui;
import android.animation.ObjectAnimator;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
@@ -64,7 +63,9 @@ import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeychainDatabase;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
import org.sufficientlysecure.keychain.service.*;
import org.sufficientlysecure.keychain.service.ConsolidateInputParcel;
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java
View File

@@ -31,7 +31,7 @@ public abstract class CachingCryptoOperationFragment <T extends Parcelable, S ex
}
@Override
protected void onCryptoOperationSuccess(S result) {
protected void onCryptoOperationResult(S result) {
super.onCryptoOperationResult(result);
mCachedActionsParcel = null;
}

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
View File

@@ -30,6 +30,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.InputPendingResult;
import org.sufficientlysecure.keychain.operations.results.OperationResult;
@@ -118,7 +119,6 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
Activity activity = mUseFragment ? mFragment.getActivity() : mActivity;
Log.d("PHILIP", "Initating input " + requiredInput.mType);
switch (requiredInput.mType) {
case NFC_KEYTOCARD:
case NFC_DECRYPT:
@@ -161,7 +161,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
* @return true if requestCode was recognized, false otherwise
*/
public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
Log.d("PHILIP", "received activity result in OperationHelper");
Log.d(Constants.TAG, "received activity result in OperationHelper");
if (mRequestedCode != requestCode) {
// this wasn't meant for us to handle
@@ -278,7 +278,6 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
}
protected void onCryptoOperationResult(S result) {
Log.d("PHILIP", "cryptoResult " + result.success());
if (result.success()) {
mCallback.onCryptoOperationSuccess(result);
} else {
@@ -287,14 +286,12 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
}
public void onHandleResult(OperationResult result) {
Log.d("PHILIP", "Handling result in OperationHelper " + result);
Log.d(Constants.TAG, "Handling result in OperationHelper success: " + result.success());
if (result instanceof InputPendingResult) {
Log.d("PHILIP", "is pending result");
InputPendingResult pendingResult = (InputPendingResult) result;
if (pendingResult.isPending()) {
Log.d("PHILIP", "Is pending");
RequiredInputParcel requiredInput = pendingResult.getRequiredInputParcel();
initiateInputActivity(requiredInput);
return;