mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-14 20:08:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove GeeksvilleApplication constructors with default parameters

Browse Source
This commit is contained in:
andrekir
2022-10-04 00:22:41 -03:00
parent 43652f4742
commit 801bc2dd6c
2 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt
View File

@@ -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()

20
app/src/main/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
View File

@@ -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
}
}