Add navigate up to settings

mobile/src/main/java/be/mygod/vpnhotspot/SettingsActivity.kt

@@ -9,6 +9,6 @@ class SettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         DataBindingUtil.setContentView<ActivitySettingsBinding>(this, R.layout.activity_settings)
-                .toolbar.setNavigationOnClickListener({ finish() })
+                .toolbar.setNavigationOnClickListener({ navigateUp() })
     }
 }

mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt

@@ -5,6 +5,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Bundle
+import android.support.v4.app.TaskStackBuilder
+import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import java.io.InputStream
 
@@ -22,6 +24,13 @@ fun intentFilter(vararg actions: String): IntentFilter {
     return result
 }
 
+fun AppCompatActivity.navigateUp() {
+    val intent = parentActivityIntent
+    if (shouldUpRecreateTask(intent))
+        TaskStackBuilder.create(this).addNextIntentWithParentStack(intent).startActivities()
+    else navigateUpTo(intent)
+}
+
 fun Bundle.put(key: String, map: Array<String>): Bundle {
     putStringArray(key, map)
     return this