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,428 Commits 133 Branches 207 Tags
e8c54a609c84c02f09dc8bee93f32350dc15ab0d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
akwizgran e8c54a609c Upgrade Gradle Witness. 2017-11-21 16:35:03 +00:00
akwizgran ece2c51358 A few more Java 8 changes in merged code. 2017-11-21 16:21:15 +00:00
akwizgran 3ec8af4661 Merge branch 'use-java-8-language-features' into 'master' 
Use java 8 language features

See merge request !621
 2017-11-21 15:22:52 +00:00
akwizgranandTorsten Grote 879f699b2b A few more lambdas. 2017-11-21 10:51:37 -02:00
akwizgranandTorsten Grote d7383a3361 Effectively final. 2017-11-21 10:51:35 -02:00
akwizgranandTorsten Grote a5b321a93b Multi-catch. 2017-11-21 10:49:10 -02:00
akwizgranandTorsten Grote 5fa6b0ca1c Lambdas. 2017-11-21 10:49:08 -02:00
akwizgranandTorsten Grote 27328afe3c Diamond operators. 2017-11-21 10:45:47 -02:00
akwizgranandakwizgran d6a7e6d52c Resolve merge conflicts. 
# Conflicts:
#   briar-android/build.gradle
#   briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java
 2017-11-21 10:27:31 +00:00
akwizgran df99b3b666 Merge branch '1085-startup-wizard' into 'master' 
Setup Wizard that asks for Doze Mode exception

Closes #1085 and #1018

See merge request !603
 2017-11-21 09:40:10 +00:00
akwizgranandTorsten Grote 0f1c9f4fe2 Refactored tests for account setup and changing password. 2017-11-20 14:11:31 -02:00
akwizgran 1c4f20f76f Merge branch 'simply-build-gradle' into 'master' 
Simply bramble-androids's build.gradle

See merge request !622
 2017-11-17 16:11:00 +00:00
akwizgran e30e34f342 Include java.lang.invoke classes in bootstrap classpath. 2017-11-16 15:26:05 +00:00
akwizgran fc93ced067 Download the Android support repository for CI. 2017-11-16 12:54:57 +00:00
akwizgran bb7df72d31 Compile against OpenJDK 6 standard library for CI. 2017-11-16 12:54:50 +00:00
akwizgran f8425658e4 Support Java 8 language features in Java modules. 2017-11-16 11:46:35 +00:00
akwizgran 53c8cf09b6 Support Java 8 language features in Android modules. 2017-11-16 11:46:34 +00:00
akwizgran 9f29bf4949 Upgrade Gradle and Android Gradle plugin 2017-11-16 11:46:32 +00:00
akwizgran 98e2adf794 Fix Dagger setup, remove android-apt plugin. 2017-11-16 11:46:02 +00:00
akwizgran 773ae73820 Updated translations. 2017-11-09 12:05:21 +00:00
akwizgran 009db57bc5 Merge branch '482-delete-old-transport-property-updates' into 'master' 
Delete old transport property updates

Closes #482

See merge request !617
 2017-11-09 11:59:00 +00:00
akwizgran 5e98126e77 Completely remove old local updates from the database. 2017-11-09 10:58:51 +00:00
akwizgran bd7ebfd83a Unit tests for TransportPropertyManagerImpl. 2017-11-08 16:44:26 +00:00
akwizgran 10f41ef157 Log network usage at shutdown. 2017-11-08 14:46:56 +00:00
akwizgran 1dd4960109 Transactions that delete old updates must be read-write. 2017-11-08 14:23:30 +00:00
akwizgran 75413b6c86 Delete old transport property updates. 
Some of this code is only needed for backward compatibility - it can be removed when we break compatibility for 1.0.
 2017-11-08 09:47:59 +00:00
akwizgran b2180582a7 BdfList and BdfDictionary don't need to be thread-safe. 
Same goes for Metadata.
 2017-11-06 15:20:21 +00:00
akwizgran e6b1597fa7 Upgraded Gradle to 3.5. 2017-10-26 18:07:20 +01:00
akwizgran 8937d3cd9c Updated translations. 2017-10-24 17:01:11 +01:00
akwizgran 51f320d147 Merge branch '992-wake-lock-tag' into 'master' 
Change wake lock tag

Closes #992 and #1087

See merge request !612
 2017-10-24 13:36:26 +00:00
akwizgran 220f678403 Removed unused location permission. 2017-10-18 14:05:11 +01:00
akwizgran 4173fc4daa Merge branch '1045-preference-divider' into 'master' 
Don't use a custom widget to separate preference categories

Closes #1045

See merge request !609
 2017-10-17 17:03:13 +00:00
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 4fe4c298d7 Don't use a custom widget to separate preference categories. 2017-10-11 17:35:05 +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