Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

interlude

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-04-29 11:47:50 +02:00
parent adb7d37f86
commit 8bb1d444c6
7 changed files with 72 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/org/briarproject/android/ActivityModule.java
View File

@@ -54,8 +54,9 @@ public class ActivityModule {
@ActivityScope
@Provides
protected SetupController provideSetupController() {
return new SetupControllerImp();
protected SetupController provideSetupController(
SetupControllerImp setupControllerImp) {
return setupControllerImp;
}
@ActivityScope
@@ -147,7 +148,8 @@ public class ActivityModule {
@Provides
@Named("IntroductionMessageFragment")
IntroductionMessageFragment provideIntroductionMessageFragment() {
IntroductionMessageFragment fragment = new IntroductionMessageFragment();
IntroductionMessageFragment fragment =
new IntroductionMessageFragment();
fragment.setArguments(new Bundle());
return fragment;
}

4
briar-android/src/org/briarproject/android/SetupActivity.java
View File

@@ -27,6 +27,8 @@ import javax.inject.Inject;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import static org.briarproject.api.crypto.PasswordStrengthEstimator.WEAK;
import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
@@ -64,7 +66,7 @@ public class SetupActivity extends BaseActivity implements OnClickListener,
createAccountButton = (Button) findViewById(R.id.create_account);
progress = (ProgressBar) findViewById(R.id.progress_wheel);
// if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
TextWatcher tw = new TextWatcher() {
@Override

14
briar-android/src/org/briarproject/android/util/StrengthMeter.java
View File

@@ -23,11 +23,11 @@ import static org.briarproject.api.crypto.PasswordStrengthEstimator.WEAK;
public class StrengthMeter extends ProgressBar {
private static final int MAX = 100;
private static final int RED = Color.rgb(255, 0, 0);
private static final int ORANGE = Color.rgb(255, 160, 0);
private static final int YELLOW = Color.rgb(255, 255, 0);
private static final int LIME = Color.rgb(180, 255, 0);
private static final int GREEN = Color.rgb(0, 255, 0);
public static final int RED = Color.rgb(255, 0, 0);
public static final int ORANGE = Color.rgb(255, 160, 0);
public static final int YELLOW = Color.rgb(255, 255, 0);
public static final int LIME = Color.rgb(180, 255, 0);
public static final int GREEN = Color.rgb(0, 255, 0);
private final ShapeDrawable bar;
@@ -57,6 +57,10 @@ public class StrengthMeter extends ProgressBar {
return MAX;
}
public int getColor() {
return bar.getPaint().getColor();
}
public void setStrength(float strength) {
if (strength < 0 || strength > 1) throw new IllegalArgumentException();
int colour;