diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f981aad..08e374d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,8 +5,8 @@
-
-
+
= Build.VERSION_CODES.M) {
- int permission = ActivityCompat.checkSelfPermission(Daedalus.getInstance(), Manifest.permission.WRITE_EXTERNAL_STORAGE);
- if (MainActivity.getInstance() != null) {
- if (permission != PackageManager.PERMISSION_GRANTED) {
- ActivityCompat.requestPermissions(MainActivity.getInstance(), PERMISSIONS_STORAGE, REQUEST_EXTERNAL_STORAGE);
- }
- } else if (permission != PackageManager.PERMISSION_GRANTED) {
- return;
- }
- }
ArrayList pendingLoad = new ArrayList<>();
int type = Rule.TYPE_HOSTS;
for (Rule rule : configurations.getRules()) {
diff --git a/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java b/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
index fc2acc5..7a09d35 100644
--- a/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
+++ b/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
@@ -1,18 +1,13 @@
package org.itxtech.daedalus.activity;
-import android.Manifest;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.PackageManager;
import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
@@ -106,39 +101,12 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
Log.d(TAG, "onCreate");
}
- private void checkStorage() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- int permission = ActivityCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE);
- if (permission != PackageManager.PERMISSION_GRANTED) {
- ActivityCompat.requestPermissions(this, Daedalus.PERMISSIONS_STORAGE, Daedalus.REQUEST_EXTERNAL_STORAGE);
- }
- }
- getExternalFilesDir(null);
- }
-
- @Override
- public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
- switch (requestCode) {
- case Daedalus.REQUEST_EXTERNAL_STORAGE:
- if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
- Snackbar.make(findViewById(R.id.id_content), R.string.notice_need_storage_perm, Snackbar.LENGTH_LONG)
- .setAction("Action", null).show();
- }
- break;
- default:
- super.onRequestPermissionsResult(requestCode, permissions, grantResults);
- }
-
- }
-
@Override
public void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
updateTitle();
updateNavigationMenu();
-
- checkStorage();
}
private void updateNavigationMenu() {
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index a0694bb..a0717c4 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -45,7 +45,6 @@
开启
本地规则解析
重新启用 Daedalus 以应用设置。
- Daedalus 需要访问外部储存以实现本地规则解析。
规则
下载 hosts
正在下载规则,请稍等 ……
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6d55439..e29241a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,8 +44,6 @@
On
Local hosts resolution
Re-activate Daedalus to make the settings take effect.
- Daedalus requires access to external storage for local rules resolution.
-
Rules
Download hosts
Downloading rule, please wait …