From 5e5be9c889ef1f6ce2c73e98bb2a4150ff4adebc Mon Sep 17 00:00:00 2001
From: Sergey Eremin <yeriomin@gmail.com>
Date: Sat, 7 Oct 2017 04:51:27 +0300
Subject: [PATCH] Issue #295 An option to turn delta updates off

---
 .../github/yeriomin/yalpstore/PreferenceActivity.java |  1 +
 .../yalpstore/task/playstore/DeliveryDataTask.java    | 11 +++++++++--
 app/src/main/res/values-ru/strings.xml                |  3 +++
 app/src/main/res/values/strings.xml                   |  3 +++
 app/src/main/res/xml/settings.xml                     |  6 ++++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceActivity.java b/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceActivity.java
index 6af509719..f9032cc42 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceActivity.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceActivity.java
@@ -40,6 +40,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
     public static final String PREFERENCE_NO_IMAGES = "PREFERENCE_NO_IMAGES";
     public static final String PREFERENCE_DEVICE_DEFINITION_REQUESTED = "PREFERENCE_DEVICE_DEFINITION_REQUESTED";
     public static final String PREFERENCE_DOWNLOAD_DIRECTORY = "PREFERENCE_DOWNLOAD_DIRECTORY";
+    public static final String PREFERENCE_DOWNLOAD_DELTAS = "PREFERENCE_DOWNLOAD_DELTAS";
 
     public static final String INSTALLATION_METHOD_DEFAULT = "default";
     public static final String INSTALLATION_METHOD_ROOT = "root";
diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DeliveryDataTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DeliveryDataTask.java
index 62d0ac527..359d3ad64 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DeliveryDataTask.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/playstore/DeliveryDataTask.java
@@ -7,6 +7,7 @@ import com.github.yeriomin.playstoreapi.BuyResponse;
 import com.github.yeriomin.playstoreapi.DeliveryResponse;
 import com.github.yeriomin.playstoreapi.GooglePlayAPI;
 import com.github.yeriomin.yalpstore.NotPurchasedException;
+import com.github.yeriomin.yalpstore.PreferenceActivity;
 import com.github.yeriomin.yalpstore.model.App;
 
 import java.io.IOException;
@@ -34,7 +35,7 @@ public class DeliveryDataTask extends PlayStorePayloadTask<AndroidAppDeliveryDat
             if (buyResponse.hasPurchaseStatusResponse()
                 && buyResponse.getPurchaseStatusResponse().hasAppDeliveryData()
                 && buyResponse.getPurchaseStatusResponse().getAppDeliveryData().hasDownloadUrl()
-                ) {
+            ) {
                 deliveryData = buyResponse.getPurchaseStatusResponse().getAppDeliveryData();
             }
             if (buyResponse.hasDownloadToken()) {
@@ -48,7 +49,7 @@ public class DeliveryDataTask extends PlayStorePayloadTask<AndroidAppDeliveryDat
     protected void delivery(GooglePlayAPI api) throws IOException {
         DeliveryResponse deliveryResponse = api.delivery(
             app.getPackageName(),
-            app.getInstalledVersionCode() >= app.getVersionCode() ? 0 : app.getInstalledVersionCode(),
+            shouldDownloadDelta() ? app.getInstalledVersionCode() : 0,
             app.getVersionCode(),
             app.getOfferType(),
             GooglePlayAPI.PATCH_FORMAT.GZIPPED_GDIFF,
@@ -62,4 +63,10 @@ public class DeliveryDataTask extends PlayStorePayloadTask<AndroidAppDeliveryDat
             throw new NotPurchasedException();
         }
     }
+
+    private boolean shouldDownloadDelta() {
+        return PreferenceActivity.getBoolean(context, PreferenceActivity.PREFERENCE_DOWNLOAD_DELTAS)
+            && app.getInstalledVersionCode() < app.getVersionCode()
+        ;
+    }
 }
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 947dce2cc..a8ba95754 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -206,6 +206,9 @@
     <string name="pref_no_images">Загружать изображения только по Wi-fi</string>
     <string name="pref_no_images_summary_off">Сейчас изображения загружаются всегда</string>
     <string name="pref_no_images_summary_on">Сейчас изображения загружаются только по Wi-fi</string>
+    <string name="pref_download_deltas">Дельта обновления</string>
+    <string name="pref_download_deltas_summary_off">Каждый раз скачивается весь apk</string>
+    <string name="pref_download_deltas_summary_on">При обновлении скачиваются только изменения</string>
     <string name="pref_download_directory">Куда сохранять apk</string>
     <string name="download_manager_ERROR_UNKNOWN">Неизвестная ошибка.</string>
     <string name="download_manager_ERROR_FILE_ERROR">Неизвестная ошибка сохранения файла.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bbbe66dfb..afc4233fb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -205,6 +205,9 @@
     <string name="pref_no_images">Download images on Wi-Fi only</string>
     <string name="pref_no_images_summary_off">Images are always downloaded now</string>
     <string name="pref_no_images_summary_on">Images are downloaded on Wi-Fi only</string>
+    <string name="pref_download_deltas">Delta updates</string>
+    <string name="pref_download_deltas_summary_off">Full apk is downloaded every time</string>
+    <string name="pref_download_deltas_summary_on">Only changes are downloaded during updates</string>
     <string name="pref_download_directory">Download directory</string>
     <string name="download_manager_ERROR_UNKNOWN">Unknown error.</string>
     <string name="download_manager_ERROR_FILE_ERROR">Unknown file storage error.</string>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index e2697fbe8..6f15fad55 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -14,6 +14,12 @@
         android:summaryOn="@string/pref_show_system_apps_summary_on"
         android:title="@string/pref_show_system_apps" />
     <PreferenceCategory android:title="@string/pref_category_updates">
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="PREFERENCE_DOWNLOAD_DELTAS"
+            android:summaryOff="@string/pref_download_deltas_summary_off"
+            android:summaryOn="@string/pref_download_deltas_summary_on"
+            android:title="@string/pref_download_deltas" />
         <ListPreference
             android:defaultValue="-1"
             android:key="PREFERENCE_BACKGROUND_UPDATE_INTERVAL"