app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt

@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity() {
     lateinit var handler: Handler
     var savingEvent = false
     val updateListRunnable: Runnable = Runnable {
-        loadLogbook(logbook.name)
+        loadLogbook()
         handler.postDelayed(updateListRunnable, 1000*60)
     }
     var logbookRepo: LogbookRepository? = null
@@ -122,10 +122,10 @@ class MainActivity : AppCompatActivity() {
             showSettings()
         })
         findViewById<View>(R.id.button_no_connection_retry).setOnClickListener({
-            loadLogbook(logbook.name)
+            loadLogbook()
         })
         findViewById<View>(R.id.button_sync).setOnClickListener({
-            loadLogbook(logbook.name)
+            loadLogbook()
         })
     }
 
@@ -373,51 +373,12 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun addLogbook(logbookName: String) {
-        val newLogbook = Logbook(logbookName)
-        setLoading(true)
-        logbookRepo?.saveLogbook(this, newLogbook, object: LogbookSavedListener{
-            override fun onLogbookSaved() {
-                Log.d(TAG, "Logbook $logbookName created")
-                runOnUiThread({
-                    setLoading(false)
-                    loadLogbookList()
-                    Toast.makeText(this@MainActivity, getString(R.string.logbook_created) + logbookName, Toast.LENGTH_SHORT).show()
-                })
-            }
-
-            override fun onIOError(error: IOException) {
-                runOnUiThread({
-                    onRepoError(getString(R.string.settings_network_error) + error.toString())
-                })
-            }
-
-            override fun onWebDAVError(error: SardineException) {
-                runOnUiThread({
-                    onRepoError(
-                        if(error.toString().contains("401")) {
-                            getString(R.string.settings_webdav_error_denied)
-                        } else {
-                            getString(R.string.settings_webdav_error_generic) + error.toString()
-                        }
-                    )
-                })
-            }
-
-            override fun onJSONError(error: JSONException) {
-                runOnUiThread({
-                    onRepoError(getString(R.string.settings_json_error) + error.toString())
-                })
-            }
-
-            override fun onError(error: Exception) {
-                runOnUiThread({
-                    onRepoError(getString(R.string.settings_generic_error) + error.toString())
-                })
-            }
-        })
+        this.logbook = Logbook(logbookName)
+        saveLogbook()
+        loadLogbookList()   // TODO: Does not reload logbooks buttons on top, why?
     }
 
-    fun loadLogbook(name: String) {
+    fun loadLogbook(name: String = LogbookRepository.DEFAULT_LOGBOOK_NAME) {
         if (savingEvent)
             return
 

app/src/main/res/values-it/strings.xml

@@ -81,10 +81,9 @@
     <string name="dialog_event_detail_title">Dettaglio evento</string>
 
     <string name="dialog_add_logbook_title">Aggiungi diario</string>
-    <string name="dialog_add_logbook_logbookname">👶 Nome del diario</string>
-    <string name="dialog_add_logbook_message">Scrivi un nome per identificare questo diario. Comparirà in cima allo schermo, e se usi WebDAV sarà incluso anche nel nome del file di salvataggio.\nSe vuoi un\'icona, inserisci una emoji!</string>
+    <string name="dialog_add_logbook_logbookname">Nome del diario</string>
+    <string name="dialog_add_logbook_message">Scrivi un nome per identificare questo diario. Comparirà in cima allo schermo, e se usi WebDAV sarà incluso anche nel nome del file di salvataggio.</string>
 
     <string name="default_logbook_name">👶 Il mio primo diario</string>
-    <string name="logbook_created">Creato nuovo diario: </string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -104,10 +104,9 @@
     <string name="dialog_event_detail_title">Event detail</string>
 
     <string name="dialog_add_logbook_title">Add logbook</string>
-    <string name="dialog_add_logbook_logbookname">👶 Logbook name</string>
+    <string name="dialog_add_logbook_logbookname">Logbook name</string>
     <string name="dialog_add_logbook_message">Write a name to identify this logbook. This name will appear on top of the screen and, if you use WebDAV, will be in the save file name as well.</string>
 
     <string name="default_logbook_name">👶 My first logbook</string>
-    <string name="logbook_created">New logbook created: </string>
 
 </resources>