Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-08-10 19:50:20 +02:00
Code Issues Projects Releases Wiki Activity
3,384 Commits 133 Branches 207 Tags
6731f6eeb55086af37f952499f90870fa7f3baf1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
akwizgran 6731f6eeb5 Added checksum for Gradle download. 2017-10-17 17:01:46 +01:00
akwizgran 6f7f8b40e3 Upgraded Gradle plugin and build tools. 2017-10-17 15:31:28 +01:00
akwizgran 1a83b2c99b Bumped version number for beta release. 2017-10-17 09:41:11 +01:00
akwizgran cee4e1305e Merge branch 'extend-expiry' into 'master' 
Extend expiry and show a green snackbar about it once

See merge request !606
 2017-10-12 17:03:26 +00:00
akwizgran a1f989c43c Use black text for the expiry extension notice. 2017-10-12 17:51:57 +01:00
akwizgran b67abadbac Use a setting to record whether update notice has been shown 2017-10-12 17:51:57 +01:00
akwizgran 13d35229d5 Merge branch '1091-reduce-polling-queries' into 'master' 
Reduce number of DB queries used when polling for connections

Closes #1091

See merge request !604
 2017-10-11 13:45:14 +00:00
akwizgran b221d21903 Accept all SDK license agreements for CI runner. 2017-10-11 14:18:02 +01:00
akwizgran ed26ab78a5 Merge branch '158-permission-requests' into 'master' 
Add permission requests for Android 6+

Closes #158

See merge request !601
 2017-10-10 10:40:14 +00:00
akwizgran 3c95988693 Merge branch '539-clear-notifications' into 'master' 
Don't show dismissed notifications again when items are removed

Closes #539

See merge request !600
 2017-10-02 14:46:54 +00:00
akwizgran fc5c3b470e Merge branch 'patch-1' into 'master' 
Contacts, on your side

See merge request !594
 2017-10-02 13:14:00 +00:00
akwizgran 6b9010c557 Merge branch '703-create-test-data' into 'master' 
Add an option to debug builds to create fake test data

Closes #703

See merge request !595
 2017-09-28 10:37:03 +00:00
akwizgran 2a141e0a97 Merge branch 'disableAaptCruncher' into 'master' 
Disable PNG crunching for reproducibility

See merge request !596
 2017-09-27 16:04:23 +00:00
akwizgran d6900be68e Merge branch '1051-fix-pink' into 'master' 
Fix pink navigation drawer items with current support library

Closes #1051

See merge request !598
 2017-09-27 16:02:22 +00:00
Michael Rogers ef2286ab53 Bumped version number for beta release. 2017-09-20 14:51:10 +01:00
akwizgran 47b25f3221 Merge branch '1064-rss-date-npe' into 'master' 
Fix NPE when some RSS items don't have dates and add test

Closes #1064

See merge request !591
 2017-09-20 12:21:06 +00:00
akwizgran d0fc04251d Merge branch 'three-new-langs' into 'master' 
Add Norwegian Bokmål, Occitan (post 1500) and Serbian

See merge request !593
 2017-09-20 11:15:44 +00:00
akwizgran dcbb41eb7a Merge branch '1069-forum-sharing-exception' into 'master' 
Fix crash when sharing a forum while it was just shared with us

Closes #1069

See merge request !592
 2017-09-20 11:14:20 +00:00
akwizgran 99d8cc64a6 Merge branch '1024-message-tree-npe' into 'master' 
Don't add threaded messages to the UI before their parents

Closes #1024

See merge request !585
 2017-09-19 15:37:58 +00:00
akwizgran 329a4c64f6 Merge branch '1028-lost-reply-id' into 'master' 
Keep the reply ID up to date in ThreadListActivity

Closes #1028

See merge request !587
 2017-09-18 15:10:38 +00:00
Michael Rogers d24b1884a2 Removed old Bluetooth code and the location permission it requires. 2017-08-11 12:42:47 +01:00
Michael Rogers 078534889e Bumped version number for beta release. 2017-08-04 15:16:51 +01:00
akwizgran 18f43f3bc1 Merge branch '871-rss-feeds-lost' into 'master' 
Fix bug where RSS feeds got lost when a fetching error occured

Closes #871

See merge request !583
 2017-08-04 13:52:26 +00:00
akwizgran a4118b40e1 Merge branch 'debug-build-alongside-beta' into 'master' 
Make debug builds installable alongside official beta build

See merge request !582
 2017-08-02 16:54:25 +00:00
akwizgran 35aad409fd Merge branch '994-notification-sound-delay' into 'master' 
Always play a notification sound, if at least 2sec after last one

Closes #994

See merge request !581
 2017-08-01 16:20:35 +00:00
Michael Rogers aafddcd0f0 Bumped version number for beta release (for real this time). 2017-08-01 16:43:47 +01:00
akwizgran 69bfb72171 Merge branch '1002-cam-get-params-npe' into 'master' 
Catch RuntimeException when getting camera parameters

See merge request !579
 2017-08-01 13:56:45 +00:00
akwizgran 6702df1e22 Merge branch '1008-qr-decoding-crash' into 'master' 
Catch IllegalArgumentException when decoding QrCode

Closes #1008

See merge request !578
 2017-08-01 13:36:09 +00:00
akwizgran 9df624c62a Merge branch '1009-camera-npe' into 'master' 
Prevent NPE in CameraView

Closes #1009 and #997

See merge request !577
 2017-08-01 13:29:33 +00:00
Michael Rogers 050191f0ef Bumped version number for beta release. 2017-08-01 12:31:47 +01:00
akwizgran 4b5a19ce5d Merge branch 'update-translations' into 'master' 
Update translations, add Turkish and Russian

See merge request !575
 2017-08-01 09:28:17 +00:00
akwizgran 7c4dd991b9 Merge branch '1016-reblog-runtime-error' into 'master' 
Runtime error fix due to window requests

Closes #1016 and #1007

See merge request !576
 2017-08-01 09:25:39 +00:00
Michael Rogers a9437f7985 Bumped version number for beta release. 2017-07-28 18:01:19 +01:00
akwizgran 8141a97fc9 Merge branch '1015-recent-emoji-crash' into 'master' 
Prevent a crash caused by empty emoji

Closes #1015

See merge request !571
 2017-07-28 16:59:02 +00:00
akwizgran 29f658cf4d Merge branch '1006-blog-crash' into 'master' 
Prevent crash in blog by ensuring a listener always exists

Closes #1006

See merge request !574
 2017-07-28 15:53:43 +00:00
akwizgran ca83744a84 Merge branch 'close-feed-stream' into 'master' 
Close InputStream from RSS feed and prevent NPE

See merge request !572
 2017-07-28 15:48:01 +00:00
Michael Rogers 3800cd5e4f Bumped version number for beta release. 2017-07-28 11:17:09 +01:00
akwizgran 259f2cd419 Merge branch '993-fix-full-text-blog-posts' into 'master' 
Show blog posts with full text when clicked

Closes #993

See merge request !570
 2017-07-26 11:01:38 +00:00
akwizgran a9024aa34b Merge branch '955-shared-with-update' into 'master' 
Fix "shared with" counter not being updated

Closes #955

See merge request !569
 2017-07-25 17:40:40 +00:00
akwizgran d4e3b7842c Merge branch 'blog-sharing-tests' into 'master' 
Add unit tests for BlogSharingManager

See merge request !567
 2017-07-25 17:40:29 +00:00
akwizgran 4ecf7c02d0 Merge branch '979-duplicate-blog-session' into 'master' 
Fix Blog Sharing Sessions

Closes #979

See merge request !566
 2017-07-21 10:27:21 +00:00
akwizgran 7e749124bf Merge branch '617-protocol-versioning' into 'master' 
Protocol versioning for BTP

See merge request !557
 2017-07-17 09:24:35 +00:00
akwizgran dfb71a7978 Merge branch '942-block-blog-notifications' into 'master' 
Block blog notifications when viewing combined feed

See merge request !563
 2017-07-07 16:32:07 +00:00
akwizgran de2ea112ee Merge branch '933-beta-warning' into 'master' 
Show Beta Expiry Warning

Closes #933

See merge request !559
 2017-07-07 12:19:04 +00:00
akwizgran a8a9b9032d Merge branch 'warn_on_extra_translation' into 'master' 
Show a warning instead of throwing an error for unused translations

See merge request !561
 2017-07-07 12:01:23 +00:00
akwizgran 95e8fd7ee0 Merge branch 'notify_more_agressively' into 'master' 
Notify more aggressively

See merge request !555
 2017-07-05 11:36:37 +00:00
akwizgran 613a7fe376 Merge branch '962-removing-contacts' into 'master' 
Add test where two contacts remove each other

Closes #962

See merge request !558
 2017-07-04 15:14:27 +00:00
akwizgran 3e31da99b5 Merge branch '106-beta-namespace' into 'master' 
Change app name and package name for beta release

Closes #106

See merge request !545
 2017-07-04 14:40:47 +00:00
akwizgran ecf7cf14ae Merge branch '957-rss-url-case-sensitivity' into 'master' 
Handle RSS URLs case-insensitively

Closes #957

See merge request !544
 2017-07-03 16:22:52 +00:00
akwizgran 09e2a15a73 Merge branch '951-remove-visibility-indicators' into 'master' 
Remove visibility indicators from private group join messages

Closes #951

See merge request !546
 2017-07-03 16:22:31 +00:00
Michael Rogersandakwizgran 41e5928cca Validate and normalise RSS URLs. 2017-07-03 16:36:50 +01:00
akwizgran 6a419c0c7b Merge branch '968-downgrade-h2' into 'master' 
Downgrade H2 to 1.4.192

Closes #968

See merge request !550
 2017-07-03 11:51:35 +00:00
akwizgran 01971768ce Merge branch '970_settings_use_summaries' into 'master' 
Split notification settings into title and summary.

Closes #970

See merge request !554
 2017-07-03 11:19:15 +00:00
akwizgran ef7483ab01 Merge branch '787-tapping-blog-author-opens-same-blog' into 'master' 
Don't reopen the same blog when the author is tapped

Closes #787

See merge request !551
 2017-07-03 10:43:15 +00:00
akwizgran 527d11473d Merge branch '805-introduction-message-layout' into 'master' 
Use smaller layout for introduction message screen

Closes #805

See merge request !552
 2017-07-03 10:40:10 +00:00
akwizgran 775dadc9a0 Merge branch '904-notify-tor-controller' into 'master' 
Notify Tor controller if Tor has crashed

Closes #904

See merge request !543
 2017-07-03 09:29:04 +00:00
akwizgran 800b10a988 Merge branch '956-tap-protection-ux' into 'master' 
Don't show tap protection dialog until it's needed

Closes #956

See merge request !548
 2017-07-03 09:22:31 +00:00
akwizgran ea6e8303b0 Merge branch '954_dont_show_on_startup_failure' into 'master' 
Don't show screenfilter warning in StartupFailureActivity

See merge request !539
 2017-05-29 09:05:18 +00:00
akwizgran 1ad3a6646e Merge branch '941-store-correct-parent-id' into 'master' 
Store correct original parent ID when rewrapping blog posts

See merge request !534
 2017-05-12 09:53:27 +00:00
akwizgran 2d10f6b2bd Merge branch '884-emoji-text-view-layout-bug' into 'master' 
Remove ellipsizing support from EmojiTextView

Closes #884

See merge request !533
 2017-05-12 09:35:33 +00:00
akwizgran 5b05424d83 Merge branch 'master' into '941-store-correct-parent-id' 
# Conflicts:
#   briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
 2017-05-12 09:34:24 +00:00
akwizgran 0826022d82 Merge branch 'bring_annotations_in_line' into 'master' 
Bring nullable annotation imports in line

See merge request !536
 2017-05-12 09:33:00 +00:00
akwizgran a901bfb9cb Merge branch '948-vector-crash' into 'master' 
Remove scientific notation from vector drawables to prevent crashes

Closes #948

See merge request !537
 2017-05-12 09:28:59 +00:00
akwizgran 03cdce122a Merge branch '947-bluetooth-address-crash' into 'master' 
Don't crash on empty bluetooth addresses

See merge request !538
 2017-05-12 09:26:57 +00:00
akwizgran 2841339cac Merge branch '468-ci' into 'master' 
Set up basic CI

Closes #468

See merge request !530
 2017-05-05 09:11:06 +00:00
akwizgran 9fd6d46583 Merge branch '871-increase-socket-timeout' into 'master' 
Increase socket timeout for Tor sockets

See merge request !519
 2017-04-19 16:53:59 +00:00
akwizgran 46920f3bce Merge branch '892-separate-rss-blog' into 'master' 
Separate RSS posts from personal blog posts

Closes #892

See merge request !520
 2017-04-13 10:15:00 +00:00
akwizgran 9755cd9ab4 Merge branch '891-messages-not-acked' into 'master' 
Fix MessageId calculation for deprecated MessageQueue

Closes #891

See merge request !514
 2017-04-11 12:49:44 +00:00
akwizgran 6d2b18facc Merge branch '799-explain-content-visibility' into 'master' 
Show explanation about visibility in member lists

Closes #799

See merge request !516
 2017-04-07 14:54:41 +00:00
akwizgran a1e65c9fa7 Merge branch '893-double-introduction-accept' into 'master' 
Prevent conversation actions from being executed twice

Closes #893

See merge request !512
 2017-04-07 14:03:40 +00:00
akwizgran 74f1fa5690 Merge branch '932-panic-button-terminate-process' into 'master' 
Terminate the process after handling a panic trigger

Closes #932

See merge request !513
 2017-04-07 12:49:52 +00:00
akwizgran 6b3a1fd6d4 Merge branch 'fix-test-configuration' into 'master' 
Fix "all tests" configuration

See merge request !509
 2017-04-07 10:19:01 +00:00
akwizgran bcabcfce8c Merge branch '925_panic_app_market' into 'master' 
Refine the panic app list tap behavior

Closes #925

See merge request !511
 2017-04-07 10:17:48 +00:00
akwizgran 9d0dbe9210 Merge branch '885_store_only_four_lan_ip' into 'master' 
Store only 4 ip addresses because 5 exceed the maximum length.

Closes #885

See merge request !510
 2017-04-06 14:38:49 +00:00
akwizgran 1f7d1bf515 Merge branch '675-polite-executor' into 'master' 
Use a polite executor for validation tasks

Closes #675

See merge request !507
 2017-04-06 14:37:59 +00:00
akwizgran a931e6b316 Merge branch '906_tapjacking' into 'master' 
Add tapjacking protection

Closes #906

See merge request !502
 2017-04-06 14:31:10 +00:00
akwizgran 7bc269fda4 Merge branch '914-simpler-secure-random' into 'master' 
Remove Fortuna generator, fix Android SecureRandom bug

Closes #914

See merge request !500
 2017-04-05 10:55:25 +00:00
akwizgran a22931bae6 Merge branch '928-move-html-sanitation-to-dbthread' into 'master' 
Move HTML Sanitation to DbThread

Closes #928

See merge request !506
 2017-04-04 16:54:21 +00:00
akwizgran 403f886110 Merge branch '910-fix-intent-hijacking' into 'master' 
Fix possible intent hijacking for implicit pending intents

Closes #910

See merge request !499
 2017-04-04 16:34:38 +00:00
akwizgran a1b415330e Merge branch '926-class-cast-exception' into 'master' 
Don't cast Context to BaseActivity

Closes #926

See merge request !505
 2017-04-04 12:44:38 +00:00
akwizgran 199a2ffc46 Merge branch '909-prevent-multiple-password-screens' into 'master' 
Prevent multiple instances of PasswordActivity

Closes #909

See merge request !504
 2017-03-31 13:42:04 +00:00
akwizgran f039bd1239 Merge branch '909-restrict-access-to-panic-prefs' into 'master' 
Don't allow other apps to open the panic prefs activity

See merge request !503
 2017-03-31 08:25:21 +00:00
akwizgran 10e6163e94 Merge branch '915-fix-forumactivitytest' into 'master' 
Fix ForumActivityTest

Closes #915

See merge request !496
 2017-03-30 08:19:30 +00:00
akwizgran 9c89e83c20 Merge branch '913-simpler-password-strength-estimation' into 'master' 
Simpler password strength estimation

Closes #913

See merge request !495
 2017-03-29 15:01:44 +00:00
akwizgran adc9bdeb68 Merge branch 'run-configurations' into 'master' 
Run configurations for tests

See merge request !498
 2017-03-29 08:18:05 +00:00
akwizgran 2574354997 Merge branch '905_set_testing_constant_on_debug' into 'master' 
Set TESTING from BuildConfig

Closes #905

See merge request !494
 2017-03-28 12:30:00 +00:00
akwizgran 1918346ae8 Merge branch '911-link-sanitation' into 'master' 
Sanitize all HTML before displaying it

Closes #911

See merge request !493
 2017-03-27 09:45:17 +00:00
akwizgran 2a59515c72 Merge branch '907-panic-signout' into 'master' 
Require a panic app to be set before executing any panic actions

Closes #907

See merge request !492
 2017-03-27 09:43:30 +00:00
akwizgran 7161152b41 Merge branch '903_replace_Runtime_with_ProcessBuilder' into 'master' 
Use ProcessBuilder instead of Runtime to start tor

See merge request !487
 2017-03-27 09:37:00 +00:00
akwizgran b42660edab Merge branch 'emoji-soft-reference' into 'master' 
Fix potential NPE when getting soft reference

See merge request !490
 2017-03-27 09:28:30 +00:00
akwizgran b405bbf98e Merge branch 'setting-to-disable-tor' into 'master' 
Add a setting to disable Tor

See merge request !489
 2017-03-27 09:27:56 +00:00
akwizgran a9053808b4 Merge branch '908-rss-import-dns-leak' into 'master' 
Don't make DNS lookups during RSS import

Closes #908

See merge request !488
 2017-03-24 10:02:19 +00:00
akwizgran d9a62a0431 Merge branch 'print_tor_errors' into 'master' 
Make Tor boot more verbose

See merge request !486
 2017-03-24 10:01:29 +00:00
akwizgran 15ba73276d Merge branch '900-remove-error-state' into 'master' 
Remove error state and reset session on error instead

Closes #900

See merge request !484
 2017-03-24 09:57:03 +00:00
akwizgran 0ae55404f5 Merge branch '900-simplify-sharing-client-state-machine' into 'master' 
Remove REMOTE_LEFT state from sharing client state machine

See merge request !483
 2017-03-23 16:13:44 +00:00
akwizgran 2fb11fba2a Merge branch '877-save-invitation-outcome-to-invitation-message-and-make-available-to-ui' into 'master' 
Store invitation outcome in metadata and make it available to the UI

This MR is based on !479 and should only be merged after that one has been merged as well.

It stores the invitation outcome in the message metadata  and includes it in the `canBeOpened()` calculation for private groups and sharables.

Closes #877

See merge request !480
 2017-01-06 16:06:19 +00:00
akwizgran 1d11857e75 Merge branch '476-blog-sharing-protocol-modifies-state-external-to-session' into 'master' 
Migrate blog sharing to new sharing client infrastructure

This MR contains a second small commit that fixes #816 and adds a test for it.

Closes #476, #701

See merge request !479
 2017-01-06 16:04:17 +00:00
akwizgran d5443e9651 Merge branch '889-select-navdrawer-item-when-coming-from-notification' into 'master' 
Check the blog item in NavDrawer when opening a blog via notification

There are three scenarios where the selected item in the NavDrawer changes:
1. The user selects an item -> the item is checked automatically.
2. The user pressed back -> already handled in onBackPressed (needs to be extended with #606)
3. The user touched a notification -> handled by this commit.
   
Signed-off-by: goapunk <noobie@goapunks.net>

Closes #889

See merge request !481
 2017-01-06 14:59:21 +00:00
akwizgran d5f9a3280d Merge branch 'briar-recycler-view-log' into 'master' 
Stop periodic list update only once

When testing the forum unread code, I noticed the recycler view is detaching twice. Once because the stop method is called and once because the view detaches from the window. Wouldn't it be safe to null the refresher when the updates are stopped?

See merge request !478
 2017-01-06 14:15:48 +00:00
akwizgran deb8787668 Merge branch '879-threaded-unread-messages' into 'master' 
Threaded Unread Handling

![unread](/uploads/457c3bc36c897d683ff8161b4f3a344c/unread.mp4)

This leaves in the collapsing code for now and just hides the UI element for collapsing. The code can be removed in a second pass to simplify the adapter.

Closes #879

See merge request !476
 2017-01-04 11:12:24 +00:00