Add automatic APK open after download option

Refactor and clean up code a bit
revanmj · Jun 30, 2018 · c5a1e74 · c5a1e74
1 parent 9a252a6
commit c5a1e74
Show file tree

Hide file tree

Showing 9 changed files with 335 additions and 323 deletions.
diff --git a/library/wversionmanager/build.gradle b/library/wversionmanager/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 
 ext {
-
     bintrayRepo = "Android-WVersionManager"
     bintrayName = "com.winsontan520.wversionmanager"
     libraryDescription = ''
@@ -15,7 +14,7 @@ ext {
     siteUrl = 'https://github.com/revanmj/Android-WVersionManager'
     gitUrl = 'https://github.com/revanmj/Android-WVersionManager.git'
 
-    libraryVersion = '1.5'
+    libraryVersion = "1.6"
 
     developerId = 'revanmj'
     developerName = 'Michal Jakubowski'
@@ -33,8 +32,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode 5
-        versionName "1.5"
+        versionCode 6
+        versionName "$libraryVersion"
     }
 
     buildTypes {
@@ -43,10 +42,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    implementation 'com.android.support:support-v4:27.1.0'
+    implementation 'com.android.support:support-v4:27.1.1'
 }
 
 task deleteJar(type: Delete) {

diff --git a/library/wversionmanager/src/main/AndroidManifest.xml b/library/wversionmanager/src/main/AndroidManifest.xml
@@ -5,6 +5,14 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
+        <provider
+            android:name="com.winsontan520.wversionmanager.UpdateFileProvider"
+            android:authorities="${applicationId}.UpdateFileProvider"
+            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/...sionmanager/library/CustomTagHandler.java → ...520/wversionmanager/CustomTagHandler.java b/...sionmanager/library/CustomTagHandler.java → ...520/wversionmanager/CustomTagHandler.java
@@ -1,4 +1,4 @@
-package com.winsontan520.wversionmanager.library;
+package com.winsontan520.wversionmanager;
 
 import org.xml.sax.XMLReader;
 

diff --git a/...sionmanager/library/IWVersionManager.java → ...520/wversionmanager/IWVersionManager.java b/...sionmanager/library/IWVersionManager.java → ...520/wversionmanager/IWVersionManager.java
@@ -1,60 +1,53 @@
-package com.winsontan520.wversionmanager.library;
+package com.winsontan520.wversionmanager;
 
+import android.Manifest;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.RequiresPermission;
 
 public interface IWVersionManager {
-
-    /**
-     * @return Label of update now button
-     */
-    public String getUpdateNowLabel();
-
-
-    /**
-     * @param updateNowLabel Set the label for update now button
-     */
-    public void setUpdateNowLabel(String updateNowLabel);
-
-    /**
-     * @return label of remind me later button
-     */
-    public String getRemindMeLaterLabel();
-
     /**
-     * @param remindMeLaterLabel Set label of remind me later button
+     * Displays a dialog asking user to rate your app
      */
-    public void setRemindMeLaterLabel(String remindMeLaterLabel);
-
-    /**
-     * @return label of ignore this version button
-     */
-    public String getIgnoreThisVersionLabel();
-
+    public void askForRate();
     /**
-     * @param ignoreThisVersionLabel Set label of ignore this version button
+     * Initiates check for updates that may result in displaying a dialog with release notes
+     * and options to update now, remind user about it later or ignore that version
      */
-    public void setIgnoreThisVersionLabel(String ignoreThisVersionLabel);
-
+    public void checkVersion();
     /**
-     * @param icon Set drawable of icon in dialog
+     * @param icon Drawable of icon in dialog
      */
     public void setIcon(Drawable icon);
 
     /**
-     * @param title Set title of dialog
+     * @param title Title of dialog
      */
     public void setTitle(String title);
 
     /**
-     * @param message Set message of dialog
+     * @param message Message of dialog
      */
     public void setMessage(String message);
 
     /**
-     * @param value Set if Android's Download Manager should be used (off by default) instead of opening a link in a browser
+     * Used to choose if Android's Download Manager should be used to download file at URL
+     * from JSON file to Downloads folder (off by default) instead of opening a link in a browser
+     * @param value <code>true</code> to use Download Manager, <code>false</code> otherwise
      */
+    @RequiresPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
     public void useDownloadManager(boolean value);
 
+    /**
+     * Setting this to <code>true</code> when {@link #useDownloadManager(boolean)}
+     * is also <code>true</code> will automatically fire APK installation dialog after download completes.
+     * This requires Unknown Sources to be enabled (globally on Nougat and lower,
+     * for your app specifically in Oreo or higher). If permission is not granted,
+     * system's Download app will be launched.
+     * @param value <code>true</code> to enable auto install, <code>false</code> otherwise
+     */
+    @RequiresPermission(anyOf = {Manifest.permission.REQUEST_INSTALL_PACKAGES, Manifest.permission.INSTALL_PACKAGES})
+    public void installAfterDownload(boolean value);
+
     /**
      * @return message of dialog
      */
@@ -124,5 +117,4 @@ public interface IWVersionManager {
      * @param listener Set your own callback listener when receiving response from server
      */
     public void setOnReceiveListener(OnReceiveListener listener);
-
 }
diff --git a/...ionmanager/library/OnReceiveListener.java → ...20/wversionmanager/OnReceiveListener.java b/...ionmanager/library/OnReceiveListener.java → ...20/wversionmanager/OnReceiveListener.java
@@ -1,4 +1,4 @@
-package com.winsontan520.wversionmanager.library;
+package com.winsontan520.wversionmanager;
 
 public interface OnReceiveListener {
 

diff --git a/...ry/wversionmanager/src/main/java/com/winsontan520/wversionmanager/UpdateFileProvider.java b/...ry/wversionmanager/src/main/java/com/winsontan520/wversionmanager/UpdateFileProvider.java
@@ -0,0 +1,5 @@
+package com.winsontan520.wversionmanager;
+
+import android.support.v4.content.FileProvider;
+
+public class UpdateFileProvider extends FileProvider { }