Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity
6,417 Commits 133 Branches 200 Tags
offline-testing
Commit Graph

6417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
akwizgran
0ce0551f0d Update progress of writer task. 2021-05-11 12:19:16 +01:00
akwizgran
a198e7d08e Ensure that observers see the final state even if they're added late. 2021-05-11 12:19:16 +01:00
akwizgran
bca6f1506e Add integration test for syncing via removable drives. 2021-05-11 12:19:16 +01:00
akwizgran
e420201b00 Implement RemovableDriveWriterTask, except for progress updates. 2021-05-11 12:19:16 +01:00
akwizgran
03248d04e5 Fix typo in class names. 2021-05-11 12:19:16 +01:00
akwizgran
2c39b02644 Implement RemovableDriverReaderTask. 2021-05-11 12:19:16 +01:00
akwizgran
c9c6f3682c Add task factory. 2021-05-11 12:19:16 +01:00
akwizgran
8f4a0ef030 Add removable drive manager with placeholder task implementations. 2021-05-11 12:19:14 +01:00
akwizgran
5fe22bcd57 Merge branch '2035-android-removable-drive-plugin' into '1802-sync-via-removable-storage' 
Add Android implementation of RemovableDrivePlugin

See merge request briar/briar!1457
 2021-05-11 11:13:14 +00:00
akwizgran
b4880af7e2 Add Android implementation of RemovableDrivePlugin. 2021-05-10 14:19:24 +01:00
akwizgran
51d21bd669 Decouple RemovableDrivePlugin from FileConstants. 2021-05-10 13:48:12 +01:00
Torsten Grote
b8f3728a0d Merge branch '2015-removable-drive-plugin' into '1802-sync-via-removable-storage' 
Create RemovableDrivePlugin

See merge request briar/briar!1454
 2021-05-10 12:47:21 +00:00
akwizgran
61ca2a391b Merge branch 'create-testdata-zero-values' into 'master' 
Add button to zero values when creating test data

See merge request briar/briar!1447
 2021-05-10 12:05:26 +00:00
akwizgran
bbfd4f137d Merge branch '2013-db-method-for-amount-of-data-to-sync' into '1802-sync-via-removable-storage' 
Add DB method for getting amount of data to sync

See merge request briar/briar!1452
 2021-05-10 12:00:11 +00:00
akwizgran
88537b9323 Merge branch '2032-connect-via-bt-crash' into 'master' 
Remove duplicate code due to merge mistake

Closes #2032

See merge request briar/briar!1456
 2021-05-10 11:55:38 +00:00
Daniel Lublin
e6c004e8f6 Add button to zero values when creating test data 2021-05-10 13:46:49 +02:00
Daniel Lublin
7e3ca76dd1 Merge branch '2014-messages-sent-event' into '1802-sync-via-removable-storage' 
Update MessagesSentEvent to include amount of data sent

See merge request briar/briar!1453
 2021-05-10 11:44:27 +00:00
akwizgran
dc7290dab7 Remove duplicate code due to merge mistake. 2021-05-10 12:29:28 +01:00
akwizgran
524c8d26f8 Don't inject default RemovableDrivePluginFactory on Android. 2021-05-07 17:48:39 +01:00
akwizgran
7eccf7dac1 Decouple removable drive plugin from java.io.File for portability. 2021-05-07 17:36:10 +01:00
akwizgran
0bc06248ed Clean up plugin injection code, remove unused module. 2021-05-06 16:59:45 +01:00
akwizgran
c999f05cc7 Configure removable drive plugin for Android. 2021-05-06 16:59:45 +01:00
akwizgran
428269b312 Add removable drive plugin. 2021-05-06 16:59:45 +01:00
akwizgran
588e05ce83 Update MessagesSentEvent to include amount of data sent. 2021-05-06 16:20:15 +01:00
akwizgran
9dff8bd64a Merge branch '2005-connect-via-bt-error' into 'master' 
Connect via Bluetooth: Wait before showing an error Toast

See merge request briar/briar!1446
 2021-05-06 13:14:32 +00:00
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
akwizgran
471a2372c8 Merge branch '2027-pause-polling-when-doing-connect-via-bt' into 'master' 
Disable polling while doing connect-via-BT

Closes #2027

See merge request briar/briar!1450
 2021-05-06 12:59:38 +00:00
Daniel Lublin
fba028db03 Disable polling while doing connect-via-BT 2021-05-06 11:13:35 +02:00
akwizgran
f7875c99b6 Add DB method for getting amount of data to sync. 2021-05-05 17:52:37 +01:00
Torsten Grote
c647c52638 Merge branch '2009-xiaomi-setup-screen' into 'master' 
Show instructions for locking Briar to the Xiaomi recent apps list

Closes #2009

See merge request briar/briar!1451
 2021-05-05 16:39:55 +00: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
Torsten Grote
21fd7f5eed Merge branch 'allow-one-unreachable-bridge' into 'master' 
Allow BridgeTest to pass if one bridge is unreachable

See merge request briar/briar!1449
 2021-05-04 12:31:38 +00:00
akwizgran
6354e91b55 Allow BridgeTest to pass if one bridge is unreachable. 2021-05-04 13:13:57 +01:00
Torsten Grote
8123c06348 Merge branch '2012-update-bubbles-after-removing-messages' into 'master' 
Update disappearing message bubbles after removing messages

Closes #2012

See merge request briar/briar!1448
 2021-05-03 16:57:04 +00: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. alpha-1.3.3 2021-05-03 13:55:39 +01:00
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
552b9ef21a Wait for an incoming connection before showing an error Toast 2021-04-30 16:01:54 -03: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