fix bug

MZCretin · Mar 22, 2017 · 6f588c1 · 6f588c1
1 parent 55820e9
commit 6f588c1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
           package="com.cretin.www.autoupdateproject">
 
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -22,6 +23,17 @@
         </activity>
 
         <service android:name="com.cretin.www.cretinautoupdatelibrary.utils.DownloadService"/>
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:grantUriPermissions="true"
+            android:exported="false"
+            >
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/install_file" />
+        </provider>
     </application>
 
 </manifest>
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="external_files" path="."/>
+</paths>
diff --git a/...library/src/main/res/xml/install_file.xml → app/src/main/res/xml/install_file.xml b/...library/src/main/res/xml/install_file.xml → app/src/main/res/xml/install_file.xml
diff --git a/cretinautoupdatelibrary/src/main/AndroidManifest.xml b/cretinautoupdatelibrary/src/main/AndroidManifest.xml
@@ -9,16 +9,7 @@
                  android:label="@string/app_name"
                  android:supportsRtl="true"
      >
-        <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.cretin.www.cretinautoupdatelibrary.fileprovider"
-            android:grantUriPermissions="true"
-            android:exported="false"
-            >
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/install_file" />
-        </provider>
+
     </application>
 
 </manifest>
diff --git a/...ary/src/main/java/com/cretin/www/cretinautoupdatelibrary/utils/CretinAutoUpdateUtils.java b/...ary/src/main/java/com/cretin/www/cretinautoupdatelibrary/utils/CretinAutoUpdateUtils.java
@@ -445,7 +445,7 @@ public static void installApkFile(Context context, File file) {
         Intent intent = new Intent(Intent.ACTION_VIEW);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-            Uri contentUri = FileProvider.getUriForFile(context, "com.cretin.www.cretinautoupdatelibrary.fileprovider", file);
+            Uri contentUri = FileProvider.getUriForFile(context, context.getPackageName()+".fileprovider", file);
             intent.setDataAndType(contentUri, "application/vnd.android.package-archive");
         } else {
             intent.setDataAndType(Uri.fromFile(file), "application/vnd.android.package-archive");