diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8f57e7ee..720c5ad3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -49,6 +49,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:largeHeap="true" + android:networkSecurityConfig="@xml/network_security_config" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" diff --git a/app/src/main/java/com/idormy/sms/forwarder/AppListActivity.java b/app/src/main/java/com/idormy/sms/forwarder/AppListActivity.java index 3c466c59..1c61cf8f 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/AppListActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/AppListActivity.java @@ -26,7 +26,6 @@ import androidx.appcompat.app.AppCompatActivity; import com.idormy.sms.forwarder.adapter.AppAdapter; import com.idormy.sms.forwarder.model.AppInfo; -import com.umeng.analytics.MobclickAgent; import java.util.ArrayList; import java.util.List; @@ -151,22 +150,4 @@ public class AppListActivity extends AppCompatActivity { return (pi.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1; } - @Override - protected void onDestroy() { - Log.d(TAG, "onDestroy"); - super.onDestroy(); - } - - @Override - protected void onResume() { - super.onResume(); - MobclickAgent.onResume(this); - } - - @Override - protected void onPause() { - super.onPause(); - MobclickAgent.onPause(this); - } - } diff --git a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java index 3d33d850..e461f990 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java @@ -46,7 +46,6 @@ import com.idormy.sms.forwarder.utils.SharedPreferencesHelper; import com.idormy.sms.forwarder.utils.SmsUtil; import com.idormy.sms.forwarder.utils.TimeUtil; import com.idormy.sms.forwarder.view.StepBar; -import com.umeng.analytics.MobclickAgent; import com.umeng.commonsdk.UMConfigure; import java.lang.reflect.Method; @@ -229,8 +228,6 @@ public class MainActivity extends AppCompatActivity implements RefreshListView.I @Override protected void onResume() { super.onResume(); - MobclickAgent.onPageStart(TAG); - MobclickAgent.onResume(this); //是否同意隐私协议 if (!MyApplication.allowPrivacyPolicy) return; @@ -285,8 +282,6 @@ public class MainActivity extends AppCompatActivity implements RefreshListView.I //是否同意隐私协议 if (!MyApplication.allowPrivacyPolicy) return; - MobclickAgent.onPageEnd(TAG); - MobclickAgent.onPause(this); try { if (serviceIntent != null) startService(serviceIntent); } catch (Exception e) { diff --git a/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java b/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java index b78cf591..939cfb45 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java @@ -35,7 +35,6 @@ import com.idormy.sms.forwarder.utils.LogUtil; import com.idormy.sms.forwarder.utils.RuleUtil; import com.idormy.sms.forwarder.utils.SettingUtil; import com.idormy.sms.forwarder.view.StepBar; -import com.umeng.analytics.MobclickAgent; import java.util.ArrayList; import java.util.Date; @@ -596,19 +595,10 @@ public class RuleActivity extends AppCompatActivity { super.onDestroy(); } - @Override - protected void onResume() { - super.onResume(); - MobclickAgent.onPageStart(TAG); - MobclickAgent.onResume(this); - } - @Override protected void onPause() { overridePendingTransition(0, 0); super.onPause(); - MobclickAgent.onPageEnd(TAG); - MobclickAgent.onPause(this); } private int checkRegexReplace(String regexReplace) { diff --git a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java index 6f3f84f6..2ed88cc1 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java @@ -72,7 +72,6 @@ import com.idormy.sms.forwarder.utils.LogUtil; import com.idormy.sms.forwarder.utils.RuleUtil; import com.idormy.sms.forwarder.view.ClearEditText; import com.idormy.sms.forwarder.view.StepBar; -import com.umeng.analytics.MobclickAgent; import java.net.Proxy; import java.util.ArrayList; @@ -325,19 +324,10 @@ public class SenderActivity extends AppCompatActivity { super.onDestroy(); } - @Override - protected void onResume() { - super.onResume(); - MobclickAgent.onPageStart(TAG); - MobclickAgent.onResume(this); - } - @Override protected void onPause() { overridePendingTransition(0, 0); super.onPause(); - MobclickAgent.onPageEnd(TAG); - MobclickAgent.onPause(this); } // 初始化数据 diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 67820c56..00000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml new file mode 100644 index 00000000..8bd7a232 --- /dev/null +++ b/app/src/main/res/xml/network_security_config.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file