From 206650779ca07dd8ebfd35bbf32f39f72244102a Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sun, 15 Mar 2020 19:12:44 +0800
Subject: [PATCH] Fix download

---
 app/build.gradle                              |  4 +--
 app/proguard-rules.pro                        |  2 +-
 app/src/debug/assets/xposed_init              |  2 +-
 app/src/main/assets/xposed_init               |  2 +-
 .../me/iacn/biliroaming/MainActivity.java     |  2 +-
 .../java/me/iacn/biliroaming/XposedInit.java  |  2 +-
 .../biliroaming/hook/BangumiPlayUrlHook.java  |  2 +-
 app/src/main/res/values-en/strings.xml        | 28 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  6 ++--
 app/src/main/res/xml/prefs_setting.xml        |  5 ++++
 10 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/values-en/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 6ac7635271..34038fa453 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "me.iacn.biliroaming"
         minSdkVersion 21
         targetSdkVersion 29  // Target Android O
-        versionCode 10
-        versionName "1.1.7"
+        versionCode 12
+        versionName "1.1.8"
     }
 
     buildTypes {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 8d139542e6..e44b908570 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -3,7 +3,7 @@
 }
 
 -keep class * implements de.robv.android.xposed.IXposedHookInitPackageResources {
-  public void *(de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam);
+  public void *(de.robv.android.xposed.callbacks.XC_InitPackageResources.InitPackageResourcesParam);
 }
 
 -keepclassmembers class me.iacn.biliroaming.MainActivity {
diff --git a/app/src/debug/assets/xposed_init b/app/src/debug/assets/xposed_init
index c6183a0727..8f39f2ebaf 100644
--- a/app/src/debug/assets/xposed_init
+++ b/app/src/debug/assets/xposed_init
@@ -1 +1 @@
-me.iacn.hotxposed.HotXposedInit
\ No newline at end of file
+me.iacn.hotxposed.HotXposedInit
diff --git a/app/src/main/assets/xposed_init b/app/src/main/assets/xposed_init
index 90c6a9cdaf..e47097afd4 100644
--- a/app/src/main/assets/xposed_init
+++ b/app/src/main/assets/xposed_init
@@ -1 +1 @@
-me.iacn.biliroaming.XposedInit
\ No newline at end of file
+me.iacn.biliroaming.XposedInit
diff --git a/app/src/main/java/me/iacn/biliroaming/MainActivity.java b/app/src/main/java/me/iacn/biliroaming/MainActivity.java
index 4ce96be00e..29668f2870 100644
--- a/app/src/main/java/me/iacn/biliroaming/MainActivity.java
+++ b/app/src/main/java/me/iacn/biliroaming/MainActivity.java
@@ -90,7 +90,7 @@ public void onResume() {
             super.onResume();
 
             if (isTaiChiModuleActive(getActivity())) {
-                runningStatusPref.setTitle(R.string.running_status_disable);
+                runningStatusPref.setTitle(R.string.running_status_enable);
                 runningStatusPref.setSummary(R.string.runtime_taichi);
             } else {
                 if (isModuleActive()) {
diff --git a/app/src/main/java/me/iacn/biliroaming/XposedInit.java b/app/src/main/java/me/iacn/biliroaming/XposedInit.java
index 96f83607bd..c27470ec4a 100644
--- a/app/src/main/java/me/iacn/biliroaming/XposedInit.java
+++ b/app/src/main/java/me/iacn/biliroaming/XposedInit.java
@@ -63,4 +63,4 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
             }
         });
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/me/iacn/biliroaming/hook/BangumiPlayUrlHook.java b/app/src/main/java/me/iacn/biliroaming/hook/BangumiPlayUrlHook.java
index 721e0114ae..c2f2bc9260 100644
--- a/app/src/main/java/me/iacn/biliroaming/hook/BangumiPlayUrlHook.java
+++ b/app/src/main/java/me/iacn/biliroaming/hook/BangumiPlayUrlHook.java
@@ -38,7 +38,7 @@ Map.class, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 Map params = (Map)param.args[0];
-                if(XposedInit.sPrefs.getBoolean("use_biliplus", false) &&
+                if(XposedInit.sPrefs.getBoolean("allow_download", false) &&
                         params.containsKey("ep_id")) {
                     params.remove("dl");
                 }
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
new file mode 100644
index 0000000000..b025668e71
--- /dev/null
+++ b/app/src/main/res/values-en/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">BiliRoaming</string>
+    <string name="xposed_description">Unblock Area Limit of Bilibili</string>
+    <string name="about">About</string>
+    <string name="version">Version</string>
+    <string name="running_status_enable">Enabled</string>
+    <string name="running_status_disable">Disabled</string>
+    <string name="not_running_summary">Not activated</string>
+    <string name="runtime_xposed">Environment: Xposed/EdXposed</string>
+    <string name="runtime_taichi">Environment: Taichi</string>
+    <string name="main_func_title">Unblock Area Limit</string>
+    <string name="main_func_summary">Allow use to watch bangumi from other area</string>
+    <string name="hide_icon_summary">Not showing icon</string>
+    <string name="hide_icon_title">Hide Icon</string>
+    <string name="use_biliplus_summary">Use Biliplus API (Only for oversea user)</string>
+    <string name="use_biliplus_title">Use Biliplus API</string>
+    <string name="custom_theme_title">Customize Theme Color</string>
+    <string name="custom_theme_summary">Allow user to customize theme color</string>
+    <string name="teenagers_mode_dialog_title">Disable Teen Dialog</string>
+    <string name="teenagers_mode_dialog_summary">You can still enter from sidebar</string>
+    <string name="allow_download_title">Download Copyrighted Bangumi</string>
+    <string name="allow_download_summary">Allow user to download bangumi with copyright</string>
+    <string name="comment_floor_title">Show Comment Floor</string>
+    <string name="comment_floor_summary">Show comment floor as previous version</string>
+    <string name="author">Author</string>
+    <string name="author_list">iAcn/djytw/yujincheng08</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b42033d1ac..dc75fe4681 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,13 +3,15 @@
     <string name="xposed_description">解锁B站港澳台番剧限制</string>
     <string name="about">关于</string>
     <string name="version">版本</string>
+    <string name="author">作者</string>
+    <string name="author_list">iAcn/djytw/yujincheng08</string>
     <string name="running_status_enable">已启用</string>
     <string name="running_status_disable">未启用</string>
     <string name="not_running_summary">插件当前没有被激活</string>
     <string name="runtime_xposed">运行环境：Xposed/EdXposed</string>
-    <string name="runtime_taichi">使用太极环境</string>
+    <string name="runtime_taichi">运行环境：太极</string>
     <string name="main_func_title">解锁番剧限制</string>
-    <string name="main_func_summary">使大陆的用户可以正常观看港澳台番剧</string>
+    <string name="main_func_summary">使用户可以观看区域外版权番剧</string>
     <string name="hide_icon_summary">不显示本应用在启动器中的图标</string>
     <string name="hide_icon_title">隐藏桌面图标</string>
     <string name="use_biliplus_summary">使用BiliPlus（海外用户回国用，大陆用户不要打开，会变慢）</string>
diff --git a/app/src/main/res/xml/prefs_setting.xml b/app/src/main/res/xml/prefs_setting.xml
index d21448e650..f7e2d1fb2a 100644
--- a/app/src/main/res/xml/prefs_setting.xml
+++ b/app/src/main/res/xml/prefs_setting.xml
@@ -41,6 +41,11 @@
             android:key="version"
             android:title="@string/version" />
 
+        <Preference
+            android:key="author"
+            android:title="@string/author"
+            android:summary="@string/author_list"/>
+
         <Preference android:key="running_status" />
 
     </PreferenceCategory>