From 56eae5f5b46f67b475d6f5110cd876ad7a7360dc Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:49:20 +0800
Subject: [PATCH] [app] Cleanup file provider paths (#393)

* [app] Cleanup file provider paths

* [app] Remove unused files
---
 app/src/main/AndroidManifest.xml              | 17 +++++++------
 .../manager/ui/activity/LogsActivity.java     | 17 ++++++-------
 app/src/main/res/values-fr/strings.xml        |  2 +-
 app/src/main/res/values-night/bool.xml        | 24 -------------------
 app/src/main/res/values-zh-rTW/strings.xml    |  1 -
 app/src/main/res/values/bool.xml              | 24 -------------------
 app/src/main/res/xml/file_paths.xml           |  8 ++-----
 7 files changed, 22 insertions(+), 71 deletions(-)
 delete mode 100644 app/src/main/res/values-night/bool.xml
 delete mode 100644 app/src/main/res/values/bool.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 080804a0..74e31b16 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ This file is part of LSPosed.
   ~
   ~ LSPosed is free software: you can redistribute it and/or modify
@@ -24,7 +23,8 @@
     package="org.lsposed.manager">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"
+    <uses-permission
+        android:name="android.permission.INTERACT_ACROSS_USERS"
         tools:ignore="ProtectedPermissions" />
 
     <queries>
@@ -48,13 +48,15 @@
             android:name=".ui.activity.LogsActivity"
             android:label="@string/Logs" />
         <activity android:name=".ui.activity.AppListActivity" />
-        <activity android:name=".ui.activity.RepoActivity"
-            android:label="@string/module_repo"/>
+        <activity
+            android:name=".ui.activity.RepoActivity"
+            android:label="@string/module_repo" />
         <activity android:name=".ui.activity.RepoItemActivity" />
         <activity
             android:name=".ui.activity.MainActivity"
             android:label="@string/app_name"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -70,7 +72,8 @@
             android:label="@string/Modules" />
         <activity
             android:name=".ui.activity.SettingsActivity"
-            android:label="@string/Settings">
+            android:label="@string/Settings"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
 
diff --git a/app/src/main/java/org/lsposed/manager/ui/activity/LogsActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/LogsActivity.java
index 77cef019..43614c09 100644
--- a/app/src/main/java/org/lsposed/manager/ui/activity/LogsActivity.java
+++ b/app/src/main/java/org/lsposed/manager/ui/activity/LogsActivity.java
@@ -47,6 +47,15 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 
+import org.lsposed.manager.BuildConfig;
+import org.lsposed.manager.ConfigManager;
+import org.lsposed.manager.R;
+import org.lsposed.manager.databinding.ActivityLogsBinding;
+import org.lsposed.manager.databinding.DialogInstallWarningBinding;
+import org.lsposed.manager.databinding.ItemLogBinding;
+import org.lsposed.manager.ui.activity.base.BaseActivity;
+import org.lsposed.manager.util.LinearLayoutManagerFix;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileDescriptor;
@@ -62,14 +71,6 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
 
-import org.lsposed.manager.BuildConfig;
-import org.lsposed.manager.ConfigManager;
-import org.lsposed.manager.R;
-import org.lsposed.manager.databinding.ActivityLogsBinding;
-import org.lsposed.manager.databinding.DialogInstallWarningBinding;
-import org.lsposed.manager.databinding.ItemLogBinding;
-import org.lsposed.manager.ui.activity.base.BaseActivity;
-import org.lsposed.manager.util.LinearLayoutManagerFix;
 import rikka.core.os.FileUtils;
 import rikka.recyclerview.RecyclerViewKt;
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7f82f128..c00ccebc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -49,7 +49,7 @@
     <string name="info_manager_version">Version du gestionnaire</string>
     <string name="info_system_version">Version du système</string>
     <string name="info_device">Périphérique </string>
-    <string name="info_system_abi">Architecture du système</string>  
+    <string name="info_system_abi">Architecture du système</string>
 
     <!-- LogsActivity -->
     <string name="menuSend">Envoyer</string>
diff --git a/app/src/main/res/values-night/bool.xml b/app/src/main/res/values-night/bool.xml
deleted file mode 100644
index 36777603..00000000
--- a/app/src/main/res/values-night/bool.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ This file is part of LSPosed.
-  ~
-  ~ LSPosed is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ LSPosed is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
-  ~
-  ~ Copyright (C) 2020 EdXposed Contributors
-  ~ Copyright (C) 2021 LSPosed Contributors
-  -->
-
-<resources>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a99e52e2..98740201 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -170,7 +170,6 @@
     <string name="module_release_no_more">沒有更早期的版本</string>
     <string name="repo_load_failed">模組倉庫載入失敗：%s</string>
 
-    
 
     <string name="app_destroyed">此應用程式已損毀，請確保您從官方來源下載該應用程式。</string>
     <string name="outdated_manager">LSPosed Manager 和 LSPosed 核心的版本不一致。請重新安裝對應的版本。</string>
diff --git a/app/src/main/res/values/bool.xml b/app/src/main/res/values/bool.xml
deleted file mode 100644
index 36777603..00000000
--- a/app/src/main/res/values/bool.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ This file is part of LSPosed.
-  ~
-  ~ LSPosed is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ LSPosed is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
-  ~
-  ~ Copyright (C) 2020 EdXposed Contributors
-  ~ Copyright (C) 2021 LSPosed Contributors
-  -->
-
-<resources>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
index 3ca7f0c7..53546f09 100644
--- a/app/src/main/res/xml/file_paths.xml
+++ b/app/src/main/res/xml/file_paths.xml
@@ -19,11 +19,7 @@
   -->
 
 <paths>
-    <external-cache-path
-        name="downloads"
-        path="/downloads" />
-    <!--suppress AndroidElementNotAllowed -->
-    <root-path
+    <cache-path
         name="log"
-        path="/" />
+        path="." />
 </paths>