From 5376494a68e1e55b4c08aabdb54c39b08bc48ec0 Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 24 Jul 2014 18:55:52 -0700
Subject: [PATCH] Option to enable image caching.

---
 clients/android/NewsBlur/res/layout/activity_settings.xml    | 5 +++++
 clients/android/NewsBlur/res/values/strings.xml              | 2 ++
 .../NewsBlur/src/com/newsblur/service/NBSyncService.java     | 1 +
 .../NewsBlur/src/com/newsblur/util/PrefConstants.java        | 1 +
 .../android/NewsBlur/src/com/newsblur/util/PrefsUtils.java   | 5 +++++
 5 files changed, 14 insertions(+)

diff --git a/clients/android/NewsBlur/res/layout/activity_settings.xml b/clients/android/NewsBlur/res/layout/activity_settings.xml
index 093d06356..dc3ca8a7a 100644
--- a/clients/android/NewsBlur/res/layout/activity_settings.xml
+++ b/clients/android/NewsBlur/res/layout/activity_settings.xml
@@ -8,6 +8,11 @@
             android:key="enable_offline"
             android:title="@string/settings_enable_offline" 
             android:summary="@string/settings_enable_offline_sum" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="enable_image_prefetch"
+            android:title="@string/settings_enable_image_prefetch" 
+            android:summary="@string/settings_enable_image_prefetch_sum" />
         <ListPreference
             android:key="offline_network_select"
             android:title="@string/menu_network_select"
diff --git a/clients/android/NewsBlur/res/values/strings.xml b/clients/android/NewsBlur/res/values/strings.xml
index 424fa3e49..bca13ce18 100644
--- a/clients/android/NewsBlur/res/values/strings.xml
+++ b/clients/android/NewsBlur/res/values/strings.xml
@@ -175,6 +175,8 @@
     <string name="settings_cat_offline">Offline</string>
     <string name="settings_enable_offline">Download Stories</string>
     <string name="settings_enable_offline_sum">Periodically fetch stories in background</string>
+    <string name="settings_enable_image_prefetch">Download Images</string>
+    <string name="settings_enable_image_prefetch_sum">Pre-fetch images for offline reading</string>
     <string name="settings_keep_old_stories">Keep Stories after Reading</string>
     <string name="settings_keep_old_stories_sum">Disable to reduce storage usage</string>
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java b/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
index 715cb9936..f13933899 100644
--- a/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
+++ b/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
@@ -414,6 +414,7 @@ public class NBSyncService extends Service {
     }
 
     private void prefetchImages() {
+        if (!PrefsUtils.isImagePrefetchEnabled(this)) return;
         ImagePrefetchRunning = true;
         try {
             while (ImageQueue.size() > 0) {
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java b/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java
index 937840cf3..c72c10f5a 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java
@@ -48,6 +48,7 @@ public class PrefConstants {
     public static final String STORIES_SHOW_PREVIEWS = "pref_show_content_preview";
 
     public static final String ENABLE_OFFLINE = "enable_offline";
+    public static final String ENABLE_IMAGE_PREFETCH = "enable_image_prefetch";
     public static final String NETWORK_SELECT = "offline_network_select";
     public static final String KEEP_OLD_STORIES = "keep_old_stories";
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java b/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
index 95514722f..4527f03e8 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
@@ -369,6 +369,11 @@ public class PrefsUtils {
         return prefs.getBoolean(PrefConstants.ENABLE_OFFLINE, false);
     }
 
+    public static boolean isImagePrefetchEnabled(Context context) {
+        SharedPreferences prefs = context.getSharedPreferences(PrefConstants.PREFERENCES, 0);
+        return prefs.getBoolean(PrefConstants.ENABLE_IMAGE_PREFETCH, false);
+    }
+
     /**
      * Compares the user's setting for when background data use is allowed against the
      * current network status and sees if it is okay to sync.