diff --git a/android/app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt b/android/app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt index 06c3256..2dbf8b9 100644 --- a/android/app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt +++ b/android/app/src/main/kotlin/com/lifegpc/ehf/MainActivity.kt @@ -3,6 +3,7 @@ package com.lifegpc.ehf import android.app.Activity import android.content.Intent import android.os.Build +import android.provider.Settings import android.view.WindowManager import com.lifegpc.ehf.annotation.ChannelMethod import com.lifegpc.ehf.eventbus.SAFAuthEvent @@ -68,5 +69,11 @@ class MainActivity : FlutterActivity() { @ChannelMethod(methodName = "deviceName") @Suppress("unused") - private fun getDeviceName(): String = Build.MODEL + private fun getDeviceName(): String { + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { + Settings.Global.getString(contentResolver, Settings.Global.DEVICE_NAME) ?: Build.MODEL + } else { + Build.MODEL + } + } }