nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-29 15:51:17 +00:00
Code Releases Activity

Bump syncthing version to 1.0.0 (#173)

Browse source 
* Update syncthing to v1.0.0

* Update model/Options: MaxConcurrentScans

Related: https://github.com/syncthing/syncthing/pull/4888

* Fix typo

* Update APK version to 1.0.0.1 / 1000001
This commit is contained in:
Catfriend1 2019-01-01 17:23:30 +01:00 committed by GitHub
parent fd2c441ed7
commit 7d59e75aea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -37,8 +37,8 @@ android {
applicationId "com.github.catfriend1.syncthingandroid"
minSdkVersion 16
targetSdkVersion 26
versionCode 145409
versionName "0.14.54.9"
versionCode 1000001
versionName "1.0.0.1"
testApplicationId 'com.github.catfriend1.syncthingandroid.test'
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
playAccountConfig = playAccountConfigs.defaultAccountConfig

3
app/src/main/java/com/nutomic/syncthingandroid/model/Options.java
View file

@ -36,6 +36,9 @@ public class Options {
public int tempIndexMinBlocks;
public String defaultFolderPath;
// Since v1.0.0, see https://github.com/syncthing/syncthing/pull/4888
public int maxConcurrentScans;
public static final int USAGE_REPORTING_UNDECIDED = 0;
public static final int USAGE_REPORTING_DENIED = -1;

2
syncthing/src/github.com/syncthing/syncthing

@ -1 +1 @@
Subproject commit da39dfada33fe152c1d2297ff69dbf0739564516
Subproject commit 952ab7db1cdbf282af3c7ce2a07e359431099e25