nutomic
/
syncthing-android
mirror of https://github.com/syncthing/syncthing-android.git
1
0
Fork 0
Code Releases Activity

Create a new config file if parsing fails (fixes #201).

This commit is contained in:
Felix Ableitner 2015-02-27 23:22:18 +01:00
parent 9ed5fe0c20
commit c06e9ac992
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
View File

@ -40,6 +40,8 @@ public class ConfigXml {
*/ */
public static final String CONFIG_FILE = "config.xml"; public static final String CONFIG_FILE = "config.xml";
private static final String INVALID_CONFIG_FILE = "config.xml.invalid";
private File mConfigFile; private File mConfigFile;
private Document mConfig; private Document mConfig;
@ -49,17 +51,26 @@ public class ConfigXml {
boolean isFirstStart = !mConfigFile.exists(); boolean isFirstStart = !mConfigFile.exists();
if (isFirstStart) { if (isFirstStart) {
Log.i(TAG, "App started for the first time. Generating keys and config."); Log.i(TAG, "App started for the first time. Generating keys and config.");
new SyncthingRunnable(context, context.getApplicationInfo().dataDir + "/" + generateKeysConfig(context);
SyncthingService.BINARY_NAME + " -generate='" + context.getFilesDir() + "'")
.run();
} }
// This could cause an infinite loop, maybe we should add a counter, too.
do {
try { try {
DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder(); DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
mConfig = db.parse(mConfigFile); mConfig = db.parse(mConfigFile);
} catch (SAXException | ParserConfigurationException | IOException e) { } catch (SAXException | ParserConfigurationException | IOException e) {
throw new RuntimeException("Failed to open config file", e); Log.w(TAG, "Failed to open config, moving to " + INVALID_CONFIG_FILE +
" and creating blank config");
File dest = new File(mConfigFile.getParent(), INVALID_CONFIG_FILE);
if (dest.exists())
dest.delete();
mConfigFile.renameTo(dest);
generateKeysConfig(context);
isFirstStart = true;
mConfigFile = getConfigFile(context);
} }
} while (mConfig == null);
if (isFirstStart) { if (isFirstStart) {
changeDefaultFolder(); changeDefaultFolder();
@ -67,6 +78,12 @@ public class ConfigXml {
updateIfNeeded(); updateIfNeeded();
} }
private void generateKeysConfig(Context context) {
new SyncthingRunnable(context, context.getApplicationInfo().dataDir + "/" +
SyncthingService.BINARY_NAME + " -generate='" + context.getFilesDir() + "'")
.run();
}
public static File getConfigFile(Context context) { public static File getConfigFile(Context context) {
return new File(context.getFilesDir(), CONFIG_FILE); return new File(context.getFilesDir(), CONFIG_FILE);
} }