diff --git a/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java index f334dd1f..8c684fd3 100644 --- a/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java +++ b/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java @@ -1,6 +1,7 @@ package com.nutomic.syncthingandroid.util; import android.content.Context; +import android.os.Build; import android.os.Environment; import android.os.Handler; import android.os.Looper; @@ -49,11 +50,14 @@ public class ConfigXml { private static final int OPEN_CONFIG_MAX_TRIES = 10; + private final Context mContext; + private File mConfigFile; private Document mConfig; - public ConfigXml(final Context context) throws OpenConfigException { + public ConfigXml(Context context) throws OpenConfigException { + mContext = context; mConfigFile = getConfigFile(context); boolean isFirstStart = !mConfigFile.exists(); if (isFirstStart) { @@ -213,7 +217,11 @@ public class ConfigXml { public void changeDefaultFolder() { Element folder = (Element) mConfig.getDocumentElement() .getElementsByTagName("folder").item(0); - folder.setAttribute("id", "camera"); + String model = Build.MODEL + .replace(" ", "_") + .toLowerCase() + .replaceAll("[^a-z0-9_-]", ""); + folder.setAttribute("id", mContext.getString(R.string.default_folder_id, model)); folder.setAttribute("path", Environment .getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath()); folder.setAttribute("ro", "true"); diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 96c0d0d5..836fcea9 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -396,6 +396,9 @@ Please report any problems you encounter via Github. Failed to create a Syncthing config. Please check the logs. + + %1$s-photos +