Ernir Erlingsson
f033f4fae0
Merge branch '40-forgotten-password' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password
...
Conflicts:
briar-android/res/values/strings.xml
briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
2015-12-10 11:12:10 +01:00
Ernir Erlingsson
b33d8d1ee5
fixed missing string
2015-12-10 11:07:10 +01:00
Ernir Erlingsson
a5fd7ff9dc
Added dependency injections for FileUtils and removed redundant code
2015-12-10 11:07:10 +01:00
Ernir Erlingsson
fb2a44c478
code re-structure, mostly nitpicks :)
2015-12-10 11:02:15 +01:00
Ernir Erlingsson
886cad91f0
Added a dialog and refactored code
2015-12-10 11:02:15 +01:00
Ernir Erlingsson
ca00b414e7
Fixed lost code from merge
2015-12-10 11:01:00 +01:00
Ernir Erlingsson
27edc2e3e8
code and ui refactoring in the Password activity, encapsulation and wrappers.
2015-12-10 11:01:00 +01:00
Ernir Erlingsson
0fe514606f
removed sneaky iml file
2015-12-10 10:51:09 +01:00
Ernir Erlingsson
8c0f295879
Added dependency injections for FileUtils and removed redundant code
2015-12-10 10:49:28 +01:00
akwizgran
d0342f9a4e
Merge branch 'junit-4-not-3' into 'master'
...
Don't mix JUnit 4's @Test with JUnit3's TestCase.
This is the world's most boring merge request. Android Studio was complaining about using JUnit 4's @Test annotations with JUnit 3's TestCase, so I fixed it.
Most of the changes come from Android Studio organising imports in a different order from Eclipse.
See merge request !8
2015-12-09 13:23:42 +00:00
akwizgran
a5afa2ef93
Merge branch '161-hidden-service-directory' into 'master'
...
Create hidden service in a subdirectory. #161
The permissions for the parent directory are too permissive (775) for Tor 0.2.7.5. Store the hidden service hostname and private key in a subdirectory with permissions 700.
See merge request !5
2015-12-09 13:21:54 +00:00
Ernir Erlingsson
b83fe85910
code re-structure, mostly nitpicks :)
2015-12-09 11:50:26 +01:00
Ernir Erlingsson
7e9cff3118
Merge branch 'master' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password
...
Conflicts:
.gitignore
briar-android/briar-android.iml
2015-12-09 11:47:53 +01:00
akwizgran
4497612a9d
Merge branch '160-improve-gitignore' into 'master'
...
improved git ignore
closes #160
See merge request !4
2015-12-09 10:31:44 +00:00
Ernir Erlingsson
2052c8456f
Added a dialog and refactored code
2015-12-09 10:29:34 +01:00
Ernir Erlingsson
105b627152
Merge branch '160-improve-gitignore' of https://code.briarproject.org/akwizgran/briar into 160-improve-gitignore
...
Conflicts:
.gitignore
2015-12-09 00:35:50 +01:00
Ernir Erlingsson
2a61fa94d1
modified .gitignore and removed *.iml from git
2015-12-09 00:33:22 +01:00
Ernir Erlingsson
74298de1ac
improved git ignore
2015-12-09 00:14:13 +01:00
Ernir Erlingsson
428c3dd1b2
Fixed lost code from merge
2015-12-09 00:08:08 +01:00
Ernir Erlingsson
43f562a7bc
code and ui refactoring in the Password activity, encapsulation and wrappers.
2015-12-09 00:05:48 +01:00
Ernir Erlingsson
6d13c4e095
improved git ignore
2015-12-08 23:58:59 +01:00
akwizgran
3bf29fb6f2
Merge branch '38-touching-startup-failure-notification-should-show-details' into 'master'
...
Touching startup failure notification now shows details
The text of the startup failure notification is unhelpful due to lack of
space. Touching the notification now launches an activity that gives details
of the problem and what can be done about it.
Closes #38
See merge request !7
2015-12-08 15:03:05 +00:00
akwizgran
123dff3a3d
Don't mix JUnit 4 annotations with JUnit3 TestCase.
2015-12-08 14:53:50 +00:00
Torsten Grote
c57014e92b
Merge branch '162-build-with-latest-sdk' into 'master'
...
Build with SDK 23, continue to target SDK 22. #162
This will allow people to download Android Studio, check out and build the project without extra steps. Compiling with the latest SDK is recommended even if your target is older (as ours is).
See merge request !6
2015-12-08 14:10:07 +00:00
akwizgran
9158514abf
Recompile H2 with OpenJDK 6.
...
H2 was failing to load its driver class on OpenJDK 6 because the code was compiled for Java 7.
2015-12-08 14:00:08 +00:00
Torsten Grote
f4538df679
Touching startup failure notification now shows details
...
The text of the startup failure notification is unhelpful due to lack of
space. Touching the notification now launches an activity that gives details
of the problem and what can be done about it.
Closes #38
2015-12-08 11:52:20 -02:00
akwizgran
eb2ff92161
Build with SDK 23, continue to target SDK 22. #162
2015-12-08 13:06:04 +00:00
akwizgran
f0558ceb7a
Merge branch '159-improve-setup-errors' into 'master'
...
Show setup page error messages by the relevant text box
Closes #159
See merge request !3
2015-12-08 12:59:30 +00:00
akwizgran
2b71e70144
Merge branch '100-hide-strength-meter' into 'master'
...
Hide password strength meter when confirming password
Closes #100
I opted to hide the strength meter because:
* more extensive changes would have been required to set the strength meter to 100% red.
* IMHO it would lead to confusion as to the meaning of the strength meter.
* the "passwords do not match" error should eventually become a proper error of the confirm EditText, not a separate label.
See merge request !2
2015-12-08 12:57:43 +00:00
akwizgran
d11e7e96c0
Merge branch '150-clear-password-field' into 'master'
...
Clear the password field if wrong password is entered
Closes #150
See merge request !1
2015-12-08 12:55:48 +00:00
akwizgran
e4ac6d3afd
Create hidden service in a subdirectory. #161
...
The permissions for the parent directory are too permissive (775) for Tor 0.2.7.5. The subdirectory is created with permissions 700.
2015-12-08 12:26:00 +00:00
Ernir Erlingsson
6d07a66063
improved git ignore
2015-12-08 11:05:03 +01:00
str4d
383cb651bc
Show setup page error messages by the relevant text box
2015-12-08 07:13:14 +00:00
str4d
11deb5728f
Hide password strength meter when confirming password
2015-12-08 06:49:55 +00:00
str4d
ceef31599b
Clear the password field if wrong password is entered
2015-12-08 06:06:16 +00:00
akwizgran
061479dd68
Set source and target version to Java 6 in subprojects.
2015-12-04 10:12:01 +00:00
akwizgran
3872265d55
Upgraded Tor to 0.2.7.5 with OpenSSL 1.0.2e. #148
2015-12-03 21:46:16 +00:00
akwizgran
1dc75c1b9f
We don't need to bundle SortJar.
2015-12-03 17:14:13 +00:00
akwizgran
53f6f24d53
Don't enable Bluetooth by default. #99
2015-12-03 17:13:49 +00:00
akwizgran
8529c976c2
Renamed a bunch of lock variables.
...
"synchLock" will become confusing when we have lots of objects with "sync" in the name.
2015-12-03 16:39:53 +00:00
akwizgran
4f59491c9f
Upgraded Tor to 0.2.6.9 with OpenSSL 1.0.2d.
2015-12-03 16:21:55 +00:00
akwizgran
f34721adfb
FFS, Android Studio loves to mess with the Gradle config.
2015-12-03 12:10:54 +00:00
akwizgran
7bc08b2de7
Updated Gradle wrapper.
2015-12-03 12:10:36 +00:00
akwizgran
08e7cc8e0c
Updated Gradle wrapper.
2015-12-03 11:56:49 +00:00
akwizgran
2d346f7b73
Fixed library paths in Android Studio project files.
2015-12-03 11:33:46 +00:00
akwizgran
ecf35563cb
Bring your own gradle.
2015-12-03 11:13:27 +00:00
akwizgran
8ae3fb3e35
Upgraded Spongy Castle to 1.53, fixed tests. #146
2015-12-03 11:12:16 +00:00
akwizgran
427efdc7d6
Raise minimum Java version to 6, upgrade H2. #24
2015-12-02 14:59:51 +00:00
akwizgran
2b12f0d438
Set source and target to Java 6 in Android Studio.
2015-12-02 13:25:06 +00:00
akwizgran
c65ea9a896
Source should be Java 6, don't use diamond operator.
2015-12-02 13:22:23 +00:00
