nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-11 04:25:53 +00:00
Code Releases Activity

Limit retries when create the config file

Browse source
This commit is contained in:
Lode Hoste 2015-04-13 21:29:48 +02:00
parent 07ba64398e
commit 8ff6a84a4e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
View file

@ -3,6 +3,7 @@ package com.nutomic.syncthingandroid.util;
import android.content.Context;
import android.os.Environment;
import android.util.Log;
import android.widget.Toast;
import com.nutomic.syncthingandroid.syncthing.SyncthingRunnable;
import com.nutomic.syncthingandroid.syncthing.SyncthingService;
@ -53,8 +54,7 @@ public class ConfigXml {
generateKeysConfig(context);
}
// This could cause an infinite loop, maybe we should add a counter, too.
do {
for (int i = 0; i < 10 && mConfig == null; i++) {
try {
DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
mConfig = db.parse(mConfigFile);
@ -69,7 +69,10 @@ public class ConfigXml {
isFirstStart = true;
mConfigFile = getConfigFile(context);
}
} while (mConfig == null);
}
if (mConfig == null) {
Toast.makeText(context, "Failed to create a Syncthing config. Syncthing will not start!", Toast.LENGTH_LONG).show();
}
if (isFirstStart) {
changeDefaultFolder();