NON-WORKING Merge branch 'development' into linked-identities

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
	OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
	extern/spongycastle

1 files changed, 11 insertions, 13 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index 5bface1fb..53fd9cdfd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -41,8 +41,6 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.haibison.android.lockpattern.LockPatternActivity;
-
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
@@ -108,20 +106,20 @@ public class PassphraseDialogActivity extends FragmentActivity {
                     case RESULT_CANCELED:
                         // The user cancelled the task
                         break;
-                    case LockPatternActivity.RESULT_FAILED:
-                        // The user failed to enter the pattern
-                        break;
-                    case LockPatternActivity.RESULT_FORGOT_PATTERN:
-                        // The user forgot the pattern and invoked your recovery Activity.
-                        break;
+//                    case LockPatternActivity.RESULT_FAILED:
+//                        // The user failed to enter the pattern
+//                        break;
+//                    case LockPatternActivity.RESULT_FORGOT_PATTERN:
+//                        // The user forgot the pattern and invoked your recovery Activity.
+//                        break;
                 }
 
                 /*
                  * In any case, there's always a key EXTRA_RETRY_COUNT, which holds
                  * the number of tries that the user did.
                  */
-                int retryCount = data.getIntExtra(
-                        LockPatternActivity.EXTRA_RETRY_COUNT, 0);
+//                int retryCount = data.getIntExtra(
+//                        LockPatternActivity.EXTRA_RETRY_COUNT, 0);
 
                 break;
             }
@@ -256,9 +254,9 @@ public class PassphraseDialogActivity extends FragmentActivity {
 
             if (keyType == CanonicalizedSecretKey.SecretKeyType.PATTERN) {
                 // start pattern dialog and show progress circle here...
-                Intent patternActivity = new Intent(getActivity(), LockPatternActivity.class);
-                patternActivity.putExtra(LockPatternActivity.EXTRA_PATTERN, "123");
-                startActivityForResult(patternActivity, REQUEST_CODE_ENTER_PATTERN);
+//                Intent patternActivity = new Intent(getActivity(), LockPatternActivity.class);
+//                patternActivity.putExtra(LockPatternActivity.EXTRA_PATTERN, "123");
+//                startActivityForResult(patternActivity, REQUEST_CODE_ENTER_PATTERN);
                 mInput.setVisibility(View.GONE);
                 mProgress.setVisibility(View.VISIBLE);
             } else {