12 files changed, 258 insertions, 178 deletions

diff --git a/app/build.gradle b/app/build.gradle
index d4db5ee..50fdddc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,6 +76,7 @@ dependencies {
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
   implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.3'
+  implementation "android.arch.lifecycle:extensions:1.1.1"
   implementation "com.android.support:support-compat:27.1.1"
   implementation 'com.android.support:design:27.1.1'
   implementation 'com.google.zxing:android-integration:3.3.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2536db4..054438e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,7 +64,7 @@
                 </activity>
 
                 <activity
-                        android:name=".activities.ViewLogActivity"
+                        android:name=".activities.viewlog.ViewLogActivity"
                         android:configChanges="orientation|screenSize">
                 </activity>
 
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
index af71544..a51d401 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -18,6 +18,7 @@
 
 package org.pacien.tincapp.activities
 
+import android.content.Intent
 import android.os.Bundle
 import android.support.annotation.LayoutRes
 import android.support.annotation.StringRes
@@ -68,6 +69,13 @@ abstract class BaseActivity : AppCompatActivity() {
     super.onStop()
   }
 
+  override fun getSupportActionBar() = super.getSupportActionBar()!!
+
+  fun startActivityChooser(target: Intent, title: String) {
+    val intentChooser = Intent.createChooser(target, title)
+    startActivity(intentChooser)
+  }
+
   fun aboutDialog(@Suppress("UNUSED_PARAMETER") i: MenuItem) {
     AlertDialog.Builder(this)
       .setTitle(resources.getString(R.string.app_name))
diff --git a/app/src/main/java/org/pacien/tincapp/activities/ViewLogActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/ViewLogActivity.kt
deleted file mode 100644
index f3f7e24..0000000
--- a/app/src/main/java/org/pacien/tincapp/activities/ViewLogActivity.kt
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.pacien.tincapp.activities
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.widget.ScrollView
-import kotlinx.android.synthetic.main.base.*
-import kotlinx.android.synthetic.main.page_viewlog.*
-import org.pacien.tincapp.R
-import org.pacien.tincapp.commands.Executor
-import org.pacien.tincapp.commands.Tinc
-import org.pacien.tincapp.service.TincVpnService
-import java.util.*
-import kotlin.concurrent.timer
-
-/**
- * @author pacien
- */
-class ViewLogActivity : BaseActivity() {
-  companion object {
-    private const val LOG_LINES = 250
-    private const val LOG_LEVEL = 5
-    private const val NEW_LINE = "\n"
-    private const val SPACED_NEW_LINE = "\n\n"
-    private const val UPDATE_INTERVAL = 250L // ms
-    private const val MIME_TYPE = "text/plain"
-  }
-
-  private val log = LinkedList<String>()
-  private var logUpdateTimer: Timer? = null
-  private var logger: Process? = null
-  private var toggleButton: MenuItem? = null
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    supportActionBar!!.setDisplayHomeAsUpEnabled(true)
-    layoutInflater.inflate(R.layout.page_viewlog, main_content)
-    toggleLogging(true)
-  }
-
-  override fun onCreateOptionsMenu(m: Menu): Boolean {
-    menuInflater.inflate(R.menu.menu_viewlog, m)
-    toggleButton = m.findItem(R.id.log_viewer_action_toggle)
-    return super.onCreateOptionsMenu(m)
-  }
-
-  override fun onSupportNavigateUp(): Boolean {
-    finish()
-    return true
-  }
-
-  override fun onDestroy() {
-    toggleLogging(false)
-    super.onDestroy()
-  }
-
-  fun share(@Suppress("UNUSED_PARAMETER") menuItem: MenuItem) {
-    synchronized(this) {
-      val logFragment = log.joinToString(NEW_LINE)
-      val shareIntent = Intent(Intent.ACTION_SEND)
-        .setType(MIME_TYPE)
-        .putExtra(Intent.EXTRA_TEXT, logFragment)
-
-      startActivity(Intent.createChooser(shareIntent, resources.getString(R.string.menu_share_log)))
-    }
-  }
-
-  fun toggleLogging(@Suppress("UNUSED_PARAMETER") menuItem: MenuItem) = toggleLogging(logger == null)
-
-  private fun toggleLogging(enable: Boolean) {
-    if (enable) {
-      disableUserScroll()
-      toggleButton?.setIcon(R.drawable.ic_pause_circle_outline_primary_24dp)
-      startLogging()
-    } else {
-      enableUserScroll()
-      toggleButton?.setIcon(R.drawable.ic_pause_circle_filled_primary_24dp)
-      stopLogging()
-    }
-  }
-
-  private fun startLogging(level: Int = LOG_LEVEL) {
-    appendLog(resources.getString(R.string.message_log_level_set, level))
-
-    TincVpnService.getCurrentNetName()?.let { netName ->
-      Tinc.log(netName, level).let { process ->
-        logger = process
-        Executor.runAsyncTask { captureLog(process) }
-      }
-      logUpdateTimer = timer(period = UPDATE_INTERVAL, action = { printLog() })
-    } ?: run {
-      appendLog(resources.getString(R.string.message_no_daemon))
-      toggleLogging(false)
-    }
-  }
-
-  private fun stopLogging() {
-    logger?.destroy()
-    logger = null
-    logUpdateTimer?.cancel()
-    logUpdateTimer?.purge()
-    logUpdateTimer = null
-    appendLog(resources.getString(R.string.message_log_paused))
-    printLog()
-  }
-
-  private fun captureLog(logger: Process) {
-    logger.inputStream?.use { inputStream ->
-      inputStream.bufferedReader().useLines { lines ->
-        lines.forEach { appendLog(it) }
-      }
-    }
-  }
-
-  private fun appendLog(line: String) = synchronized(this) {
-    if (log.size >= LOG_LINES) log.removeFirst()
-    log.addLast(line)
-  }
-
-  private fun printLog() = synchronized(this) {
-    log.joinToString(SPACED_NEW_LINE).let {