From 801bc2dd6c5d2674657a845db2656ef88b773e28 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Tue, 4 Oct 2022 00:22:41 -0300
Subject: [PATCH] remove GeeksvilleApplication constructors with default
 parameters

---
 .../geeksville/mesh/MeshUtilApplication.kt    |  5 +----
 .../mesh/android/GeeksvilleApplication.kt     | 20 ++-----------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt b/app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt
index fc9839238..e7687fcd2 100644
--- a/app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt
+++ b/app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt
@@ -9,11 +9,8 @@ import com.geeksville.mesh.util.Exceptions
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.HiltAndroidApp
 
-// NOTE: This is a workaround since the Hilt Gradle plugin doesn't support constructors with default parameters
-open class GeeksvilleApplicationWrapper : GeeksvilleApplication()
-
 @HiltAndroidApp
-class MeshUtilApplication : GeeksvilleApplicationWrapper() {
+class MeshUtilApplication : GeeksvilleApplication() {
 
     override fun onCreate() {
         super.onCreate()
diff --git a/app/src/main/java/com/geeksville/mesh/android/GeeksvilleApplication.kt b/app/src/main/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
index 446a55857..0b34f9f64 100644
--- a/app/src/main/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
@@ -4,7 +4,6 @@ import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
-import android.net.ConnectivityManager
 import android.os.Bundle
 import android.provider.Settings
 import androidx.core.content.edit
@@ -23,11 +22,7 @@ fun isGooglePlayAvailable(context: Context): Boolean {
  * Created by kevinh on 1/4/15.
  */
 
-open class GeeksvilleApplication(
-    val splunkKey: String? = null,
-    val mixpanelKey: String? = null,
-    val pushKey: String? = null
-) : Application(), Logging {
+open class GeeksvilleApplication : Application(), Logging {
 
     companion object {
         lateinit var analytics: AnalyticsProvider
@@ -88,7 +83,7 @@ open class GeeksvilleApplication(
         }
 
     override fun onCreate() {
-        super<Application>.onCreate()
+        super.onCreate()
 
         val googleAnalytics = com.geeksville.mesh.analytics.GoogleAnalytics(this)
         analytics = googleAnalytics
@@ -98,15 +93,4 @@ open class GeeksvilleApplication(
 
         registerActivityLifecycleCallbacks(lifecycleCallbacks)
     }
-
-    fun isInternetConnected(): Boolean {
-        val cm = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-        val activeNetwork = cm.getActiveNetworkInfo();
-        val isConnected = activeNetwork != null &&
-                activeNetwork.isConnectedOrConnecting();
-
-        return isConnected
-    }
-
 }