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

6228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
akwizgran
c44bdc8762 Update translations. 2021-05-03 13:38:14 +01:00
Torsten Grote
423ecf71d8 Merge branch '1894-viewmodel-for-rssfeed-activities' into 'master' 
Introduce ViewModel for RssFeed*Activity

Closes #1894

See merge request briar/briar!1366
 2021-05-03 12:35:32 +00: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
683af1ec3a Merge branch '1827-target-api-30' into 'master' 
Raise target API level to 30, upgrade build tools to 30.0.3

Closes #1827

See merge request briar/briar!1445
 2021-04-30 17:44:49 +00:00
akwizgran
77ed15311c Raise target API level to 30, upgrade build tools to 30.0.3. 2021-04-30 14:51:49 +01:00
akwizgran
3d72557618 Merge branch '1962-connect-via-bt-backend' into 'master' 
Implement connect via Bluetooth backend

Closes #1962

See merge request briar/briar!1412
 2021-04-27 12:27:55 +00:00
Daniel Lublin
e2a11d42f8 Implement backend for connect via bluetooth 2021-04-27 14:15:10 +02:00
akwizgran
0f5ea6ae66 Merge branch 'translation-update-script' into 'master' 
Add script to update Android app translations

See merge request briar/briar!1442
 2021-04-27 11:09:24 +00:00
akwizgran
5b2c9b85f9 Merge branch 'prevent-double-pipelines' into 'master' 
Avoid duplicate CI pipelines running at the same time

See merge request briar/briar!1443
 2021-04-27 11:08:13 +00:00
Torsten Grote
94921230d9 Avoid duplicate CI pipelines running at the same time 
Docs:
https://docs.gitlab.com/ee/ci/yaml/README.html#switch-between-branch-pipelines-and-merge-request-pipelines
https://docs.gitlab.com/ee/ci/yaml/README.html#avoid-duplicate-pipelines
 2021-04-26 15:37:16 -03: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. alpha-1.3.2 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
ade48c7bea Merge branch 'fastlane-metadata-upload' into 'master' 
Update Google play listing and language mappings

See merge request briar/briar!1440
 2021-04-23 13:43:10 +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
akwizgran
93ad483066 Merge branch 'fastlane-metadata-upload' into 'master' 
Update Play Store listing and add Catalan translation

See merge request briar/briar!1439
 2021-04-23 10:10:08 +00: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
Torsten Grote
a9d2aa9366 Merge branch '1883-resource-ids-will-be-non-final' into 'master' 
Replace switch statements with resource ids with if-then-else

Closes #1883

See merge request briar/briar!1438
 2021-04-22 13:34:35 +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
f7a957150e Tweak CI rules for optional tests 
so they are not needed for merge requests
 2021-04-21 09:49:11 -03:00
Torsten Grote
67bd065bc3 Allow manual emulator tests in all situations 2021-04-21 09:48:59 -03: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
Torsten Grote
f0fcadfaf4 Also run optional bridge test with schedules 2021-04-21 09:48:57 -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
Torsten Grote
4c11f93ee2 Merge branch '1973-make-use-of-handle-exception' into 'master' 
Make more use of DbViewModel#handleException()

Closes #1973

See merge request briar/briar!1427
 2021-04-16 17:29:20 +00: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