Add template network.conf at conf. gen.

2 files changed, 7 insertions, 0 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
index e571cf5..64ed61d 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/ConfigureActivity.kt
@@ -100,6 +100,7 @@ class ConfigureActivity : BaseActivity() {
     R.string.message_generating_configuration,
     Tinc.init(netName, nodeName)
       .thenCompose { TincApp.removeScripts(netName) }
+      .thenCompose { TincApp.generateIfaceCfgTemplate(netName) }
       .thenCompose { TincApp.setPassphrase(netName, newPassphrase = passphrase) })
 
   private fun joinNetwork(netName: String, url: String, passphrase: String? = null) = execAction(
diff --git a/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt b/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt
index 3c2e27a..53e91db 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/TincApp.kt
@@ -39,6 +39,12 @@ object TincApp {
       .write(AppPaths.netConfFile(netName))
   }
 
+  fun generateIfaceCfgTemplate(netName: String) = runAsyncTask {
+    App.getResources().openRawResource(R.raw.network).use { inputStream ->
+      AppPaths.netConfFile(netName).outputStream().use { inputStream.copyTo(it) }
+    }
+  }
+
   fun setPassphrase(netName: String, currentPassphrase: String? = null, newPassphrase: String?) = runAsyncTask {
     listPrivateKeys(netName)
       .filter { it.exists() }