From 1da96f0fcaf8fcbebe6e561f870456e05a575a59 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sat, 28 Oct 2017 13:21:47 +0200
Subject: [PATCH] Ported patch for data saver disable

---
 patches/privacy/disable-data-saver.patch | 53 ++++++++----------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/patches/privacy/disable-data-saver.patch b/patches/privacy/disable-data-saver.patch
index 227e4ae6..bb0597e6 100644
--- a/patches/privacy/disable-data-saver.patch
+++ b/patches/privacy/disable-data-saver.patch
@@ -1,61 +1,47 @@
-From 2a6bf1b0d114aba6474112876bf3af712cda30c3 Mon Sep 17 00:00:00 2001
-From: tgpark <madranjin@naver.com>
-Date: Wed, 7 Sep 2016 21:52:08 +0900
-Subject: [PATCH] disable data saver
+commit 6a6024067d27a53fb58af282580da68f6cea8809
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Fri Oct 27 15:53:37 2017 +0200
 
----
- .../src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java    | 2 +-
- .../chrome/browser/net/spdyproxy/DataReductionProxySettings.java      | 4 +++-
- .../browser/preferences/datareduction/DataReductionPromoUtils.java    | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
+    Ported data reduction disable patch
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-index 483d311..920db43 100644
+index ccc8517..5c69672 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -108,7 +108,7 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
- 
+@@ -144,7 +144,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+         boolean notifyAdapter = false;
          // An optional Data Saver page.
          if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
 -            mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
 +            //mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
+             mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
+             notifyAdapter = true;
          }
- 
-         // An optional sign-in page.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-index 20425e3..2878848 100644
+index 822f642..06e91a5 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-@@ -98,7 +98,7 @@ public class DataReductionProxySettings {
-      */
-     public static void reconcileDataReductionProxyEnabledState(Context context) {
-         ThreadUtils.assertOnUiThread();
--        boolean enabled = getInstance().isDataReductionProxyEnabled();
-+        boolean enabled = getInstance().isDataReductionProxyEnabled();        
-         ContextUtils.getAppSharedPreferences().edit()
-                 .putBoolean(DATA_REDUCTION_ENABLED_PREF, enabled).apply();
-     }
-@@ -123,6 +123,7 @@ public class DataReductionProxySettings {
+@@ -156,6 +156,7 @@ public class DataReductionProxySettings {
          // DataReductionProxySettings is a singleton that lives forever and there's no clean
          // shutdown of Chrome on Android
          mNativeDataReductionProxySettings = nativeInit();
 +        nativeSetDataReductionProxyEnabled(mNativeDataReductionProxySettings, false);
      }
  
-     /** Returns true if the SPDY proxy is allowed to be used. */
-@@ -140,6 +141,7 @@ public class DataReductionProxySettings {
+     /** Returns true if the SPDY proxy promo is allowed to be shown. */
+@@ -178,6 +179,7 @@ public class DataReductionProxySettings {
       * data reduction statistics if this is the first time the SPDY proxy has been enabled.
       */
      public void setDataReductionProxyEnabled(Context context, boolean enabled) {
 +        enabled = false;
-         ContextUtils.getAppSharedPreferences().edit()
-                 .putBoolean(DATA_REDUCTION_ENABLED_PREF, enabled).apply();
-         nativeSetDataReductionProxyEnabled(mNativeDataReductionProxySettings, enabled);
+         if (enabled
+                 && ContextUtils.getAppSharedPreferences().getLong(
+                            DATA_REDUCTION_FIRST_ENABLED_TIME, 0)
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
-index 9866be8..abf4544 100644
+index bd42c89..b147765 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
-@@ -49,7 +49,7 @@ public class DataReductionPromoUtils {
+@@ -68,7 +68,7 @@ public class DataReductionPromoUtils {
          }
          if (DataReductionProxySettings.getInstance().isDataReductionProxyManaged()) return false;
          if (DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) return false;
@@ -64,6 +50,3 @@ index 9866be8..abf4544 100644
      }
  
      /**
--- 
-1.9.1
-