fix ninemanga error and added fileProvider for android nougat or grea…

…ter update
raulhaag · Oct 28, 2017 · 1ca5937 · 1ca5937
1 parent 3e79671
commit 1ca5937
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,9 +7,9 @@ android {
     defaultConfig {
         applicationId "ar.rulosoft.mimanganu"
         minSdkVersion 14
-        targetSdkVersion 25
-        versionCode 72
-        versionName "1.72"
+        targetSdkVersion 24
+        versionCode 71
+        versionName "1.71"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,16 @@
         android:label="@string/app_name"
         android:largeHeap="true">
 
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="ar.rulosoft.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
+
         <!--
             Better if app starts dark and turns white than blinds you with white splash screen
             before it turns dark.

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/servers/NineManga.java b/app/src/main/java/ar/rulosoft/mimanganu/servers/NineManga.java
@@ -148,6 +148,7 @@ private static void generateNeededCookie() {
                 Cookie.parse(url, "__utmz=128769555." + aTime
                         + ".1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); Domain=ninemanga.com")
         ));
+        cookieInit = true;
     }
 
     @Override
@@ -214,7 +215,7 @@ public String getImageFrom(Chapter chapter, int page) throws Exception {
                 + page + ".html"));
         data = getFirstMatch(PATTERN_IMAGE, data,
                 context.getString(R.string.server_failed_loading_image));
-        if (data.contains("//")) {
+        if (data.contains("////")) {
             throw new Exception(context.getString(R.string.server_failed_loading_image));
         }
         return data;
@@ -290,7 +291,7 @@ public ArrayList<Manga> getMangasFiltered(int[][] filters, int pageNumber) throw
      * @throws Exception if an error occurred
      */
     private Navigator getNavigatorWithNeededHeader() throws Exception {
-        if (cookieInit) {
+        if (!cookieInit) {
             generateNeededCookie();
         }
         Navigator nav = Navigator.getInstance();

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/utils/UpdateUtil.java b/app/src/main/java/ar/rulosoft/mimanganu/utils/UpdateUtil.java
@@ -4,10 +4,13 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Environment;
 import android.preference.PreferenceManager;
+import android.support.v4.content.FileProvider;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -23,6 +26,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import ar.rulosoft.mimanganu.MessageActivity;
@@ -150,13 +154,13 @@ protected Void doInBackground(Void... voids) {
                     Response response = client.newCall(new Request.Builder().url(url).build()).execute();
                     InputStream inputStream = response.body().byteStream();
                     FileOutputStream outputStream = new FileOutputStream(UPDATE_FILE_CACHE);
-                    long lenghtOfFile = response.body().contentLength();
+                    long lengthOfFile = response.body().contentLength();
                     int count;
                     byte data[] = new byte[1024 * 6];
                     long total = 0;
                     while ((count = inputStream.read(data)) != -1) {
                         total += count;
-                        int tprog = (int) ((total * 100) / lenghtOfFile);
+                        int tprog = (int) ((total * 100) / lengthOfFile);
                         if (tprog > prog) {
                             prog = tprog;
                             activity.runOnUiThread(new Runnable() {
@@ -174,7 +178,7 @@ public void run() {
                     }
                     outputStream.close();
                     inputStream.close();
-                    activity.startActivity(getUpdateIntent());
+                    activity.startActivity(getUpdateIntent(activity));
                     activity.runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
@@ -197,9 +201,15 @@ public void run() {
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
-    private static Intent getUpdateIntent() {
+    private static Intent getUpdateIntent(Context context) {
+        Uri contentUri = FileProvider.getUriForFile(context, "ar.rulosoft.provider", UPDATE_FILE_CACHE);
         Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setDataAndType(Uri.fromFile(UPDATE_FILE_CACHE), "application/vnd.android.package-archive");
+        intent.setDataAndType(contentUri, "application/vnd.android.package-archive");
+        List<ResolveInfo> resInfoList = context.getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+        for (ResolveInfo resolveInfo : resInfoList) {
+            String packageName = resolveInfo.activityInfo.packageName;
+            context.grantUriPermission(packageName, contentUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        }
         return intent;
     }