From 63ade32602e0c8e2e1d5568b99a84aa504114d01 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 2 Sep 2016 23:39:17 -0700
Subject: [PATCH] Renamed loadConfig() to initConfig()

---
 .../tesremoteprogrammer/MainActivity.kt       | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
index 43dea8d..825e5ab 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
@@ -74,6 +74,33 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
         val PAUSE = ','
     }
 
+    fun initConfigs() {
+        try {
+            ObjectInputStream(openFileInput(current_config_data)).use {
+                config = it.readObject() as Config
+            }
+        } catch (ex: FileNotFoundException) {
+            val confs = Configurations()
+
+            defaultConfigs.forEach {
+                config = Gson().fromJson(InputStreamReader(resources.openRawResource(it)),
+                        Config::class.java)
+
+                if (BuildConfig.DEBUG) {
+                    val errors = StringBuilder()
+                    if (!validateConfig(config, errors)) {
+                        info(">>> ${config.params.name}: " + Html.fromHtml(errors.toString()))
+                    }
+                }
+
+                confs.configs.put(config.params.name, config)
+            }
+
+            saveConfigurations(confs)
+            saveConfig(false)
+        }
+    }
+
     @NeedsPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
     fun importConfig(intent: Intent) {
         val errors = StringBuilder()
@@ -119,7 +146,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
 
         val fields = arrayListOf<EditText>()
 
-        loadConfig()
+        initConfigs()
 
         verticalLayout {
             padding = dip(20)
@@ -294,33 +321,6 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
         }
     }
 
-    fun loadConfig() {
-        try {
-            ObjectInputStream(openFileInput(current_config_data)).use {
-                config = it.readObject() as Config
-            }
-        } catch (ex: FileNotFoundException) {
-            val confs = Configurations()
-
-            defaultConfigs.forEach {
-                config = Gson().fromJson(InputStreamReader(resources.openRawResource(it)),
-                        Config::class.java)
-
-                if (BuildConfig.DEBUG) {
-                    val errors = StringBuilder()
-                    if (!validateConfig(config, errors)) {
-                        info(">>> ${config.params.name}: " + Html.fromHtml(errors.toString()))
-                    }
-                }
-
-                confs.configs.put(config.params.name, config)
-            }
-
-            saveConfigurations(confs)
-            saveConfig(false)
-        }
-    }
-
     fun saveConfigurations(confs: Configurations) {
         ObjectOutputStream(openFileOutput(configurations_data, Context.MODE_PRIVATE)).use {
             it.writeObject(confs)