Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Julian Dehm
briar
Commits
8bb1d444
Unverified
Commit
8bb1d444
authored
Apr 29, 2016
by
Ernir Erlingsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
interlude
parent
adb7d37f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
72 additions
and
35 deletions
+72
-35
briar-android/proguard-rules.txt
briar-android/proguard-rules.txt
+15
-3
briar-android/src/org/briarproject/android/ActivityModule.java
...-android/src/org/briarproject/android/ActivityModule.java
+5
-3
briar-android/src/org/briarproject/android/SetupActivity.java
...r-android/src/org/briarproject/android/SetupActivity.java
+3
-1
briar-android/src/org/briarproject/android/util/StrengthMeter.java
...roid/src/org/briarproject/android/util/StrengthMeter.java
+9
-5
briar-android/test/java/briarproject/activity/SetupActivityTest.java
...id/test/java/briarproject/activity/SetupActivityTest.java
+38
-4
briar-android/test/java/briarproject/activity/TestActivityModule.java
...d/test/java/briarproject/activity/TestActivityModule.java
+0
-19
briar-android/test/java/briarproject/controller/SetupControllerTest.java
...est/java/briarproject/controller/SetupControllerTest.java
+2
-0
No files found.
briar-android/proguard-rules.txt
View file @
8bb1d444
...
...
@@ -3,6 +3,7 @@
-dontpreverify
-dontobfuscate
-verbose
-useuniqueclassmembernames
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
# For comfortability in case we do obfuscate
# -renamesourcefileattribute SourceFile
...
...
@@ -48,9 +49,20 @@
-keep class roboguice.** { *; }
-keep class dagger.** { *; }
-keep class com.google.** { *; }
-keep class javax.** { *; }
-keep class org.eclipse.** { *; }
-keep class com.squareup.** { *; }
-dontwarn org.hamcrest.**
-dontwarn com.squareup.**
-dontwarn com.google.android.**
-keep class com.google.android.** {
*;
}
-keep class com.google.common.** {
*;
}
-keep class org.hamcrest.** {
*;
}
-dontwarn org.h2.**
-dontnote org.h2.**
...
...
briar-android/src/org/briarproject/android/ActivityModule.java
View file @
8bb1d444
...
...
@@ -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
;
}
...
...
briar-android/src/org/briarproject/android/SetupActivity.java
View file @
8bb1d444
...
...
@@ -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
...
...
briar-android/src/org/briarproject/android/util/StrengthMeter.java
View file @
8bb1d444
...
...
@@ -23,11 +23,11 @@ import static org.briarproject.api.crypto.PasswordStrengthEstimator.WEAK;
public
class
StrengthMeter
extends
ProgressBar
{
private
static
final
int
MAX
=
100
;
p
rivate
static
final
int
RED
=
Color
.
rgb
(
255
,
0
,
0
);
p
rivate
static
final
int
ORANGE
=
Color
.
rgb
(
255
,
160
,
0
);
p
rivate
static
final
int
YELLOW
=
Color
.
rgb
(
255
,
255
,
0
);
p
rivate
static
final
int
LIME
=
Color
.
rgb
(
180
,
255
,
0
);
p
rivate
static
final
int
GREEN
=
Color
.
rgb
(
0
,
255
,
0
);
p
ublic
static
final
int
RED
=
Color
.
rgb
(
255
,
0
,
0
);
p
ublic
static
final
int
ORANGE
=
Color
.
rgb
(
255
,
160
,
0
);
p
ublic
static
final
int
YELLOW
=
Color
.
rgb
(
255
,
255
,
0
);
p
ublic
static
final
int
LIME
=
Color
.
rgb
(
180
,
255
,
0
);
p
ublic
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
;
...
...
briar-android/test/java/briarproject/activity/SetupActivityTest.java
View file @
8bb1d444
...
...
@@ -4,20 +4,29 @@ import android.support.design.widget.TextInputLayout;
import
android.widget.Button
;
import
android.widget.EditText
;
import
com.google.common.base.Strings
;
import
org.briarproject.BuildConfig
;
import
org.briarproject.R
;
import
org.briarproject.android.ActivityModule
;
import
org.briarproject.android.SetupActivity
;
import
org.briarproject.android.controller.SetupController
;
import
org.briarproject.android.controller.SetupControllerImp
;
import
org.briarproject.android.util.StrengthMeter
;
import
org.briarproject.api.crypto.PasswordStrengthEstimator
;
import
org.briarproject.api.identity.AuthorConstants
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.mockito.Mockito
;
import
org.robolectric.Robolectric
;
import
org.robolectric.RobolectricGradleTestRunner
;
import
org.robolectric.annotation.Config
;
import
static
junit
.
framework
.
Assert
.
assertEquals
;
@RunWith
(
RobolectricGradleTestRunner
.
class
)
@Config
(
constants
=
BuildConfig
.
class
,
sdk
=
2
2
)
@Config
(
constants
=
BuildConfig
.
class
,
sdk
=
2
1
)
public
class
SetupActivityTest
{
private
SetupActivity
setupActivity
;
...
...
@@ -34,7 +43,22 @@ public class SetupActivityTest {
@Override
protected
ActivityModule
getActivityModule
()
{
return
super
.
getActivityModule
();
return
new
ActivityModule
(
this
)
{
@Override
protected
SetupController
provideSetupController
(
SetupControllerImp
setupControllerImp
)
{
SetupController
setupController
=
Mockito
.
mock
(
SetupControllerImp
.
class
);
Mockito
.
when
(
setupController
.
estimatePasswordStrength
(
"strong"
))
.
thenReturn
(
PasswordStrengthEstimator
.
STRONG
);
// Mockito.when(
// setupController.estimatePasswordStrength("qstrong"))
// .thenReturn(PasswordStrengthEstimator.QUITE_STRONG);
return
setupController
;
}
};
}
}
...
...
@@ -57,13 +81,23 @@ public class SetupActivityTest {
(
StrengthMeter
)
setupActivity
.
findViewById
(
R
.
id
.
strength_meter
);
createAccountButton
=
(
Button
)
setupActivity
.
findViewById
(
R
.
id
.
create_account
);
}
@Test
public
void
test
()
{
String
longNick
=
Strings
.
padEnd
(
"*"
,
AuthorConstants
.
MAX_AUTHOR_NAME_LENGTH
+
1
,
'*'
);
nicknameEntry
.
setText
(
longNick
);
assertEquals
(
nicknameEntryWrapper
.
getError
(),
setupActivity
.
getString
(
R
.
string
.
name_too_long
));
passwordEntry
.
setText
(
"strong"
);
assertEquals
(
strengthMeter
.
getProgress
(),
strengthMeter
.
getMax
()
*
PasswordStrengthEstimator
.
STRONG
);
// passwordEntry.setText("strong");
// assertEquals(StrengthMeter.GREEN, strengthMeter.getColor());
// setupActivity.
}
}
briar-android/test/java/briarproject/activity/TestActivityModule.java
deleted
100644 → 0
View file @
adb7d37f
package
briarproject.activity
;
import
org.briarproject.android.ActivityModule
;
import
org.briarproject.android.BaseActivity
;
public
class
TestActivityModule
extends
ActivityModule
{
public
TestActivityModule
(
BaseActivity
activity
)
{
super
(
activity
);
}
/*
@Override
protected SetupController provideSetupController(
SetupControllerImp setupControllerImp) {
}
*/
}
briar-android/test/java/briarproject/controller/SetupControllerTest.java
View file @
8bb1d444
...
...
@@ -8,6 +8,8 @@ import javax.inject.Inject;
public
class
SetupControllerTest
extends
BriarTestCase
{
@Inject
SetupController
setupController
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment