Commit Graph

1649 Commits

Author SHA1 Message Date
akwizgran
0aaa2a27ba Don't align if wrapped. 2015-12-14 16:00:40 +00:00
akwizgran
bd2649939a Don't align arguments in method declarations. 2015-12-14 15:55:57 +00:00
akwizgran
b03499ab10 Merge branch 'add-coding-style' into 'master'
Add Coding Style to git

This change adds the coding style file of AndroidStudio to git to be shared and used by all devs for a consistent coding style.

Feel free to adjust the coding style in case this does not properly reflect the current coding style used for the current code in all details.

See merge request !16
2015-12-14 15:54:33 +00:00
Torsten Grote
7bef4104b2 add coding style file to git to be shared and used by all devs 2015-12-14 11:47:02 -02:00
akwizgran
878a70620d Merge branch 'file-utils-refactoring' into 'master'
File utils refactoring

After Ernir merged the two FileUtils implementations I realised two of the three methods are no longer needed and the third can just be a static method, like StringUtils etc.

This patch also fixes a layout problem with PasswordActivity on the Galaxy Nexus - the progress wheel was showing up in the wrong place. (You need a slow phone to notice!)

See merge request !12
2015-12-14 10:37:34 +00:00
akwizgran
f71596c258 Align progress wheel with button. 2015-12-11 11:32:51 +00:00
akwizgran
2687e79593 Refactored FileUtils.
Removed methods that are no longer needed for Java 6, moved the remaining method into the utils directory.
2015-12-10 16:21:47 +00:00
akwizgran
912ba394c5 Refactored FileUtils.
Removed methods that are no longer needed for Java 6, moved the remaining method into the utils directory.
2015-12-10 15:58:52 +00:00
akwizgran
947da886bf Fixed broken tests. 2015-12-10 15:14:50 +00:00
akwizgran
c83d30ba20 Merge branch '46-improve-message-status-indicators' into 'master'
Improve how the status of messages is indicated.

Remove the Toast that always says 'Message Sent' and show graphical
indicators instead that show either:
* message is waiting to be sent
* message was sent (or requested to be sent)
* message was delivered

Please note that I didn't change the icons and did not migrate the UI to XML files to keep my change minimally invasive.

Closes #46

See merge request !9
2015-12-10 13:36:14 +00:00
Torsten Grote
aa7d7642bf make message status persistent and initialize it from database 2015-12-10 11:25:41 -02:00
Torsten Grote
0a8c42b939 Improve how the status of messages is indicated.
Remove the Toast that always says 'Message Sent' and show graphical
indicators instead that show either:
* message is waiting to be sent
* message was sent (or requested)
* message was delivered
2015-12-10 10:11:27 -02:00
akwizgran
18d566ecd2 Merge branch '40-forgotten-password' into 'master'
40 forgotten password

* Moved the UI definition over to XML and added the forgotten password button
* Code encapsulation in a new Base activity also enabling re-use between activities/fragments 

Closes #40 

See merge request !10
2015-12-10 10:40:45 +00:00
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