|
|
eb10eaae9d
|
Merge branch 'master' of github.com:syncthing/syncthing-android
|
2015-04-01 23:06:36 +02:00 |
|
|
|
3ad1161535
|
Merge branch 'kill-syncthing' of git://github.com/Zillode/syncthing-android
|
2015-04-01 22:37:12 +02:00 |
|
|
|
9265eea6b7
|
Merge pull request #325 from Zillode/fix-number-exception
Catch invalid input numbers (fixes #324).
|
2015-04-01 22:33:20 +02:00 |
|
Lode Hoste
|
65e090f6e9
|
Ensure Syncthing is not running (fixes #92, fixes #96 and fixes #196).
|
2015-03-31 21:38:19 +02:00 |
|
Lode Hoste
|
87bf40b6a1
|
Remove the rescan interval setting from the GUI
|
2015-03-31 19:18:18 +02:00 |
|
Lode Hoste
|
396a46ad12
|
Catch invalid input numbers (fixes #324).
|
2015-03-31 19:18:11 +02:00 |
|
|
|
20853259c5
|
Merge pull request #314 from Zillode/update-default-port
Update default Syncthing port
|
2015-03-30 22:01:24 +02:00 |
|
Lode Hoste
|
593a36af55
|
Update default Syncthing port
|
2015-03-28 10:54:48 +01:00 |
|
|
|
46d914bc1e
|
Merge pull request #315 from Zillode/check-act-2
Wrap onApiChange in runOnUiThread
|
2015-03-27 18:40:18 +01:00 |
|
|
|
e470be9872
|
Merge pull request #301 from Zillode/nice-st
Run Syncthing with ionice (fixes #299).
|
2015-03-27 18:01:45 +01:00 |
|
Lode Hoste
|
5d3e45b8e5
|
Run Syncthing with ionice (fixes #299).
|
2015-03-27 17:40:45 +01:00 |
|
|
|
c8020fd9c2
|
Merge pull request #308 from Zillode/fix-samsungs-bug
Work around for Samsung's MenuBuilder bug (fixes #307).
|
2015-03-27 17:28:41 +01:00 |
|
Lode Hoste
|
396b05006c
|
Wrap onApiChange in runOnUiThread (fixes #312).
|
2015-03-27 17:20:04 +01:00 |
|
Lode Hoste
|
b73aaad0f5
|
Work around for Samsung's MenuBuilder bug (fixes #307).
|
2015-03-27 16:55:47 +01:00 |
|
|
|
0a07f4546b
|
Merge pull request #303 from Zillode/fix-back-arrow
Fix back arrow in actionbar for Android 4.1+
|
2015-03-27 00:33:17 +01:00 |
|
|
|
ee0ff1c5ca
|
Merge pull request #306 from Zillode/fix-illegal-dismiss
Clear dialog reference when dismissed (fixes #305).
|
2015-03-26 23:08:20 +01:00 |
|
Lode Hoste
|
4f98061325
|
Removed redundant code, CheckBoxPreference automatically updates its value
|
2015-03-25 20:04:04 +01:00 |
|
Lode Hoste
|
5278a8ca00
|
Clear dialog reference when dismissed (fixes #305).
|
2015-03-25 19:42:20 +01:00 |
|
Lode Hoste
|
d322249606
|
Fix back arrow in actionbar for Android 4.1+
|
2015-03-25 17:19:10 +01:00 |
|
Lode Hoste
|
1bd24e64e0
|
Reset mRestartPostponedmRestartPostponed when ST was restarted
|
2015-03-24 23:22:57 +01:00 |
|
Lode Hoste
|
e89e579b6c
|
Don't spam the device with retries and gradually increase the sleep time
|
2015-03-24 22:44:12 +01:00 |
|
Lode Hoste
|
ad65198f70
|
Do not request data when finishing
|
2015-03-24 22:43:24 +01:00 |
|
Lode Hoste
|
87f3ea9687
|
Update FoldersAdapter unit test
|
2015-03-24 22:27:51 +01:00 |
|
Lode Hoste
|
fadd22148a
|
Check current state (and wait a bit longer) in the SyncthingService unit test
|
2015-03-24 22:26:17 +01:00 |
|
Lode Hoste
|
3784134bea
|
Fix invalid port reference when running unit tests on a mockwebserver
See https://github.com/square/okhttp/pull/1194
|
2015-03-24 22:25:03 +01:00 |
|
Lode Hoste
|
aa8cd0a26c
|
Bumped version to 0.5.27.
|
2015-03-24 21:21:26 +01:00 |
|
Lode Hoste
|
7588638842
|
Imported translations.
|
2015-03-24 21:21:03 +01:00 |
|
Lode Hoste
|
2f0d4354c4
|
Try a bit harder to succeed the Rest call (currently FCs on fail)
|
2015-03-24 20:52:01 +01:00 |
|
Lode Hoste
|
6151dd1d41
|
Properly update device preferences (fixes #294).
|
2015-03-24 20:48:53 +01:00 |
|
Lode Hoste
|
771ff06345
|
Show loading dialog when restarting Syncthing
|
2015-03-24 19:55:27 +01:00 |
|
Lode Hoste
|
918c6c4e92
|
Fix NPE when closing filehandle to export configuration
|
2015-03-24 18:40:09 +01:00 |
|
|
|
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 |
|
