nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-26 06:11:19 +00:00
Code Releases Activity

Initialize mFolder.type to FOLDER_TYPE_SEND_RECEIVE

Browse source 
according to the switch element having android:checked=false
by default in the xml layout.
This commit is contained in:
Catfriend1 2018-07-26 10:23:16 +02:00
parent 9382685fc9
commit aad57de03d
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
View file

@ -436,17 +436,8 @@ public class FolderActivity extends SyncthingActivity
return true; return true;
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
mFolderUri != null) { mFolderUri != null &&
if (mFolder == null) { mFolder.type.equals(Constants.FOLDER_TYPE_SEND_ONLY)) {
Log.e(TAG, "mFolder == null");
}
if (mFolder.type == null) {
Log.e(TAG, "mFolder.type == null");
}
if (mFolder.type.equals(Constants.FOLDER_TYPE_SEND_ONLY)) {
Log.e(TAG, "mFolder.type == Constants.FOLDER_TYPE_SEND_ONLY");
}
/** /**
* Normally, syncthing takes care of creating the ".stfolder" marker. * Normally, syncthing takes care of creating the ".stfolder" marker.
* This fails on newer android versions if the syncthing binary only has * This fails on newer android versions if the syncthing binary only has
@ -595,6 +586,7 @@ public class FolderActivity extends SyncthingActivity
*/ */
mFolder.rescanIntervalS = 3600; mFolder.rescanIntervalS = 3600;
mFolder.paused = false; mFolder.paused = false;
mFolder.type = Constants.FOLDER_TYPE_SEND_RECEIVE;
mFolder.versioning = new Folder.Versioning(); mFolder.versioning = new Folder.Versioning();
} }