From 5cf2a3b4ad938397c3a7e975ff34783a71a90924 Mon Sep 17 00:00:00 2001
From: Ling0925 <67010066+Ling0925@users.noreply.github.com>
Date: Sat, 21 Jan 2023 23:16:30 +0800
Subject: [PATCH] fix: IMEI Permission

---
 app/src/main/AndroidManifest.xml                            | 2 --
 .../huanchengfly/tieba/post/fragments/SettingsFragment.kt   | 4 ++--
 .../com/huanchengfly/tieba/post/utils/MobileInfoUtil.java   | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2d50f9fb..bfd061ba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,8 +15,6 @@
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/SettingsFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/SettingsFragment.kt
index 73a4761a..a20041a7 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/SettingsFragment.kt
@@ -76,7 +76,7 @@ class SettingsFragment : PreferencesFragment() {
         }
         findPreference<Preference>("clear_search_history")!!.onPreferenceClickListener = Preference.OnPreferenceClickListener {
             SearchHistoryTable(attachContext).clearDatabase()
-            if (view != null) Util.createSnackbar(view!!, R.string.toast_clear_success, Snackbar.LENGTH_SHORT).show()
+            if (view != null) Util.createSnackbar(requireView() , R.string.toast_clear_success, Snackbar.LENGTH_SHORT).show()
             true
         }
         findPreference<Preference>("exit_account")!!.isEnabled = AccountUtil.isLoggedIn(attachContext)
@@ -132,7 +132,7 @@ class SettingsFragment : PreferencesFragment() {
         clearCache!!.summary = attachContext.getString(R.string.tip_cache, GlideCacheUtil.getInstance().getCacheSize(attachContext))
         clearCache.onPreferenceClickListener = Preference.OnPreferenceClickListener { preference: Preference ->
             GlideCacheUtil.getInstance().clearImageAllCache(attachContext)
-            if (view != null) Util.createSnackbar(view!!, R.string.toast_clear_cache_success, Snackbar.LENGTH_SHORT).show()
+            if (view != null) Util.createSnackbar(requireView() , R.string.toast_clear_cache_success, Snackbar.LENGTH_SHORT).show()
             preference.summary = attachContext.getString(R.string.tip_cache, "0.0B")
             true
         }
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/MobileInfoUtil.java b/app/src/main/java/com/huanchengfly/tieba/post/utils/MobileInfoUtil.java
index 1bc329ed..e1367b19 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/utils/MobileInfoUtil.java
+++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/MobileInfoUtil.java
@@ -16,9 +16,9 @@ public class MobileInfoUtil {
         try {
             TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
             String imei = null;
-            if (telephonyManager != null) {
-                imei = telephonyManager.getDeviceId();
-            }
+            // if (telephonyManager != null) {
+            // imei = telephonyManager.getDeviceId();
+            // }
             if (imei == null) {
                 imei = DEFAULT_IMEI;
             }