From 8a29dc1c6c87982ad2320464dd7350ac02893cee Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Wed, 8 May 2019 14:09:41 +0300
Subject: [PATCH] - Removed context var from BaresipService.

---
 app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt | 2 --
 app/src/main/kotlin/com/tutpro/baresip/Config.kt         | 7 +++----
 app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 10396a79..8bed38bb 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -51,7 +51,6 @@ class BaresipService: Service() {
         intent.setPackage("com.tutpro.baresip")
 
         filesPath = filesDir.absolutePath
-        context = applicationContext
 
         am = getSystemService(Context.AUDIO_SERVICE) as AudioManager
         val rtUri = RingtoneManager.getActualDefaultRingtoneUri(applicationContext,
@@ -771,7 +770,6 @@ class BaresipService: Service() {
         var callVolume = 0
 
         var filesPath = ""
-        var context: Context? = null
         var uas = ArrayList<UserAgent>()
         var status = ArrayList<Int>()
         var calls = ArrayList<Call>()
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index d34eb419..8d8b5cd1 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -1,13 +1,12 @@
 package com.tutpro.baresip
 
+import android.content.Context
 import java.io.File
 
 object Config {
 
     private val path = BaresipService.filesPath + "/config"
     private val file = File(path)
-    private val context = BaresipService.context
-
     private var config = Utils.getFileContents(file)
 
     fun initialize() {
@@ -75,8 +74,8 @@ object Config {
         add(variable, value)
     }
 
-    fun reset() {
-        Utils.copyAssetToFile(context!!, "config", path)
+    fun reset(ctx: Context) {
+        Utils.copyAssetToFile(ctx, "config", path)
     }
 
     fun save() {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
index b3ade67f..397808d3 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
@@ -193,7 +193,7 @@ class ConfigActivity : AppCompatActivity() {
             }
 
             if (reset.isChecked) {
-                Config.reset()
+                Config.reset(this)
                 save = false
                 restart = true
             }