Commit Graph

785 Commits

Author SHA1 Message Date
akwizgran
3b65144ff6 Merge branch '154-ongoing-notification' into 'master'
Set ongoing notification to minimum priority

Setting the priority of the ongoing notification to PRIORITY_MIN prevents it from being shown in the status bar on Android 4.1 and later. The service still runs in the foreground.

Thanks to @str4d for finding the solution. Closes #154.

See merge request !169
2016-05-03 14:59:19 +00:00
akwizgran
a655df7317 Merge branch '322-prepare-new-forum-sharing' into 'master'
Prepare for new Forum Sharing Client

Methods for creating, adding and removing forums have been moved to the
`ForumManager`. In order to still handle removing forums properly, a
`RemoveForumHook` has been introduced.

Methods for sharing forums with all current and future contacts have
been removed along with the localGroup where this information was saved.

The `ShareForumActivity` now has the proper label.

The `SessionId` and the `ProtocolEngine` have been moved to the
`clients` package.

This addresses part of #322 and part of what has been discussed in #320.

See merge request !156
2016-05-03 14:54:43 +00:00
Torsten Grote
9f9a216305 Prepare for new Forum Sharing Client
Methods for creating, adding and removing forums have been moved to the
`ForumManager`. In order to still handle removing forums properly, a
`RemoveForumHook` has been introduced.

Methods for sharing forums with all current and future contacts have
been removed along with the localGroup where this information was saved.

The `ShareForumActivity` now has the proper label.

The `SessionId` and the `ProtocolEngine` have been moved to the
`clients` package.

This addresses part of #322 and part of what has been discussed in #320.
2016-05-03 11:48:45 -03:00
akwizgran
bba999478f Merge branch '314-tor-sleep' into 'master'
Hold a wake lock while Tor is connected to the internet

This is a partial fix for #314. As noted on that ticket, if a Tor connection is lost for any reason other than the device sleeping, the plugin won't try to replace the lost connection. I'm leaving the ticket open until that more general issue is solved.

The Tor plugin uses several variables to keep track of its connectivity status. This patch refactors those variables into an inner class to improve readability and ensure they're accessed atomically. However, it's still possible for the plugin's state to become inconsistent with the state of the Tor process. For example, calls to updateConnectionStatus() may run concurrently on the IO executor, so their calls to enableNetwork() may be interleaved. As usual, locking would solve this problem but create the potential for deadlock, so I won't try to solve it in this patch.

See merge request !168
2016-05-03 14:45:42 +00:00
akwizgran
400a11e3b0 Renamed circuit status method. 2016-05-03 15:41:59 +01:00
akwizgran
189efe8d97 Merge branch '316-mobile-data-setting' into 'master'
Fix name of Tor mobile data setting

Closes #316.

See merge request !167
2016-05-03 14:39:22 +00:00
akwizgran
b57b65e803 Merge branch '331-viewfinder' into 'master'
Reinitialise viewfinder when camera view is shown

Thanks to @str4d for finding the cause of the bug. Closes #331.

See merge request !165
2016-05-03 14:38:37 +00:00
akwizgran
160adca198 Merge branch 'use-android-executor' into 'master'
Use Android executor for background API calls

Some Android API calls need to be made from a thread with a message queue, but to keep the UI responsive they shouldn't be made from the UI thread.

This patch gives AndroidExecutor a captive thread with a message queue to execute tasks, and converts various background tasks from creating their own threads to using AndroidExecutor and IoExecutor.

This allows us to upgrade the support library to 23.2.1. Fixes #332.

See merge request !161
2016-05-03 14:34:49 +00:00
akwizgran
3d4abee1a4 Merge branch '305-forum-list-snackbar' into 'master'
Add Snackbar and Toolbar Button to Forum List

This MR is a small change that replaces the custom UI elements in
the forum list with a Snackbar and a Toolbar menu.

It also fixes a background color that was still present with fragment from the NavDrawer.

Before:

![before](/uploads/6dcc545827c035dcffcdf7863893753e/before.png)

After:

![after](/uploads/427de01d8bec779ee81e6ebded3fcd2b/after.png)

It addresses one part (2b) of #305 and is part of #121.


See merge request !163
2016-05-03 13:51:44 +00:00
akwizgran
25b165ac1e Set ongoing notification to minimum priority. #154 2016-05-03 14:14:15 +01:00
akwizgran
a0f22ec3d1 Refactored connection status variables into inner class. 2016-05-03 11:55:49 +01:00
akwizgran
f58ee13244 Reset connection status when enabling network. 2016-05-03 11:53:27 +01:00
akwizgran
63d849b684 Hold partial wake lock to keep Tor connections alive. 2016-05-03 11:53:23 +01:00
akwizgran
c35cad9719 Fixed name of Tor mobile data setting. #316 2016-05-03 11:43:25 +01:00
akwizgran
7ad21708fe Reinitialise viewfinder when camera view is shown. #331 2016-05-03 09:53:09 +01:00
akwizgran
ea973b61c6 Bumped expiry date to 1 June 2016. 2016-05-02 17:02:01 +01:00
Torsten Grote
82e1ef0ea6 Add Snackbar and Toolbar Button to Forum List
This commit is a small change that replaces the custom UI elements in
the forum list with a Snackbar and an Toolbar menu.

Addresses one part (2b) of #305
2016-05-02 13:00:19 -03:00
akwizgran
237a89d5c2 Upgraded support library to 23.2.1. 2016-05-02 16:54:41 +01:00
akwizgran
0a088af010 Use IoExecutor for background IO tasks. 2016-05-02 16:54:40 +01:00
akwizgran
c21854fbe4 Use AndroidExecutor for background tasks that make API calls. 2016-05-02 16:54:35 +01:00
str4d
cb8bfeb2ce Merge branch '307-background-color' into 'master'
Change the window background system-wide

This also sneaks in some small UI modifications desired by @Megalox.

Closes #307

See merge request !157
2016-04-29 23:10:25 +00:00
akwizgran
c72e5be804 Removed old user feedback activity. #336 2016-04-29 22:54:37 +01:00
akwizgran
29071fcc79 Merge branch '325-briar-recycler-view' into 'master'
Don't allow 'this' to escape the constructor

Fixes #325.

See merge request !155
2016-04-29 21:20:02 +00:00
akwizgran
1777ab51fb Merge branch '124-encrypted-feedback' into 'master'
Implement encrypted feedback

Closes #124.

See merge request !138
2016-04-29 18:22:53 +00:00
akwizgran
860d06cefa Revert to support library 23.1.1. 2016-04-29 13:40:00 +01:00
akwizgran
9b060c74b6 Upgraded build tools. 2016-04-29 11:34:56 +01:00
Torsten Grote
bbc4ac99c1 This changes the window background system-wide
Closes #307
2016-04-28 11:07:20 -03:00
str4d
1a90d3c39f Don't save the user's email automatically from crash reports 2016-04-28 16:44:05 +12:00
str4d
c44b6a4095 Implement encrypted feedback 2016-04-28 16:44:01 +12:00
akwizgran
3bfef877ec Upgraded support library. 2016-04-27 18:17:50 +01:00
akwizgran
efd9976ade Upgraded Gradle to 2.10, Android plugin to 2.1.0. 2016-04-27 18:03:00 +01:00
akwizgran
4464a66463 Upgrade to Java 1.7 where possible. 2016-04-27 13:18:55 +01:00
akwizgran
f2fc0a43c9 Don't delete unsent reports on application start 2016-04-27 22:22:21 +12:00
akwizgran
d06a6e25cb Check that result of File#listFiles() is not null. 2016-04-27 22:22:21 +12:00
str4d
f73f0aa4ab Migrate crash reports to ACRA 2016-04-27 22:22:16 +12:00
akwizgran
8630f6f24f Don't allow 'this' to escape the constructor. 2016-04-26 10:03:28 +01:00
akwizgran
141d6497ef Removed unused layout code and imports. 2016-04-26 09:34:48 +01:00
akwizgran
11a4ca6b9c Merge branch '271-port-splash-and-create-forum' into 'master'
Converts the splash screen to XML format

Removes all programatic calls that modify the layout and uses the XML
resource instead.

See merge request !123
2016-04-26 08:13:29 +00:00
Torsten Grote
9ea7113423 Refactor ContactListAdapter to be reusable for other use cases.
This commit introduces an abstract `BaseContactListAdapter` which provides
most of the adapter logic. The original `ContactListAdapter` extends it to
show date and online status of the contacts.

The new `ContactChooserAdapter` which is used for introductions extends
the `ContactListAdapter` and adds logic for graying out contacts from
different identities than the currently used one.

A new `ContactSelectorAdapter` extends the `BaseContactListAdapter` and
allows to select multiple contacts. It offers a method to return a
collection of all selected `ContactId`s.

This commit also sneaks in an animation when the 'Share Forum' button
is clicked.

Closes #292
2016-04-25 13:50:31 -03:00
Santiago Torres
e535be6d18 WIP: Converts the splash screen to XML format
Removes all programatic calls that modify the layout and uses the XML
resource instead.
2016-04-25 12:19:48 -04:00
akwizgran
9918e93cc4 Merge branch '296-dialog-styling' into 'master'
Use consistent styling for dialogs. #296

Converted all dialogs to use the support library and the Briar theme, so they have a consistent Material Design appearance across all Android versions.

See merge request !152
2016-04-25 15:20:28 +00:00
akwizgran
3200a9f8f8 Merge branch '313-move-forum-buttons-to-toolbar' into 'master'
Move create forum post and share forum buttons in action bar

According to the designs in #305, the 'create forum post' and 'share forum' buttons will go into the in action bar.

In the spirit of keeping MRs small and to avoid conflicts with #306, I did this first and independently of future work.

This also introduces constants for the `GROUP_ID`, `FORUM_NAME` and `MIN_TIMESTAMP` as they were used for the two buttons.

Closes #313

See merge request !150
2016-04-25 13:57:14 +00:00
akwizgran
41c9916e8e Merge branch '293-remove-avatar-from-conversation' into 'master'
Remove avatar code and layout from ConversationActivity and ConversationAdapter

Please note that I have not been able to test this MR on an actual device as I have none at the moment :(

Closes #293

See merge request !148
2016-04-25 12:40:42 +00:00
akwizgran
3b8689f892 Tweaked introduction wording, use Collections.emptyList(). 2016-04-25 13:14:22 +01:00
akwizgran
7779319f9a Merge branch '295-show-declined-introductions' into 'master'
Show relevant introduction decline responses in the conversation

* If the user has already declined, we don't show that the other
  introducee has declined as well. The backend doesn't have that information, so
  this is compatible with the principle of showing what we know.
* If the user has already accepted or hasn't yet responded, we now show the
  decline response in the private conversation with the introducer. If
  the user hasn't yet responded, we hide the accept/decline buttons
  in the introduction request message.

Please note that I do not have three devices at the moment to test this MR in its entirety in practice. I created another test which is hopefully sufficient to ensure that the modifications are correct.

Closes #295 

See merge request !149
2016-04-25 12:07:13 +00:00
akwizgran
b5fc7cf724 Use consistent styling for dialogs. #296 2016-04-25 12:52:28 +01:00
akwizgran
1b08720200 Merge branch '123-encrypted-crash-reports' into 'master'
Encrypted crash reports

Part of #123.

See merge request !128
2016-04-25 10:17:53 +00:00
akwizgran
9b5d3ecb7a Added public key and placeholder onion address. 2016-04-21 16:07:51 +01:00
Torsten Grote
44b3d4c14f Move create forum post and share forum buttons in action bar
This also introduces constants for the GROUP_ID, FORUM_NAME and
MIN_TIMESTAMP as they were used for the two buttons.

Closes #313
2016-04-21 12:06:42 -03:00
Torsten Grote
11e6d64e4d Show relevant decline responses in the conversation
* If the user has already declined, we don't show that the other
  introducee has declined as well. The backend doesn't have that information, so
  this is compatible with the principle of showing what we know.
* If the user has already accepted or hasn't yet responded, we show the
  decline response in the private conversation with the introducer. If
  the user hasn't yet responded, we hide the accept/decline buttons
  in the introduction request message.

Messages an introducee receives in a `FINISHED` state are now being
ignored and deleted.

Closes #295
2016-04-21 11:08:15 -03:00