1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-27 06:41:15 +00:00
Commit graph

634 commits

Author SHA1 Message Date
24ba984ec5 Merge branch 'Zillode-fix-npe-jsontokener' 2015-03-24 00:56:01 +01:00
Lode Hoste
8e014ce0cd Retry GET requests at least 10 times 2015-03-24 00:54:45 +01:00
07027af420 Merge branch 'Zillode-support-unknown-state' 2015-03-24 00:40:44 +01:00
Lode Hoste
c2a5ecb43e Support 'unknown' folder state 2015-03-24 00:08:46 +01:00
2de8d391bf Unhide dialogs (fixes #289, #290). 2015-03-23 23:23:27 +01:00
4bcfeecf3a Merge branch 'Zillode-fix-npe-getversion' 2015-03-23 23:22:22 +01:00
Lode Hoste
d73b430cf8 Only access the version information when the SyncthingService is active (fixes #292). 2015-03-23 16:16:20 +01:00
3558060fe0 Bumped version to 0.5.26. 2015-03-23 00:31:35 +01:00
3068a37462 Updated syncthing to v0.10.29. 2015-03-23 00:31:08 +01:00
3cea511c88 Don't use isFinished(), as it's not available on older devices. 2015-03-23 00:29:45 +01:00
1665c04e37 Bumped version to 0.5.25. 2015-03-23 00:03:44 +01:00
590f7db10d Imported translations. 2015-03-23 00:03:29 +01:00
fb2b6a21c4 Merge branch 'Zillode-fix-npe-device-edit' 2015-03-22 23:22:35 +01:00
a3d93a69ca Merge pull request #284 from Zillode/fix-invalid-token
Maintain&check reference to GUI before changing it
2015-03-22 22:50:32 +01:00
Lode Hoste
cf8ed62485 Minor fix for DevicesAdapterTest 2015-03-22 22:36:32 +01:00
Lode Hoste
02043095a6 Make sure the mFolder reference is valid (fixes #271). 2015-03-22 22:36:32 +01:00
Lode Hoste
fa39e17d51 Make sure the mDevice reference is valid (fixes #268 and #267). 2015-03-22 22:36:32 +01:00
Lode Hoste
c885445b51 Do not modify gui if it is destroyed 2015-03-22 21:06:26 +01:00
4233a15635 Merge branch 'Zillode-disable-auto-upgrade' 2015-03-22 20:09:00 +01:00
Lode Hoste
bab2243424 Disable ST upgrade in runnable (fixes #276). 2015-03-22 14:22:06 +01:00
db0da97cc4 Update summary on compression setting. 2015-03-22 11:14:17 +01:00
d5bbaafdb4 Don't need to replace /sdcard/ with proper path any more.
FolderPickerActivity always uses the correct path.
2015-03-22 00:57:22 +01:00
b780fb57f0 Removed API key generation as syncthing does this automatically now. 2015-03-22 00:53:26 +01:00
092c0f4cc9 Set notification as ongoing. 2015-03-21 22:23:38 +01:00
bd7346191f Also check for 401 status code in case GUI password is set (fixes #261).
This seems to break the web GUI, which apparently does not support
authentification.
2015-03-21 22:10:48 +01:00
1703194b02 Check if timer is null. 2015-03-21 21:48:24 +01:00
2bac0d9504 Add FolderObservers in background thread (fixes #262). 2015-03-21 21:42:33 +01:00
6f4741daee Fixed syncthing API calls being sent after shutdown (fixes #258). 2015-03-21 21:21:21 +01:00
383898a481 Merge pull request #255 from syncthing/license-mplv2
Change license to MPLv2.
2015-03-21 21:07:45 +01:00
Lode Hoste
c396646c36 Bumped version to 0.5.24.
Releases go through Jenkins now
2015-03-21 13:26:01 +01:00
Lode Hoste
47c0b132ff Bumped version to 0.5.23. 2015-03-21 11:45:09 +01:00
Lode Hoste
5b7cb05a47 Only use signingconfigs when environment settings are set 2015-03-21 11:44:34 +01:00
4868694643 Bumped version to 0.5.22. 2015-03-21 01:12:42 +01:00
04fe2593db Imported translations. 2015-03-21 01:12:18 +01:00
e01a8e4d4b Merge pull request #264 from Zillode/add-signingconfig
Add signingconfig
2015-03-21 01:05:31 +01:00
Lode Hoste
01cc786263 Add signingconfig 2015-03-21 00:56:59 +01:00
718e1e9281 Merge pull request #260 from Zillode/do-not-persist
Persistent=false should be repeated for all subpreferences, a global persistent flag would have been too easy... (fixes #256)
2015-03-20 12:49:09 +01:00
Lode Hoste
2b9a79bdad Persistent=false should be repeated for all subpreferences, a global persistent flag would have been too easy... (fixes #256) 2015-03-20 01:30:49 +01:00
7b54ce59b1 Bumped version to 0.5.21. 2015-03-17 22:39:09 +01:00
403ccd8d8d Imported translations. 2015-03-17 22:38:53 +01:00
34bded841d Merge branch 'Zillode-do-not-scare-ppl' 2015-03-17 22:38:16 +01:00
Lode Hoste
c3e4ff4cb1 Set announce color green if at least one is connected (fixes #249) 2015-03-17 22:35:51 +01:00
a29f1096ba Change license to MPLv2. 2015-03-17 22:27:50 +01:00
b7459c9ded Fixed crash when navigating to folder without read permissions (fixes #244). 2015-03-17 01:03:32 +01:00
Lode Hoste
ca2ca8553a Compression is now a string instead of a boolean (fixes #239) 2015-03-16 19:43:31 +01:00
c128612e68 Bumped version to 0.5.20. 2015-03-14 21:19:58 +01:00
96a266e7fd Fixed NPE when JSON parsing fails. 2015-03-14 21:19:27 +01:00
a3b7241c1e Bumped version to 0.5.19. 2015-03-14 15:14:50 +01:00
a5d7ae90b9 Updated syncthing to v0.10.26. 2015-03-14 15:14:28 +01:00
9cff099dab Imported translations. 2015-03-14 15:13:51 +01:00