nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 03:11:30 +00:00
Code Releases Activity

Create camera repository on first start (closes #4).

Browse source
This commit is contained in:
Felix Ableitner 2014-06-24 22:06:01 +02:00
parent 97e46c3f64
commit 5d078fc0c0
2 changed files with 80 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
View file

@ -330,8 +330,12 @@ public class SyncthingService extends Service {
"Copying default config, keys will be generated automatically"); "Copying default config, keys will be generated automatically");
copyDefaultConfig(); copyDefaultConfig();
} }
moveConfigFiles(); moveConfigFiles();
ConfigXml config = new ConfigXml(getConfigFile()); ConfigXml config = new ConfigXml(getConfigFile());
if (isFirstStart()) {
config.createCameraRepo();
}
config.update(); config.update();
return new Pair<String, String>(config.getWebGuiUrl(), config.getApiKey()); return new Pair<String, String>(config.getWebGuiUrl(), config.getApiKey());
} }

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

@ -1,5 +1,6 @@
package com.nutomic.syncthingandroid.util; package com.nutomic.syncthingandroid.util;
import android.os.Environment;
import android.util.Log; import android.util.Log;
import org.w3c.dom.Document; import org.w3c.dom.Document;
@ -64,62 +65,51 @@ public class ConfigXml {
* Coming from 0.3.0 and earlier, the ignorePerms flag is set to true on every repository. * Coming from 0.3.0 and earlier, the ignorePerms flag is set to true on every repository.
*/ */
public void update() { public void update() {
try { Log.i(TAG, "Checking for needed config updates");
Log.i(TAG, "Checking for needed config updates"); boolean changed = false;
boolean changed = false; Element options = (Element) mConfig.getDocumentElement()
Element options = (Element) mConfig.getDocumentElement() .getElementsByTagName("options").item(0);
.getElementsByTagName("options").item(0); Element gui = (Element) mConfig.getDocumentElement()
Element gui = (Element) mConfig.getDocumentElement() .getElementsByTagName("gui").item(0);
.getElementsByTagName("gui").item(0);
// Create an API key if it does not exist. // Create an API key if it does not exist.
if (gui.getElementsByTagName("apikey").getLength() == 0) { if (gui.getElementsByTagName("apikey").getLength() == 0) {
Log.i(TAG, "Initializing API key with random string"); Log.i(TAG, "Initializing API key with random string");
char[] chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".toCharArray(); char[] chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".toCharArray();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
Random random = new Random(); Random random = new Random();
for (int i = 0; i < 20; i++) { for (int i = 0; i < 20; i++) {
sb.append(chars[random.nextInt(chars.length)]); sb.append(chars[random.nextInt(chars.length)]);
} }
Element apiKey = mConfig.createElement("apikey"); Element apiKey = mConfig.createElement("apikey");
apiKey.setTextContent(sb.toString()); apiKey.setTextContent(sb.toString());
gui.appendChild(apiKey); gui.appendChild(apiKey);
changed = true;
}
// Hardcode default globalAnnounceServer ip.
Element globalAnnounceServer = (Element)
options.getElementsByTagName("globalAnnounceServer").item(0);
if (globalAnnounceServer.getTextContent().equals("announce.syncthing.net:22025")) {
Log.i(TAG, "Replacing globalAnnounceServer host with ip");
globalAnnounceServer.setTextContent("194.126.249.5:22025");
changed = true;
}
// Set ignorePerms attribute.
NodeList repos = mConfig.getDocumentElement().getElementsByTagName("repository");
for (int i = 0; i < repos.getLength(); i++) {
Element r = (Element) repos.item(i);
if (!r.hasAttribute("ignorePerms") ||
!Boolean.parseBoolean(r.getAttribute("ignorePerms"))) {
Log.i(TAG, "Set 'ignorePerms' on repository " + r.getAttribute("id"));
r.setAttribute("ignorePerms", Boolean.toString(true));
changed = true; changed = true;
} }
// Hardcode default globalAnnounceServer ip.
Element globalAnnounceServer = (Element)
options.getElementsByTagName("globalAnnounceServer").item(0);
if (globalAnnounceServer.getTextContent().equals("announce.syncthing.net:22025")) {
Log.i(TAG, "Replacing globalAnnounceServer host with ip");
globalAnnounceServer.setTextContent("194.126.249.5:22025");
changed = true;
}
// Set ignorePerms attribute.
NodeList repos = mConfig.getDocumentElement().getElementsByTagName("repository");
for (int i = 0; i < repos.getLength(); i++) {
Element r = (Element) repos.item(i);
if (!r.hasAttribute("ignorePerms") ||
!Boolean.parseBoolean(r.getAttribute("ignorePerms"))) {
Log.i(TAG, "Set 'ignorePerms' on repository " + r.getAttribute("id"));
r.setAttribute("ignorePerms", Boolean.toString(true));
changed = true;
}
}
// Write the changes back to file.
if (changed) {
Log.i(TAG, "Writing updated config back to file");
TransformerFactory transformerFactory = TransformerFactory.newInstance();
Transformer transformer = transformerFactory.newTransformer();
DOMSource domSource = new DOMSource(mConfig);
StreamResult streamResult = new StreamResult(mConfigFile);
transformer.transform(domSource, streamResult);
}
} }
catch (TransformerException e) {
Log.w(TAG, "Failed to save updated config", e); if (changed) {
saveChanges();
} }
} }
@ -128,4 +118,38 @@ public class ConfigXml {
.getElementsByTagName("gui").item(0); .getElementsByTagName("gui").item(0);
} }
/**
* Creates a repository for the default camera folder.
*/
public void createCameraRepo() {
File cameraFolder =
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
Element cameraRepo = mConfig.createElement("repository");
cameraRepo.setAttribute("id", "camera");
cameraRepo.setAttribute("directory", cameraFolder.getAbsolutePath());
cameraRepo.setAttribute("ro", "true");
cameraRepo.setAttribute("ignorePerms", "true");
mConfig.getDocumentElement().appendChild(cameraRepo);
saveChanges();
}
/**
* Writes updated mConfig back to file.
*/
private void saveChanges() {
try {
Log.i(TAG, "Writing updated config back to file");
TransformerFactory transformerFactory = TransformerFactory.newInstance();
Transformer transformer = transformerFactory.newTransformer();
DOMSource domSource = new DOMSource(mConfig);
StreamResult streamResult = new StreamResult(mConfigFile);
transformer.transform(domSource, streamResult);
}
catch (TransformerException e) {
Log.w(TAG, "Failed to save updated config", e);
}
}
} }