From 1adb7d11d1068cca9c7c370e922557bd80a25a24 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+huancheng65@users.noreply.github.com>
Date: Fri, 10 Jun 2022 11:30:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E5=8C=85=E6=98=AF=E5=90=A6=E5=AE=89=E8=A3=85=E9=97=AA=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                           | 6 +-----
 .../java/com/huanchengfly/tieba/post/utils/PackageUtils.kt | 7 ++++++-
 app/src/main/res/xml/data_extraction_rules.xml             | 4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/xml/data_extraction_rules.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ebf2a427..c7111725 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,11 +26,6 @@
     <uses-permission android:name="com.miui.personalassistant.permission.FAVORITE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
-    <queries>
-        <package android:name="com.baidu.tieba" />
-        <package android:name="com.baidu.tieba_mini" />
-    </queries>
-
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
@@ -49,6 +44,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         tools:ignore="UnusedAttribute">
         <activity
             android:name=".activities.AppFontSizeActivity"
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/PackageUtils.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/PackageUtils.kt
index bb568a2c..dcee3590 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/utils/PackageUtils.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/PackageUtils.kt
@@ -3,7 +3,12 @@ package com.huanchengfly.tieba.post.utils
 import android.content.Context
 
 fun Context.isPackageInstalled(packageName: String): Boolean {
-    return packageManager.getPackageInfo(packageName, 0) != null
+return try {
+    packageManager.getPackageInfo(packageName, 0)
+    true
+} catch (e: Exception) {
+    false
+}
 }
 
 fun Context.isAnyPackageInstalled(packages: Array<String>): Boolean {
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 00000000..e46addba
--- /dev/null
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup></cloud-backup>
+</data-extraction-rules>
\ No newline at end of file