From 69567dfaa02205370850746e723e40e7765031f4 Mon Sep 17 00:00:00 2001
From: Rahul Kumar Patel <whyorean@gmail.com>
Date: Sat, 27 Mar 2021 02:54:31 +0530
Subject: [PATCH] Auto strip Huawei realated properties from config

---
 .../providers/NativeDeviceInfoProvider.kt     | 21 ++++++++++++++++++-
 .../store/view/ui/splash/SplashActivity.kt    | 13 ++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/data/providers/NativeDeviceInfoProvider.kt b/app/src/main/java/com/aurora/store/data/providers/NativeDeviceInfoProvider.kt
index 2758b7d2c..0bd81338b 100644
--- a/app/src/main/java/com/aurora/store/data/providers/NativeDeviceInfoProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/NativeDeviceInfoProvider.kt
@@ -24,12 +24,13 @@ import android.content.ContextWrapper
 import android.content.res.Configuration
 import android.os.Build
 import android.text.TextUtils
+import com.aurora.extensions.isHuawei
 import java.util.*
 
 class NativeDeviceInfoProvider(context: Context) : ContextWrapper(context) {
 
     fun getNativeDeviceProperties(): Properties {
-        return Properties().apply {
+        val properties = Properties().apply {
             //Build Props
             setProperty("UserReadableName", "${Build.DEVICE}-default")
             setProperty("Build.HARDWARE", Build.HARDWARE)
@@ -116,6 +117,11 @@ class NativeDeviceInfoProvider(context: Context) : ContextWrapper(context) {
             setProperty("CellOperator", "310")
             setProperty("SimOperator", "38")
         }
+
+        if (isHuawei())
+            stripHuaweiProperties(properties)
+
+        return properties
     }
 
     private fun getFeatures(): List<String> {
@@ -164,4 +170,17 @@ class NativeDeviceInfoProvider(context: Context) : ContextWrapper(context) {
         }
         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
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
index 4d3110c8a..cb330759c 100644
--- a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
@@ -23,7 +23,10 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 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.R
 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.view.ui.commons.BaseActivity
 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.viewmodel.auth.AuthViewModel
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
@@ -89,13 +91,6 @@ class SplashActivity : BaseActivity() {
                 AuthState.Unavailable -> {
                     updateStatus("You need to login first")
                     updateActionLayout(true)
-
-                    if (isHuawei()) {
-                        runOnUiThread {
-                            DeviceHuaweiSheet.newInstance()
-                                .show(supportFragmentManager, DeviceHuaweiSheet.TAG)
-                        }
-                    }
                 }
 
                 AuthState.SignedIn -> {