Ask user permission before update env

meefik · meefik · commit 92bc45bec20f · 2019-08-23T00:19:12.000+03:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         applicationId 'ru.meefik.linuxdeploy'
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 248
+        versionCode 251
         versionName "2.4.0"
     }
     buildTypes {
diff --git a/app/src/main/assets/env b/app/src/main/assets/env
@@ -1 +1 @@
-Subproject commit 169fe11d4cfbc985dc54bdf247d0656b23890bb6
+Subproject commit aba3b49756309c3bc3c1765481bc3b797c9a7f28
diff --git a/app/src/main/java/ru/meefik/linuxdeploy/MainActivity.java b/app/src/main/java/ru/meefik/linuxdeploy/MainActivity.java
@@ -118,7 +118,8 @@ public void onCreate(Bundle savedInstanceState) {
             EnvUtils.execServices(getBaseContext(), new String[]{"telnetd", "httpd"}, "start");
         } else {
             // Update ENV
-            new UpdateEnvTask(this).execute();
+            PrefStore.setRepositoryUrl(this, getString(R.string.repository_url));
+            updateEnvWithRequestPermissions();
         }
     }
 
@@ -158,7 +159,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 containerConfigure();
                 break;
             case R.id.menu_export:
-                containerExportWithRequestPermissions();
+                containerExport();
                 break;
             case R.id.menu_status:
                 containerStatus();
@@ -405,14 +406,14 @@ private void openRepository() {
     /**
      * Request permission for write to storage
      */
-    private void containerExportWithRequestPermissions() {
+    private void updateEnvWithRequestPermissions() {
         boolean hasPermission = (ContextCompat.checkSelfPermission(this,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED);
         if (!hasPermission) {
             ActivityCompat.requestPermissions(this,
                     new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_WRITE_STORAGE);
         } else {
-            containerExport();
+            new UpdateEnvTask(this).execute();
         }
     }
 
@@ -422,7 +423,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         switch (requestCode) {
             case REQUEST_WRITE_STORAGE: {
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    containerExport();
+                    new UpdateEnvTask(this).execute();
                 } else {
                     Toast.makeText(this, getString(R.string.write_permissions_disallow), Toast.LENGTH_LONG).show();
                 }
diff --git a/app/src/main/java/ru/meefik/linuxdeploy/RepositoryActivity.java b/app/src/main/java/ru/meefik/linuxdeploy/RepositoryActivity.java
@@ -26,7 +26,9 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.lang.ref.WeakReference;
+import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -159,6 +161,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
             Map profile = (Map) parent.getItemAtPosition(position);
             importDialog(profile);
         });
+
+        // Load list
+        retrieveIndex();
     }
 
     @Override
@@ -170,7 +175,6 @@ public void setTheme(int resId) {
     public void onResume() {
         super.onResume();
         setTitle(R.string.title_activity_repository);
-        retrieveIndex();
     }
 
     @Override
@@ -249,8 +253,26 @@ protected void onPostExecute(Boolean success) {
         private void downloadUrl(String url) throws IOException {
             BufferedReader reader = null;
             try {
-                URL u = new URL(url + "/index.gz");
-                reader = new BufferedReader(new InputStreamReader(new GZIPInputStream(u.openStream())));
+                url = url + "/index.gz";
+                HttpURLConnection conn;
+                boolean redirect;
+                do {
+                    redirect = false;
+                    conn = (HttpURLConnection) (new URL(url)).openConnection();
+                    // normally, 3xx is redirect
+                    int status = conn.getResponseCode();
+                    if (status != HttpURLConnection.HTTP_OK) {
+                        if (status == HttpURLConnection.HTTP_MOVED_TEMP
+                                || status == HttpURLConnection.HTTP_MOVED_PERM
+                                || status == HttpURLConnection.HTTP_SEE_OTHER)
+                            redirect = true;
+                    }
+                    if (redirect) {
+                        url = conn.getHeaderField("Location");
+                    }
+                } while (redirect);
+                conn.connect();
+                reader = new BufferedReader(new InputStreamReader(new GZIPInputStream(conn.getInputStream())));
                 String line;
                 Map<String, String> map = new HashMap<>();
                 while ((line = reader.readLine()) != null) {
@@ -331,8 +353,26 @@ private void downloadUrlAndImport(String url, String profile) throws IOException
                 InputStream in = null;
                 OutputStream out = null;
                 try {
-                    URL u = new URL(new URL(url), "config/" + profile + ".conf");
-                    in = u.openStream();
+                    url = url + "/config/" + profile + ".conf";
+                    HttpURLConnection conn;
+                    boolean redirect;
+                    do {
+                        redirect = false;
+                        conn = (HttpURLConnection) (new URL(url)).openConnection();
+                        // normally, 3xx is redirect
+                        int status = conn.getResponseCode();
+                        if (status != HttpURLConnection.HTTP_OK) {
+                            if (status == HttpURLConnection.HTTP_MOVED_TEMP
+                                    || status == HttpURLConnection.HTTP_MOVED_PERM
+                                    || status == HttpURLConnection.HTTP_SEE_OTHER)
+                                redirect = true;
+                        }
+                        if (redirect) {
+                            url = conn.getHeaderField("Location");
+                        }
+                    } while (redirect);
+                    conn.connect();
+                    in = conn.getInputStream();
                     out = new FileOutputStream(conf);
                     byte[] buffer = new byte[1024];
                     int read;
diff --git a/app/src/main/res/values/preferences.xml b/app/src/main/res/values/preferences.xml
@@ -14,7 +14,7 @@
     <string name="autostart_delay" translatable="false">30</string>
     <string name="nettrack" translatable="false">false</string>
     <string name="env_dir" translatable="false"></string>
-    <string name="repository_url" translatable="false">https://github.com/meefik/linuxdeploy-hub/raw/master/</string>
+    <string name="repository_url" translatable="false">http://hub.meefik.ru</string>
     <string name="path" translatable="false"></string>
     <string name="is_cli" translatable="false">false</string>
     <string name="is_telnet" translatable="false">false</string>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 18 22:22:14 MSK 2019
+#Fri Aug 23 00:13:36 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ android {`
`8`	`8`	`applicationId 'ru.meefik.linuxdeploy'`
`9`	`9`	`minSdkVersion 15`
`10`	`10`	`targetSdkVersion 28`
`11`		`- versionCode 248`
	`11`	`+ versionCode 251`
`12`	`12`	`versionName "2.4.0"`
`13`	`13`	`}`
`14`	`14`	`buildTypes {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`google()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.4.2'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.5.0'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`