Improve threshold selector screen

This commit is contained in:
ameba23
2022-02-15 08:44:36 +01:00
parent ae7a553aa3
commit 32f1676e55

View File

@@ -30,6 +30,8 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import static android.view.View.GONE;
public class ThresholdSelectorFragment extends BaseFragment { public class ThresholdSelectorFragment extends BaseFragment {
public static final String TAG = ThresholdSelectorFragment.class.getName(); public static final String TAG = ThresholdSelectorFragment.class.getName();
@@ -93,8 +95,11 @@ public class ThresholdSelectorFragment extends BaseFragment {
SecretSharingWrapper.defaultThreshold(numberOfCustodians); SecretSharingWrapper.defaultThreshold(numberOfCustodians);
threshold = recommendedThreshold; threshold = recommendedThreshold;
seekBar.setProgress(threshold - 2); seekBar.setProgress(threshold - 2);
strengthMeter.setStrength(1);
} else { } else {
seekBar.setEnabled(false); seekBar.setEnabled(false);
seekBar.setVisibility(GONE);
strengthMeter.setVisibility(GONE);
threshold = 2; threshold = 2;
seekBar.setMax(numberOfCustodians); seekBar.setMax(numberOfCustodians);
seekBar.setProgress(threshold); seekBar.setProgress(threshold);
@@ -195,13 +200,15 @@ public class ThresholdSelectorFragment extends BaseFragment {
strength = 0.75f; strength = 0.75f;
text = R.string.threshold_low_insecure; text = R.string.threshold_low_insecure;
} }
if (sanityLevel < -2) {
strength = 0.5f;
}
if (sanityLevel > 0) { if (sanityLevel > 0) {
strength = 0.75f; strength = 0.75f;
text = R.string.threshold_high_insecure; text = R.string.threshold_high_insecure;
} }
strengthMeter.setStrength(strength); strengthMeter.setStrength(strength);
message.setText(text); message.setText(text);
// TODO change colour of thresholdRepresentation to green/red based on sanityLevel
} }
@Override @Override