Merge remote-tracking branch 'origin/master' into certs

Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java

1 files changed, 0 insertions, 12 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
index d12f00547..6e96a338a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
@@ -81,9 +81,6 @@ public class ViewKeyMainFragment extends Fragment implements
 
     private Uri mDataUri;
 
-    // for activity
-    private boolean mSecretAvailable = false;
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.view_key_main_fragment, container, false);
@@ -227,8 +224,6 @@ public class ViewKeyMainFragment extends Fragment implements
                     mComment.setText(mainUserId[2]);
 
                     if (data.getInt(INDEX_UNIFIED_HAS_SECRET) != 0) {
-                        mSecretAvailable = true;
-
                         mSecretKey.setTextColor(getResources().getColor(R.color.emphasis));
                         mSecretKey.setText(R.string.secret_key_yes);
 
@@ -243,8 +238,6 @@ public class ViewKeyMainFragment extends Fragment implements
                             }
                         });
                     } else {
-                        mSecretAvailable = false;
-
                         mSecretKey.setTextColor(Color.BLACK);
                         mSecretKey.setText(getResources().getString(R.string.secret_key_no));
 
@@ -333,11 +326,6 @@ public class ViewKeyMainFragment extends Fragment implements
         }
     }
 
-    /** Returns true if the key current displayed is known to have a secret key. */
-    public boolean isSecretAvailable() {
-        return mSecretAvailable;
-    }
-
     private void encryptToContact(Uri dataUri) {
         // TODO preselect from uri? should be feasible without trivial query
         long keyId = ProviderHelper.getMasterKeyId(getActivity(), dataUri);