Auto strip Huawei realated properties from config
This commit is contained in:
@@ -24,12 +24,13 @@ import android.content.ContextWrapper
|
|||||||
import android.content.res.Configuration
|
import android.content.res.Configuration
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.text.TextUtils
|
import android.text.TextUtils
|
||||||
|
import com.aurora.extensions.isHuawei
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
class NativeDeviceInfoProvider(context: Context) : ContextWrapper(context) {
|
class NativeDeviceInfoProvider(context: Context) : ContextWrapper(context) {
|
||||||
|
|
||||||
fun getNativeDeviceProperties(): Properties {
|
fun getNativeDeviceProperties(): Properties {
|
||||||
return Properties().apply {
|
val properties = Properties().apply {
|
||||||
//Build Props
|
//Build Props
|
||||||
setProperty("UserReadableName", "${Build.DEVICE}-default")
|
setProperty("UserReadableName", "${Build.DEVICE}-default")
|
||||||
setProperty("Build.HARDWARE", Build.HARDWARE)
|
setProperty("Build.HARDWARE", Build.HARDWARE)
|
||||||
@@ -116,6 +117,11 @@ class NativeDeviceInfoProvider(context: Context) : ContextWrapper(context) {
|
|||||||
setProperty("CellOperator", "310")
|
setProperty("CellOperator", "310")
|
||||||
setProperty("SimOperator", "38")
|
setProperty("SimOperator", "38")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isHuawei())
|
||||||
|
stripHuaweiProperties(properties)
|
||||||
|
|
||||||
|
return properties
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getFeatures(): List<String> {
|
private fun getFeatures(): List<String> {
|
||||||
@@ -164,4 +170,17 @@ class NativeDeviceInfoProvider(context: Context) : ContextWrapper(context) {
|
|||||||
}
|
}
|
||||||
return libraries
|
return libraries
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun stripHuaweiProperties(properties: Properties): Properties {
|
||||||
|
//Add i-Phoney properties
|
||||||
|
properties["Build.HARDWARE"] = "unknown"
|
||||||
|
properties["Build.BOOTLOADER"] = "unknown"
|
||||||
|
properties["Build.BRAND"] = "PassionFruit"
|
||||||
|
properties["Build.DEVICE"] = "ProPlus5GFold"
|
||||||
|
properties["Build.MODEL"] = "iPhoney"
|
||||||
|
properties["Build.MANUFACTURER"] = "PassionFruit"
|
||||||
|
properties["Build.PRODUCT"] = "iPhoney_24"
|
||||||
|
properties["Build.ID"] = "ABC.123"
|
||||||
|
return properties
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,10 @@ import android.os.Bundle
|
|||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import com.aurora.extensions.*
|
import com.aurora.extensions.hide
|
||||||
|
import com.aurora.extensions.load
|
||||||
|
import com.aurora.extensions.open
|
||||||
|
import com.aurora.extensions.show
|
||||||
import com.aurora.store.MainActivity
|
import com.aurora.store.MainActivity
|
||||||
import com.aurora.store.R
|
import com.aurora.store.R
|
||||||
import com.aurora.store.data.AuthState
|
import com.aurora.store.data.AuthState
|
||||||
@@ -31,7 +34,6 @@ import com.aurora.store.data.event.BusEvent
|
|||||||
import com.aurora.store.databinding.ActivitySplashBinding
|
import com.aurora.store.databinding.ActivitySplashBinding
|
||||||
import com.aurora.store.view.ui.commons.BaseActivity
|
import com.aurora.store.view.ui.commons.BaseActivity
|
||||||
import com.aurora.store.view.ui.commons.BlacklistActivity
|
import com.aurora.store.view.ui.commons.BlacklistActivity
|
||||||
import com.aurora.store.view.ui.sheets.DeviceHuaweiSheet
|
|
||||||
import com.aurora.store.view.ui.spoof.SpoofActivity
|
import com.aurora.store.view.ui.spoof.SpoofActivity
|
||||||
import com.aurora.store.viewmodel.auth.AuthViewModel
|
import com.aurora.store.viewmodel.auth.AuthViewModel
|
||||||
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
|
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
|
||||||
@@ -89,13 +91,6 @@ class SplashActivity : BaseActivity() {
|
|||||||
AuthState.Unavailable -> {
|
AuthState.Unavailable -> {
|
||||||
updateStatus("You need to login first")
|
updateStatus("You need to login first")
|
||||||
updateActionLayout(true)
|
updateActionLayout(true)
|
||||||
|
|
||||||
if (isHuawei()) {
|
|
||||||
runOnUiThread {
|
|
||||||
DeviceHuaweiSheet.newInstance()
|
|
||||||
.show(supportFragmentManager, DeviceHuaweiSheet.TAG)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AuthState.SignedIn -> {
|
AuthState.SignedIn -> {
|
||||||
|
|||||||
Reference in New Issue
Block a user