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

Simplify can encrypt check

Browse Source
This commit is contained in:
Dominik Schürmann
2014-03-26 00:40:13 +01:00
parent 30a002634d
commit 930d722013
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
View File

@@ -32,7 +32,9 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import com.beardedhen.androidbootstrap.BootstrapButton; import com.beardedhen.androidbootstrap.BootstrapButton;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.helper.OtherHelper; import org.sufficientlysecure.keychain.helper.OtherHelper;
@@ -324,17 +326,20 @@ public class ViewKeyMainFragment extends Fragment implements
mFingerprint.setText(PgpKeyHelper.colorizeFingerprint(fingerprint)); mFingerprint.setText(PgpKeyHelper.colorizeFingerprint(fingerprint));
} }
int valid_keys = 0;
// hide encrypt button if no encryption key is available
boolean canEncrypt = false;
data.moveToFirst(); data.moveToFirst();
do { do {
if (data.getInt(KEYS_INDEX_CAN_ENCRYPT) == 1) { if (data.getInt(KEYS_INDEX_CAN_ENCRYPT) == 1) {
valid_keys++; canEncrypt = true;
break;
} }
} while (data.moveToNext()); } while (data.moveToNext());
if(valid_keys == 0){ if (!canEncrypt) {
mActionEncrypt.setVisibility(View.GONE); mActionEncrypt.setVisibility(View.GONE);
} }
Log.i("Valid Encryption keys", Integer.toString(valid_keys));
mKeysAdapter.swapCursor(data); mKeysAdapter.swapCursor(data);
break; break;