fixed updater on Android 7+

ov3rk1ll · Feb 9, 2017 · 293f414 · 293f414
1 parent da99ab6
commit 293f414
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ repositories {
 
 def versionMajor = 1
 def versionMinor = 6
-def versionPatch = 0
+def versionPatch = 1
 def versionBuild = 99 // bump for dogfood builds, public betas, etc.
 ext {
     calculateVersionName = {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -97,6 +97,17 @@
         </activity>
 
         <meta-data android:name="io.fabric.ApiKey" android:value="${FABRIC_API_KEY}" />
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/winsontan520/wversionmanager/library/WVersionManager.java b/app/src/main/java/com/winsontan520/wversionmanager/library/WVersionManager.java
@@ -11,6 +11,7 @@
 import android.os.AsyncTask;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
+import android.support.v4.content.FileProvider;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -485,7 +486,11 @@ protected void onPostExecute(String result) {
 
             //Open file
             Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setDataAndType(Uri.fromFile(localFile), "application/vnd.android.package-archive");
+            Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", localFile);
+            Log.i(TAG, "onPostExecute: open " + uri);
+            // Uri.fromFile(localFile)
+            intent.setDataAndType(uri, "application/vnd.android.package-archive");
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             context.startActivity(intent);
         }
     }

diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path name="external_files" path="."/>
+</paths>