Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity
6,242 Commits 133 Branches 200 Tags
9dff8bd64ac2811b6d58c4ebd241077b0ffe45f3
Commit Graph

2881 Commits

Author SHA1 Message Date
akwizgran
35c2f60129 Merge branch 'master' into '2005-connect-via-bt-error' 
# Conflicts:
#   briar-android/src/main/java/org/briarproject/briar/android/conversation/BluetoothConnecter.java
 2021-05-06 13:03:46 +00:00
Daniel Lublin
fba028db03 Disable polling while doing connect-via-BT 2021-05-06 11:13:35 +02:00
akwizgran
cad5edcf86 Move input state methods to UiUtils. 2021-05-05 16:57:25 +01:00
akwizgran
38f70bb6be Add full stop. 2021-05-05 13:02:56 +01:00
akwizgran
33bdc81b3e Show instructions for locking Briar to the Xiaomi recent apps list. 2021-05-05 12:37:23 +01:00
akwizgran
663c648337 Update disappearing message bubbles after removing messages. 2021-05-03 15:16:11 +01:00
akwizgran
bee4e94987 Bump version numbers for 1.3.3 release. 2021-05-03 13:55:39 +01:00
akwizgran
c44bdc8762 Update translations. 2021-05-03 13:38:14 +01:00
Daniel Lublin
73c7882cc0 Introduce RssFeedViewModel 
Furnishing the RssFeed function as a single activity with fragments for
Manage and Import.
 2021-05-03 09:40:40 +02:00
Torsten Grote
552b9ef21a Wait for an incoming connection before showing an error Toast 2021-04-30 16:01:54 -03:00
akwizgran
77ed15311c Raise target API level to 30, upgrade build tools to 30.0.3. 2021-04-30 14:51:49 +01:00
Daniel Lublin
e2a11d42f8 Implement backend for connect via bluetooth 2021-04-27 14:15:10 +02:00
Torsten Grote
34788356e6 Add script to update Android app translations 
add German and Spanish (incl. video) play store listing
 2021-04-26 15:14:06 -03:00
akwizgran
2f719d7f2c Bump version numbers for 1.3.2 release. 2021-04-26 13:50:35 +01:00
akwizgran
eb2e8d75f4 Enable features for 1.3 release. 2021-04-26 13:45:53 +01:00
akwizgran
338d288290 Update translations. 2021-04-26 13:43:33 +01:00
Torsten Grote
03fe1a2d2c Merge branch '1743-huawei-app-launch' into 'master' 
Add button for opening Huawei battery settings during setup

See merge request briar/briar!1441
 2021-04-23 13:54:55 +00:00
akwizgran
4a8d89e2bb Add button for opening Huawei battery settings during setup. 2021-04-23 14:25:24 +01:00
Torsten Grote
0fed1681ed Google play listing now available in: 
* Persian
* Galician
* Lithuanian
* Turkish
* Chinese (Simplified)
 2021-04-23 10:22:27 -03:00
Torsten Grote
d995e73996 Update Play Store listing and add Catalan translation 2021-04-22 14:06:37 -03:00
Torsten Grote
1d271bab18 Merge branch '1914-create-viewmodels-directly-after-injection' into 'master' 
Create ViewModels directly after injection

Closes #1914

See merge request briar/briar!1432
 2021-04-22 14:59:05 +00:00
Sebastian Kürten
2a48d43e5b Create ViewModels directly after injection 2021-04-22 15:31:55 +02:00
Sebastian Kürten
0a4e23118a Replace switch statements with resource ids with if-then-else 2021-04-22 15:19:11 +02:00
akwizgran
528a15962f Merge branch 'fastlane-metadata' into 'master' 
Make Google Play descriptions translatable

See merge request briar/briar!1437
 2021-04-22 13:00:13 +00:00
Torsten Grote
0a0cc4e79c Extend full description 2021-04-22 09:50:16 -03:00
Torsten Grote
2b3ba42d70 Make Google Play descriptions translable 2021-04-21 13:35:10 -03:00
akwizgran
9465331ece Merge branch '1999-bluetooth-killed-activity-fix' into 'master' 
Reset plugin assignments when starting AddNearbyContactIntroFragment

Closes #1999

See merge request briar/briar!1434
 2021-04-21 15:57:17 +00:00
akwizgran
b0d86bef3e Merge branch 'scheduled-tests' into 'master' 
Run bridge tests in scheduled nightly tests (and fix merge pipelines)

See merge request briar/briar!1431
 2021-04-21 13:55:48 +00:00
Torsten Grote
a28a2360f1 Merge branch 'remove-redundant-casts' into 'master' 
Remove a few redundant casts

See merge request briar/briar!1436
 2021-04-21 12:52:04 +00:00
Torsten Grote
5a3a12767c Increase SetupActivity timeout in PromoVideoTest as the current one doesn't seem to be sufficient 2021-04-21 09:48:58 -03:00
Torsten Grote
2f86bc312c Catch UnableToTakeScreenshotException to make CI more stable 2021-04-21 09:48:58 -03:00
akwizgran
a9d88c849a Merge branch '1961-connect-via-bt-ui' into 'master' 
Simple version of Connect via Bluetooth UI

See merge request briar/briar!1398
 2021-04-21 11:57:53 +00:00
Sebastian Kürten
7397efca80 Remove a few redundant casts 2021-04-21 13:53:53 +02:00
Torsten Grote
17bd6f9a33 Merge branch '1778-onboarding-tap-target' into 'master' 
Wait for layout before showing onboarding tap target

Closes #1778

See merge request briar/briar!1435
 2021-04-21 11:45:19 +00:00
akwizgran
2d4e7a9fb0 Wait for layout before showing onboarding tap target. 2021-04-21 12:20:21 +01:00
Torsten Grote
0266da993d Reset plugin assignments when starting AddNearbyContactIntroFragment 2021-04-20 14:38:58 -03:00
Torsten Grote
ea5280713f Address review feedback for Connect via Bluetooth UI 2021-04-20 14:24:05 -03:00
Torsten Grote
0b89d29c7d Reset BluetoothPlugin reference 
When it is assigned before we are signed-in in (like when returning to a killed activity), it would be null and without a reset, we would consider Bluetooth to not be supported.
 2021-04-20 14:23:07 -03:00
Torsten Grote
688bac77a8 Use a feature flag to hide connect via Bluetooth option 2021-04-19 11:36:35 -03:00
Torsten Grote
c736bf7c06 Move Connect via Bluetooth UI into DialogFragment 
so it can stay active when leaving the context to enable location or permissions
 2021-04-19 11:08:02 -03:00
Torsten Grote
539730f8ec Show dialog when permission was denied for good 2021-04-19 11:07:21 -03:00
Torsten Grote
a9c4669c75 Simple version of Connect via Bluetooth UI 2021-04-19 11:07:20 -03:00
Sebastian Kürten
f8dba6fd7f Add static version of DbViewModel#handleException() in UiUtils 2021-04-15 19:34:14 +02:00
Sebastian Kürten
419247074f Make more use of DbViewModel#handleException() 2021-04-15 17:53:53 +02:00
akwizgran
2ddb7b5b64 Merge branch '1944-update-contact-list-when-changing-aliases' into 'master' 
Broadcast ContactAliasChangedEvent to update contact list

Closes #1944

See merge request briar/briar!1425
 2021-04-15 15:35:46 +00:00
akwizgran
c14b59661e Merge branch 'fix-settings-test' into 'master' 
Fix SettingsActivityScreenshotTest and enable scheduled emulator tests

See merge request briar/briar!1429
 2021-04-15 15:30:31 +00:00
akwizgran
d70d27e665 Merge branch '804-self-destructing-messages' into 'master' 
Merge 'Self-destruct timer for messages' to master

Closes #1863

See merge request briar/briar!1396
 2021-04-15 15:24:19 +00:00
akwizgran
8991762b0c Final code review nitpicks. 2021-04-15 16:12:38 +01:00
Torsten Grote
8671229f76 Merge branch '1672-speed-dial-crash' into 'master' 
Close the speed dial to prevent a crash

Closes #1672

See merge request briar/briar!1430
 2021-04-14 17:22:06 +00:00
akwizgran
0fb67583ff Close the speed dial to prevent a crash. 2021-04-14 18:10:39 +01:00