1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-23 12:51:16 +00:00
Commit graph

500 commits

Author SHA1 Message Date
Lode Hoste
6496666bf2 Bump Android version number 2015-05-06 08:10:28 +02:00
Lode Hoste
e317b11c57 Catch missing json field (fixes #291) 2015-05-06 08:09:05 +02:00
Lode Hoste
9ef1474cbe Restart now when importing config (fixes #386) 2015-05-06 08:08:51 +02:00
Lode Hoste
cde276891c Update unit tests 2015-05-05 23:36:45 +02:00
Lode Hoste
75bdc12a0f Enforce single hasher (fixes #384) 2015-05-05 22:03:05 +02:00
Lode Hoste
79f0e2a8dc Fix remaining merge issues 2015-05-05 22:02:31 +02:00
Lode Hoste
e645255e79 Updated translations 2015-05-05 20:39:55 +02:00
Lode Hoste
8ff6a84a4e Limit retries when create the config file 2015-05-05 20:39:25 +02:00
Lode Hoste
07ba64398e Fix TAG warning and update Javadoc
Conflicts:
	src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java
2015-05-05 20:36:15 +02:00
Lode Hoste
58d299a18e Capture IOException when file descriptor is closed (fixes #382)
Conflicts:
	src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java
2015-05-05 20:34:39 +02:00
Lode Hoste
767177e28d Kill the Syncthing Process before resorting to shell-based kill
Conflicts:
	src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java
2015-05-05 20:33:01 +02:00
Lode Hoste
b32ac0b13e Fix lint warnings 2015-05-05 20:24:24 +02:00
Lode Hoste
5d5cf0b903 Streamline SyncthingRunnable
Conflicts:
	src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/RestApiTest.java
	src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
	src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java
	src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
	src/main/res/values/strings.xml
2015-05-05 20:21:15 +02:00
Lode Hoste
09331780b3 Cache line separator 2015-05-05 20:06:40 +02:00
Lode Hoste
97bbeadc6a Don't retry if the task was cancelled 2015-05-05 20:06:17 +02:00
Lode Hoste
a447807ff6 Merge branch 'master' of github.com:syncthing/syncthing-android 2015-05-05 20:02:36 +02:00
Lode Hoste
7f7b8cd653 Merge branch 'fix-scanner' of https://github.com/Zillode/syncthing-android into Zillode-fix-scanner
Conflicts:
	src/main/java/com/nutomic/syncthingandroid/fragments/DeviceSettingsFragment.java
2015-05-05 20:00:32 +02:00
Zillode
e77d5a6c12 Merge pull request #376 from Zillode/disable-cache
Clear webview cache (fixes #374)
2015-05-05 19:47:34 +02:00
Zillode
de2c6320af Merge pull request #375 from Zillode/reduce-load
Increase GUI update interval and log get requests (fixes #362)
2015-05-05 19:47:10 +02:00
Lode Hoste
74062e8269 Merge branch 'log' of https://github.com/Zillode/syncthing-android into Zillode-log
Conflicts:
	src/main/java/com/nutomic/syncthingandroid/syncthing/GetTask.java
2015-05-05 19:45:50 +02:00
Zillode
7c54b762af Merge pull request #369 from Zillode/https
TLS and v0.11.0 Support
2015-05-05 19:43:35 +02:00
Lode Hoste
9d4ede5aff Capture IOException when for closed file descriptor (fixes #382) 2015-05-05 08:35:43 +02:00
Lode Hoste
1e02a10348 Properly initiate the ZXing barcode scanner (fixes #322). 2015-04-29 20:05:25 +02:00
Lode Hoste
3f332e8b8b Clear webview cache (fixes #374) 2015-04-29 19:47:37 +02:00
Lode Hoste
e111d836f0 Increase GUI update interval and log get requests (fixes #362) 2015-04-29 19:43:40 +02:00
Zillode
cdffed64af Merge pull request #370 from Zillode/copy-id
Only copy device ID when finger lifts
2015-04-29 19:32:58 +02:00
Lode Hoste
da4d654721 Support webgui for devices <ICS 2015-04-29 19:30:30 +02:00
Lode Hoste
10cad9ae37 Print stacktrace on error 2015-04-29 19:30:29 +02:00
Lode Hoste
dccbbbbd41 Support HTTP Auth in Webview 2015-04-29 19:30:29 +02:00
Lode Hoste
4146970e64 Update Rest API to v0.11
Conflicts:
	src/main/java/com/nutomic/syncthingandroid/fragments/DeviceSettingsFragment.java
2015-04-29 19:30:17 +02:00
Lode Hoste
1584754e32 Show GetTask progress in log
Conflicts:
	src/main/java/com/nutomic/syncthingandroid/syncthing/GetTask.java
2015-04-29 19:08:09 +02:00
02a043f76c Removed unneeded code. 2015-04-26 05:48:15 +02:00
e821d2e468 Do not use WeakReference for listeners (fixes #328).
This makes sure listeners are not invoked after being destroyed.

Also call onApiChange() on GUI thread.
2015-04-25 01:50:08 +02:00
Lode Hoste
499309fcc1 Only copy device ID when finger lifts 2015-04-23 23:23:20 +02:00
Lode Hoste
0c13d8e106 Support opening LogActivity in debug package 2015-04-23 08:28:43 +02:00
Lode Hoste
6be050c43d Add log window (fixes #311). 2015-04-23 08:27:22 +02:00
Lode Hoste
df92b179c7 Fix several lint warnings 2015-04-23 08:10:04 +02:00
Lode Hoste
bcbec555cd Update default HTTP configurations to use HTTPS 2015-04-23 08:09:07 +02:00
Lode Hoste
5e0029e208 Update deprecated 8080 port to 8384 2015-04-23 08:07:54 +02:00
Lode Hoste
8f2fe9955a Enable TLS for the WebGUI 2015-04-23 08:03:43 +02:00
Lode Hoste
c7cdfa1ff2 Implement TLS support (fixes #19) 2015-04-23 08:03:24 +02:00
7ddee2f953 Toggle drawer when menu button is pressed (fixes #329). 2015-04-22 23:45:45 +02:00
b9dec163e0 Set invisible placeholder for device ID (fixes #357). 2015-04-20 22:13:38 +02:00
c767259889 Export config to backups/syncthing instead of sd card root (fixes #364). 2015-04-20 21:33:04 +02:00
Zillode
42be1fb26b Merge pull request #338 from Zillode/fix-npe-onreceive
Fix NPE when mVersion or mCurrentAddress is not set
2015-04-09 20:41:16 +02:00
Lode Hoste
18901b03b8 Fix NPE when mVersion or mCurrentAddress is not set 2015-04-09 20:38:36 +02:00
1bc4935463 Fixed bug in FolderObserver, improved tests (ref #337). 2015-04-09 01:23:30 +02:00
8c75a8913d Remove .stfolder generation and moveConfigFiles() (fixes #277). 2015-04-08 23:18:43 +02:00
c6e7ce6025 Set username and random password on first start. 2015-04-08 22:59:49 +02:00
d97288d6a8 Also move persistent=false to Preferences in app settings 2015-04-08 18:00:41 +02:00
2eabee9eb5 Removed unneeded testStartService() case and dead code (fixes #302).
We don't really need this test, as testBindService() does basically
the same thing.
2015-04-08 17:59:39 +02:00
329f073106 Increased target sdk version to 22. 2015-04-08 15:47:39 +02:00
Alexander Sosedkin
d7285f1d7c added a proper notification icon 2015-04-06 22:44:21 +06:00
Lode Hoste
cd06ee1269 Update welcoming text (fixes #287). 2015-04-06 13:03:37 +02:00
832c7fdf72 Bumped version to 0.5.28. 2015-04-06 00:40:23 +02:00
1c57175f91 Imported translations. 2015-04-06 00:25:59 +02:00
f110e02718 Fixed possible NPE in SyncthingRunnable (fixes #335). 2015-04-06 00:10:49 +02:00
4e8dba4819 Fixed unit test compilation errors. 2015-04-01 23:20:36 +02:00
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
Lode Hoste
396b05006c Wrap onApiChange in runOnUiThread (fixes #312). 2015-03-27 17:20:04 +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
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
Lode Hoste
8e014ce0cd Retry GET requests at least 10 times 2015-03-24 00:54:45 +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
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
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