From b1b97c19d4311ccd2222dff8de26e9a499fe63e5 Mon Sep 17 00:00:00 2001
From: Bram van de Kerkhof <noodlemagedev@gmail.com>
Date: Wed, 13 Apr 2016 14:08:07 +0200
Subject: [PATCH] Added option to check if connected to power before updating.
 closes #192 (#229)

---
 app/src/main/AndroidManifest.xml              |   8 +-
 .../data/library/LibraryUpdateService.kt      | 115 ++++++++++++++----
 .../data/preference/PreferencesHelper.kt      |   8 +-
 .../tachiyomi/ui/library/LibraryFragment.kt   |   2 +-
 .../eu/kanade/tachiyomi/util/DeviceUtil.kt    |  24 ++++
 .../eu/kanade/tachiyomi/util/NetworkUtil.java |  16 ---
 .../ic_refresh_grey_24dp_img.png              | Bin 0 -> 1088 bytes
 .../ic_warning_white_24dp_img.png             | Bin 0 -> 325 bytes
 .../ic_refresh_grey_24dp_img.png              | Bin 0 -> 632 bytes
 .../ic_warning_white_24dp_img.png             | Bin 0 -> 236 bytes
 .../ic_refresh_grey_24dp_img.png              | Bin 0 -> 1339 bytes
 .../ic_warning_white_24dp_img.png             | Bin 0 -> 364 bytes
 .../ic_refresh_grey_24dp_img.png              | Bin 0 -> 2341 bytes
 .../ic_warning_white_24dp_img.png             | Bin 0 -> 473 bytes
 .../ic_refresh_grey_24dp_img.png              | Bin 0 -> 2429 bytes
 .../ic_warning_white_24dp_img.png             | Bin 0 -> 590 bytes
 app/src/main/res/values/keys.xml              |   5 +-
 app/src/main/res/values/strings.xml           |   6 +
 app/src/main/res/xml/pref_general.xml         |  29 +++--
 .../data/library/LibraryUpdateAlarmTest.java  |   1 +
 20 files changed, 152 insertions(+), 62 deletions(-)
 create mode 100644 app/src/main/java/eu/kanade/tachiyomi/util/DeviceUtil.kt
 delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/util/NetworkUtil.java
 create mode 100644 app/src/main/res/drawable-hdpi/ic_refresh_grey_24dp_img.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_warning_white_24dp_img.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_refresh_grey_24dp_img.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_warning_white_24dp_img.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_refresh_grey_24dp_img.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_warning_white_24dp_img.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_refresh_grey_24dp_img.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_warning_white_24dp_img.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_refresh_grey_24dp_img.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_warning_white_24dp_img.png

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ce1af58505..7f9ce9ad97 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.kanade.tachiyomi" >
+<manifest package="eu.kanade.tachiyomi"
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -12,9 +12,9 @@
     <application
         android:name=".App"
         android:allowBackup="true"
+        android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:hardwareAccelerated="true"
         android:largeHeap="true"
         android:theme="@style/Theme.Tachiyomi" >
         <activity
@@ -68,7 +68,7 @@
         </receiver>
 
         <receiver
-            android:name=".data.library.LibraryUpdateService$CancelUpdateReceiver">
+            android:name=".data.library.LibraryUpdateService$LibraryUpdateReceiver">
         </receiver>
 
         <receiver
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
index 4f10f5e200..3aaaf00ce7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
@@ -17,7 +17,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.source.SourceManager
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.util.AndroidComponentUtil
-import eu.kanade.tachiyomi.util.NetworkUtil
+import eu.kanade.tachiyomi.util.DeviceUtil
 import eu.kanade.tachiyomi.util.notification
 import eu.kanade.tachiyomi.util.notificationManager
 import rx.Observable
@@ -28,13 +28,19 @@ import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 
+// Intent key for forced library update
+val UPDATE_IS_FORCED = "is_forced"
+
 /**
  * Get the start intent for [LibraryUpdateService].
  * @param context the application context.
+ * @param isForced true when forcing library update
  * @return the intent of the service.
  */
-fun getIntent(context: Context): Intent {
-    return Intent(context, LibraryUpdateService::class.java)
+fun getIntent(context: Context, isForced: Boolean = false): Intent {
+    return Intent(context, LibraryUpdateService::class.java).apply {
+        putExtra(UPDATE_IS_FORCED, isForced)
+    }
 }
 
 /**
@@ -67,6 +73,7 @@ class LibraryUpdateService : Service() {
     // Subscription where the update is done.
     private var subscription: Subscription? = null
 
+
     companion object {
         val UPDATE_NOTIFICATION_ID = 1
 
@@ -76,9 +83,9 @@ class LibraryUpdateService : Service() {
          * @param context the application context.
          */
         @JvmStatic
-        fun start(context: Context) {
+        fun start(context: Context, isForced: Boolean = false) {
             if (!isRunning(context)) {
-                context.startService(getIntent(context))
+                context.startService(getIntent(context, isForced))
             }
         }
 
@@ -116,6 +123,7 @@ class LibraryUpdateService : Service() {
         return null
     }
 
+
     /**
      * Method called when the service receives an intent. In this case, the content of the intent
      * is irrelevant, because everything required is fetched in [updateLibrary].
@@ -127,13 +135,27 @@ class LibraryUpdateService : Service() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         // If there's no network available, set a component to start this service again when
         // a connection is available.
-        if (!NetworkUtil.isNetworkConnected(this)) {
+        if (!DeviceUtil.isNetworkConnected(this)) {
             Timber.i("Sync canceled, connection not available")
+            showWarningNotification(getString(R.string.notification_no_connection_title),
+                    getString(R.string.notification_no_connection_body))
             AndroidComponentUtil.toggleComponent(this, SyncOnConnectionAvailable::class.java, true)
             stopSelf(startId)
             return Service.START_NOT_STICKY
         }
 
+        // If user doesn't want to update while phone is not charging, cancel sync
+        else if (preferences.updateOnlyWhenCharging() && !(intent?.getBooleanExtra(UPDATE_IS_FORCED, false) ?: false) && !DeviceUtil.isPowerConnected(this)) {
+            Timber.i("Sync canceled, not connected to ac power")
+            // Create force library update intent
+            val forceIntent = getLibraryUpdateReceiverIntent(LibraryUpdateReceiver.FORCE_LIBRARY_UPDATE)
+            // Show warning
+            showWarningNotification(getString(R.string.notification_not_connected_to_ac_title),
+                    getString(R.string.notification_not_connected_to_ac_body), forceIntent)
+            stopSelf(startId)
+            return Service.START_NOT_STICKY
+        }
+
         // Unsubscribe from any previous subscription if needed.
         subscription?.unsubscribe()
 
@@ -146,11 +168,20 @@ class LibraryUpdateService : Service() {
                             stopSelf(startId)
                         }, {
                             stopSelf(startId)
-                        })
+                })
 
         return Service.START_STICKY
     }
 
+    /**
+     * Creates a PendingIntent for LibraryUpdate broadcast class
+     * @param action id of action
+     */
+    fun getLibraryUpdateReceiverIntent(action: String): PendingIntent {
+        return PendingIntent.getBroadcast(this, 0,
+                Intent(this, LibraryUpdateReceiver::class.java).apply { this.action = action }, 0)
+    }
+
     /**
      * Method that updates the library. It's called in a background thread, so it's safe to do
      * heavy operations or network calls here.
@@ -164,8 +195,7 @@ class LibraryUpdateService : Service() {
         val newUpdates = ArrayList<Manga>()
         val failedUpdates = ArrayList<Manga>()
 
-        val cancelIntent = PendingIntent.getBroadcast(this, 0,
-                Intent(this, CancelUpdateReceiver::class.java), 0)
+        val cancelIntent = getLibraryUpdateReceiverIntent(LibraryUpdateReceiver.CANCEL_LIBRARY_UPDATE)
 
         // Get the manga list that is going to be updated.
         val allLibraryMangas = db.getFavoriteMangas().executeAsBlocking()
@@ -179,16 +209,17 @@ class LibraryUpdateService : Service() {
                 // Notify manga that will update.
                 .doOnNext { showProgressNotification(it, count.andIncrement, toUpdate.size, cancelIntent) }
                 // Update the chapters of the manga.
-                .concatMap { manga -> updateManga(manga)
-                        // If there's any error, return empty update and continue.
-                        .onErrorReturn {
-                            failedUpdates.add(manga)
-                            Pair(0, 0)
-                        }
-                        // Filter out mangas without new chapters (or failed).
-                        .filter { pair -> pair.first > 0 }
-                        // Convert to the manga that contains new chapters.
-                        .map { manga }
+                .concatMap { manga ->
+                    updateManga(manga)
+                            // If there's any error, return empty update and continue.
+                            .onErrorReturn {
+                                failedUpdates.add(manga)
+                                Pair(0, 0)
+                            }
+                            // Filter out mangas without new chapters (or failed).
+                            .filter { pair -> pair.first > 0 }
+                            // Convert to the manga that contains new chapters.
+                            .map { manga }
                 }
                 // Add manga with new chapters to the list.
                 .doOnNext { newUpdates.add(it) }
@@ -288,7 +319,27 @@ class LibraryUpdateService : Service() {
             setContentTitle(manga.title)
             setProgress(total, current, false)
             setOngoing(true)
-            addAction(R.drawable.ic_clear_grey_24dp_img, getString(R.string.action_cancel), cancelIntent)
+            addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent)
+        }
+        notificationManager.notify(UPDATE_NOTIFICATION_ID, n)
+    }
+
+    /**
+     * Show warning message when library can't be updated
+     * @param warningTitle title of warning
+     * @param warningBody warning information
+     * @param pendingIntent Intent called when action clicked
+     */
+    private fun showWarningNotification(warningTitle: String, warningBody: String, pendingIntent: PendingIntent? = null) {
+        val n = notification() {
+            setSmallIcon(R.drawable.ic_warning_white_24dp_img)
+            setContentTitle(warningTitle)
+            setStyle(NotificationCompat.BigTextStyle().bigText(warningBody))
+            setContentIntent(notificationIntent)
+            if (pendingIntent != null) {
+                addAction(R.drawable.ic_refresh_grey_24dp_img, getString(R.string.action_force), pendingIntent)
+            }
+            setAutoCancel(true)
         }
         notificationManager.notify(UPDATE_NOTIFICATION_ID, n)
     }
@@ -341,23 +392,37 @@ class LibraryUpdateService : Service() {
          * @param intent the intent received.
          */
         override fun onReceive(context: Context, intent: Intent) {
-            if (NetworkUtil.isNetworkConnected(context)) {
+            if (DeviceUtil.isNetworkConnected(context)) {
                 AndroidComponentUtil.toggleComponent(context, this.javaClass, false)
                 context.startService(getIntent(context))
             }
         }
     }
 
-    class CancelUpdateReceiver : BroadcastReceiver() {
+    /**
+     * Class that triggers the library to update.
+     */
+    class LibraryUpdateReceiver : BroadcastReceiver() {
+        companion object {
+            // Cancel library update action
+            val CANCEL_LIBRARY_UPDATE = "eu.kanade.CANCEL_LIBRARY_UPDATE"
+            // Force library update
+            val FORCE_LIBRARY_UPDATE = "eu.kanade.FORCE_LIBRARY_UPDATE"
+        }
 
         /**
-         * Method called when user stops the update.
+         * Method called when user wants a library update.
          * @param context the application context.
          * @param intent the intent received.
          */
         override fun onReceive(context: Context, intent: Intent) {
-            LibraryUpdateService.stop(context)
-            context.notificationManager.cancel(UPDATE_NOTIFICATION_ID)
+            when (intent.action) {
+                CANCEL_LIBRARY_UPDATE -> {
+                    LibraryUpdateService.stop(context)
+                    context.notificationManager.cancel(UPDATE_NOTIFICATION_ID)
+                }
+                FORCE_LIBRARY_UPDATE -> LibraryUpdateService.start(context, true)
+            }
         }
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index abf7b963e4..d7821d1ba3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -197,16 +197,20 @@ class PreferencesHelper(private val context: Context) {
         return prefs.getBoolean(getKey(R.string.pref_remove_after_marked_as_read_key), false)
     }
 
+    fun updateOnlyWhenCharging(): Boolean {
+        return prefs.getBoolean(getKey(R.string.pref_update_only_when_charging_key), false)
+    }
+
     fun libraryUpdateInterval(): Preference<Int> {
         return rxPrefs.getInteger(getKey(R.string.pref_library_update_interval_key), 0)
     }
 
     fun filterDownloaded(): Preference<Boolean> {
-        return rxPrefs.getBoolean(getKey(R.string.pref_filter_downloaded), false)
+        return rxPrefs.getBoolean(getKey(R.string.pref_filter_downloaded_key), false)
     }
 
     fun filterUnread(): Preference<Boolean> {
-        return rxPrefs.getBoolean(getKey(R.string.pref_filter_unread), false)
+        return rxPrefs.getBoolean(getKey(R.string.pref_filter_unread_key), false)
     }
 
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
index cf267b2de9..afe18b30e5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
@@ -207,7 +207,7 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
                 // Apply filter
                 onFilterCheckboxChanged()
             }
-            R.id.action_refresh -> LibraryUpdateService.start(activity)
+            R.id.action_refresh -> LibraryUpdateService.start(activity, true) // Force refresh
             R.id.action_edit_categories -> {
                 val intent = CategoryActivity.newIntent(activity)
                 startActivity(intent)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/DeviceUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/DeviceUtil.kt
new file mode 100644
index 0000000000..beab475dd6
--- /dev/null
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/DeviceUtil.kt
@@ -0,0 +1,24 @@
+package eu.kanade.tachiyomi.util
+
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.ConnectivityManager
+import android.os.BatteryManager
+
+object DeviceUtil {
+    fun isPowerConnected(context: Context): Boolean {
+        val intent = context.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
+        intent?.let {
+            val plugged = it.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1)
+            return plugged == BatteryManager.BATTERY_PLUGGED_AC || plugged == BatteryManager.BATTERY_PLUGGED_USB
+        }
+        return false
+    }
+
+    fun isNetworkConnected(context: Context): Boolean {
+        val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val activeNetwork = cm.activeNetworkInfo
+        return activeNetwork != null && activeNetwork.isConnectedOrConnecting
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/NetworkUtil.java b/app/src/main/java/eu/kanade/tachiyomi/util/NetworkUtil.java
deleted file mode 100644
index 3ecac2f72b..0000000000
--- a/app/src/main/java/eu/kanade/tachiyomi/util/NetworkUtil.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.kanade.tachiyomi.util;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-
-public class NetworkUtil {
-
-    public static boolean isNetworkConnected(Context context) {
-        ConnectivityManager cm =
-                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
-        return activeNetwork != null && activeNetwork.isConnectedOrConnecting();
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_refresh_grey_24dp_img.png b/app/src/main/res/drawable-hdpi/ic_refresh_grey_24dp_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ee62066432de973239afeeaeabed75bfb7e8d3b
GIT binary patch
literal 1088
zcmV-G1i$-<P)<h;3K|Lk000e1NJLTq000;O001Tk1^@s6-UnMH000CBNkl<ZNK5Tj
zU1%It6h7z9&;HCV5hN1&14h9|Yn7r8Rf70~eekCiw6>x?h}AV~LR{HwKt@9nCYz8Z
zW;g3gLHlB$Ekx9ZQZU6g1*PqSFG{PZkchA$W@cyZ%p5txrY4)Dn-%gPWMCNBd+zt0
z^WAUHxd=P_;11)%E<sa;cP0Ao5}BqcIyyQYB%-GkMd>1<P5`)_h(HMOR~UxZ5pg~U
zg1N=T#cxg14A-(*mX&U6Ya85f26f>35wSN2g03J4_V~UJ49qVgMqfoym<Uu={ey`B
zU~FMw;R+Mg!A&XUTN?;UrP6Uk9QHi#&L9ZZfv$o#el<-4P19}=Q9hH&%vLIu3D5IR
zNh#y&2xewxPKROmMy*zhbGbycjEENj;8P*Q)upAS-}raKF!m$jK}0+W0FM(<imTCe
zy{4+_kFM(;T&+4HU|HJR+g}KR;Ed;a5jX%`0)UxBB5^U3$^5<9X_iW*lx^Ebgb;5N
z(Zd|WL}B>vaYO`@lami1;yIS34)lYr>rZC0**}}w1OP0{+NUVWH2}D+F&^vLf8sdK
zNj^NzTuS*;p-|W^c-k<G4;{zp*(@0>m&*^iu6xe+{k;INEQENiudna?HZxDB)9J`9
zYouMb6{n}ChaAT#)Gc^^Wo6}6(=<2LypgnAF5h&^S_`jr8BR=0d?Tei%$pJM*<3C+
z*DQPXc`B6}^gQn!DdjE0u~;nrN<{lP16|iUdwY9tG$R-vAHRo)js-!WH;cv5(NUX-
z5?q#T+nQ;bezQ%jtfOUFHUK1eljAr$LJ&#B6(p0%ySlr(ueXw6vskX+G7&w(fyrd@
z`D`|Oq1mQZ*7*!R2*dDw-V~3=Kd)A+C$?+TMk01sGMSu3#HV<Thz4<NZ0wMflC$2Y
zs_L?)X|MP6^vt%B<!bEI)YJ*rbt}H_rvQN6cr<Diu~_U30KCG1u~_WuAP8Q}<#LOy
zkXV+rN7J;=T-S}79wL66&*x7?&2DID=srZefQX&k4HJpP71wp2*e(f!$K&y@YPH${
zo*@A6vk>CBd_I5eX1msP{U`vOMZ`Ee$}kKbhm~rz`sG$<QY;n?P1BwMfHz&&J<Q;U
zSR<n2{r&xOh)C-O&dA8fXc&gwOi~{p%Zj4R6VX}E^S-xj`xnD7VnT?$ilQ7q#Fu^F
z?~+oc*MNUCFfj1ms=OOU=J4?FF(Mjexww6(sv5mKgSoQ0JEEcDd0zCbH#+|Ryjv&~
z*4cd1p|5G$y+qW5h>rmPxA9v&zZ20VL_95}yxMrX*z#t_?h-;A5<(mSfJYJWZX&t^
zSy-Y)MEr?}=7kVnc%JuNBk-0IwPMZf#O~fro2vBxm*^h@i3xS3Aroo<0000<MNUMn
GLSTY+>I-oI

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_warning_white_24dp_img.png b/app/src/main/res/drawable-hdpi/ic_warning_white_24dp_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..55c68431b19365d5da5b5a47aa133357ac9fab25
GIT binary patch
literal 325
zcmV-L0lNN)P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003DNkl<ZNDb}5
zFEE2)0LSs4-EMcgTUa1a2qY41k+?`C5-rk*L?V$$qY>9gB+3ebu&_IBx0|o$J-6HY
z=Xt$*-Y4?;NPii1>hed4XPzj@7rO*@<cBFb1UgL02j>i&DL-lqeNj_B6u2ksj)L-F
zi?~g>qslvRZ&c-qV{DG(h6Q@q^q7|mZb@^a(XmE|48m458p^Z?kwI9CvPQu^5i*F{
zQ#NM!BtiyJA51F?m&C{*?n1v~g#;NSEh`;G9!Zcv(gQ`Mp@EBS*)c&I7j4F6!zr##
zl*AH!tYl!<XHij%(IkZo(liyt26?S(hzhUd^+H7h9OC0ZKbWJ7k1n$caE-4k{ZqDY
XKcU=P<VfxY00000NkvXXu0mjfwg-Z}

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_refresh_grey_24dp_img.png b/app/src/main/res/drawable-mdpi/ic_refresh_grey_24dp_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..895d64406fb11a5d94d88014c75bdc07e554cd59
GIT binary patch
literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq000mG000>X1^@s6IQ*`u0006%Nkl<ZI8WV_
zJ&O}j6o${aGm~UUNRcXt2zFX1D@M^q(Q^F@g1E3ItdfrrQY6hZ`6N3c6O-8m6~sRv
zSXhZ57K(}}XlEgdq)HLU%;e6;kvp<sS9fLI?e;cP-1|QFocF$G5DvKTfO<HL0L!v+
zjIja{T}H%X!XqO30RXRvXsu8vyx;WAvaHp)2Zmv&s;c&h=%(j+7zBY3MrRQbBuN5A
zQHU}2Xfzt#$!4<+&bbx=ggBW@zHl7pQV;~LxQQ|LbTXNI7W?URdVz?p6H#7Klvq3-
z-{71d<(&V1h2e1c&~colFbp>sV~d)mec9=Gd%fOS0C<gv>byGBG;_Z1zYBt3#uz)l
zn^*w*{eI7N-Md08+KRrWX|B7jyG%s)tJP|Gw_pthgH_RURQ9GA5zsJ<Z@%xJkY)Lt
zrfGABw}OOtHk)al=l#XUZntX#fNI-zT-SB}ztP4{rxO7j$JrmC-EMycfRl+t;zGGx
ze!HIv9uU!rs;YxhsdRfU0AV~LE(5?Cwpy(-0PsOkl$j(+7b}&@r++~V!^nkU_{Q@*
znTSqBL25Re79!?VRsBgs*LH&lu_Q^)rqk&Wk-u84wla^h>$=YY;A%3NbP@3}06ZCw
z#~%Se&SWyDiRcCqE!nmm1Av#QRBEwUEY7wKljAt|5b>5Q%NUErqQHn1h9UUA51eyC
z#C6VjS=V(p8ni$AZ8RDS0FWo5D~NcUNNDi87-s;m>h=0Ij}GH6Z7)IEdgd2Yb{S@y
SRIFS80000<MNUMnLSTZ=b|1I^

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_warning_white_24dp_img.png b/app/src/main/res/drawable-mdpi/ic_warning_white_24dp_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..04365b98a83fff787e991bc76c3911aeab6cbf0a
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i&7LlfAr^vX5AGIpbYy6|Sbv5i
zPen;tMQs@)ZvX=vu?h$aPZI28NjsCSFZQ}H_n76S{(xmV^+zH%Dd@$UaGE}87qND-
zp7hC4e)aPA8U;tJCS5o8sWb^RS!J{Og)!5$IVT?^xi0X}C{|@&z4ZHu4bQ#UuFczW
zFY!b#&pWm%*G>)BogIeir+Q|{1s+#q4)-lrx$$U1W45!CSZqy6iDMtL9bbxQQqTH{
b|1NT}Ni8n0URPBDbUuTptDnm{r-UW|3PMv)

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh_grey_24dp_img.png b/app/src/main/res/drawable-xhdpi/ic_refresh_grey_24dp_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..848f2fb5a3e7271d5386e71c949a0fc64c646037
GIT binary patch
literal 1339
zcmV-B1;qM^P)<h;3K|Lk000e1NJLTq001BW001%w1^@s6J!IKr000F7Nkl<ZSV!$w
zU1%It6h3EWc4ju&G-b(e=|hB8L|PHC=#$bXm5L}xu@X_Cf+TE~ByKjlSTaK0b(7V&
z$!-$Tmx4h966u2vB4V*csv?pH#ezao(YC237_yt4pPRXIm!0%x&Hhr7mmOGkn7MPm
z?|kRn^MkO@7w$7Y)CtrTs4Gxcpkf75sgy?)#pfxdCj~)x1ON^JKpUkL5b+MB^d=(y
zL@B+zwY7Drx3@Q4F3HW#&Zf!|NF)+R6-9Yl5QNjFX{xqu!`9XoFyK6R?q3u|Mg$~D
zV)q#USTGFZyx;HtZ8steJe$q-6eXZ(n%dFP@h+vb&ooVm5K_*d9q$<tS(e#HAFQmb
zjA)vsI}2uJW>SV>^sqg5CBUqfW%)D9vW{7nRTXgIVwcMWE|=?PLdbJIpKpl=XKVjQ
zU}9q8L0Oi+-rU@5FO(S(mno(5f*^cD2w5B&8oJFk866$%5JmA(0C<v8`Vt}@E_9Eg
zD0dL?E5k5ec3j9@wu3-2nY>?;q$}xkx}Ck`Hd#i*a~m5Q^O~lW^o6ErQd3h?HvmK_
zr5*e}EKYdv-2RSa%;&AGtv_V5+2aK=&b!_2H!6v0{=4z<@q>hrPZ06xQa;=!Ff}#x
zzOL&7EXth=5kDLp9PF<(2$&ikkLOnaI8tnn904XhA><cAh{VZ09|#1_)C$hNo1UId
zWipu_cF)HI?-qx^MP1ilbru1@vfJ%GUajmrSr+ZOuIG+gG4R}TP18Kh&CRzg%kpr{
zUI_#ObG2H}EUyThor1~9$?j}6`;h}K2*PqYojzJF+KZ8^20W)gB9WLj4C761!}o@U
zhC;PipGu`trfK$6le}<zeEd7hvL15)B}sZ}U|`_OY6;W=p38*scznsW?Jh0=JDm(y
zEs0vz<Jj1kW!tvo#6U0@EL$OK0V<jYVzC&jHj=YoKL{)VK$k;6mgPhJ{r$J@rIjU9
zaV!?Q1^|ycF`%mIGk(ASi#;O{kH?dQkX|PS8XFtqKA$hJmjuobLOymBkR<7^bUNKt
zYa%K}oK@SFmX;fo(l*Cf065K3v8pJ_--zgONHjDwyx!N>cky1TkW41eZftB^;L`oS
zx~_NTj$AYvy#N4b9Y9r8Z>+DcAJa6gY-d{uNlnuZ9yoB|x?vdYe5oHE9`1JtuzJnv
zcJ4SbmTtFu!SDCKSP4M6H4_sPpJy_eQ`|aT6vg{k!rM+dkw_$ph{KK>So`F5yQh3U
zUvD{pQtuOq#N7@!-{t|p`EWRVE@!OsF^dIRmaie=!(2dus;UdCtE;b7>kcNn*Xx}#
zP4kp#nmJY3zJeeu>bicy3Gy9jHyVu|p_E<)fDW!WfubmXAmYf{+S**X)4|#>uh-jc
z+jh(_j5gMUa@TE96i)<$!9TZSp-{d^B=P_NT;@qI_KKpgsplpD%o9Sc5JJ9ZK4i)@
zHa2#OqWF*`NlySkHzA}=*SF^o2ZFWmC&S_Jbslrq!o!rXZTnN+9lTrE)FTK&?&r)7
z%u?3S@^W)WZV?e*2!%q+g$9=#%_K=05d`5aO6hjBESMLzeOu%?LBzOen(y$VSy=`6
z1$i}sl+tcQR7*CPcZV6BQaUG!Vk{I2{a&&dReHo&^XhWBp3RS6Yz#Zh;v{eRKl!ok
xM@0PAvaCy$o|-*vK6W#<PN1$pU4ea9;6Ejo>5*2Uoy7nE002ovPDHLkV1h+ZYYPAX

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_warning_white_24dp_img.png b/app/src/main/res/drawable-xhdpi/ic_warning_white_24dp_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..a43fa3c27d451e56094e5f182d1820b5424f2987
GIT binary patch
literal 364
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}cwPFdBQhIEGX(zBy~icQ8Ss{o^vv
zcE7ndBxcUsd7zw;?*OX>gZKl6m<HwohO{&{vt@p=vrPI|cADkhs;k}a_^5Kb`Tr;B
ze}8Wc&{(4tp4oGFu5_Pe0^fl%A{UOZA6TBqc0*{pA>)_Mj_wyHnbY@Kdom|q>Q!N!
zuKrSPN6~>vYs7*aW;d*1iZVJdZ%>)ffeC*S0>n4$oFpH!;WcA$*Q_gyHuprn9=gna
zO{M$)$*^4x(>I6+T)N2I7r@of%(q~H3B#+)ak5d297i1l-t1R+#Vl%>6z}j+pLI=#
z1bas^mq5_tiscN7s(qFW9-Ya23_*`0*gblaWfe^ON*k_NTw??Z%;)iFP3C6^dU%7m
zA;jVv1F{^uN8{r<X3c^-`3kIk>)*^ekp6x00ZyC8Qbxrq8qfR%h9ZNftDnm{r-UW|
DcZiV2

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh_grey_24dp_img.png b/app/src/main/res/drawable-xxhdpi/ic_refresh_grey_24dp_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..945fd729df553cc523b9ded776034b3fc19770b0
GIT binary patch
literal 2341
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
LNkvXXu0mjf-oa=S

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_warning_white_24dp_img.png b/app/src/main/res/drawable-xxhdpi/ic_warning_white_24dp_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..807b9fa184405c3f2dee1e77a31485d0531fd8b0
GIT binary patch
literal 473
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKNz_`HE#WAFU@y$6yzJmo44j-3!
zw)@S!Au)62P6z!1j5`?EA27)@a2N2VrMa0c^OK!r;%{X#aoH`tv)})!{@u%Mv-+dF
z6mLz<8mmn!l-sS%Ws2LTsfaD(*~;m`vgM4#t;x4$8knf4i5g#!xBC2ciLHrh_9DwC
zpHyBqt~TGIcHS#{g}2AN34P}-OpND~a!&5*S<;@fPGo1oX}+_X#*<|}RRlk4RX5+V
zw5#_@!2Av^r79!m`DL$fusKMuEy{Rydf$e5nSzTRyi{87p|bIQL{+uz-EVFebZ&l8
zIIeXj@pZ&f%N*I&ChcpJM4xX6U2`vY&O4*_waHVPWVZE%auwaM3e!9RQl&tgpm)Sq
z%N)+tcI~=}SD$ZCUGqz3TTAHt!_zjrDh3+$_bunPhN}u33EUC9O$^wWY#UhDurc3Y
z3TtM}VO)I>q$YtO`aqUJgKmPU!~wG-uc~geMa1&o4&1+s@6`ezdjFo`sELzq?Xgd_
Qz$jzzboFyt=akR{03z<nz5oCK

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_refresh_grey_24dp_img.png b/app/src/main/res/drawable-xxxhdpi/ic_refresh_grey_24dp_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fc4e4799d7f34cffde36c54f0308cf3196f0636
GIT binary patch
literal 2429
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_warning_white_24dp_img.png b/app/src/main/res/drawable-xxxhdpi/ic_warning_white_24dp_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..8683a2ea9ad340635e32632d7b1f5234f567d796
GIT binary patch
literal 590
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z$EJF;uuoF_~yJJ-@yV2hmXrV
z+x_O=keE4h=YjuBG7a1X40;C`cQCL&U^sK8C&y>5l}YBjm7OM6uU&ZZd(!{+b01hv
zOO2csD$m2V{G80IGmp>l`oBLQ(=hW|qnaXvBJW)0=pgA{=31d3PTN}M^nG);@b;XP
z%9Q$0IqB<x>&6>Y&O4oUnB8F`s4L4{U3W86LLw+dq4vO2uZi62-ZW~as!d{Nx;Ld#
z@Puqc@KLW<4%267C0QA<_l1;But@mP{&P$G@ol^;jsh&An}q`8x*8(wYO7d%q*=<Y
z*)Ct}{FSlK{RZExXq!`YzZniI=Ww1il}r6!$?!mMTkA8n{tc!k%r=MEF7SNdkapO7
zaPgb<oD4RHm@>jDrtIxvIH0W4kk)?u{C7bU_KKDUhFQ!uP7Vxb8RZle8lExq3kWzA
zH@I_fEU-MF%))X(=7As+QwHA$4n{_(^1kEhya^dba-SJm)E*o1J7ieN{bp!d_IM+|
z0)&~?b6jqgp<H#wv5GefUsk+vzffZHO&KI7Xd>JHmt$7n@j4dY<H`Rgg7~!zj+Z~)
zU>6|3>|cN|31qJ1<Bjbo7NH1$?W&)rzn6PQ0~{UP%eck%TSwTD8FLwcz|+;wWt~$(
F69C3G@0tJr

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 3690052d10..35ed2fbc19 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -13,6 +13,7 @@
     <string name="pref_library_columns_landscape_key">pref_library_columns_landscape_key</string>
     <string name="pref_library_update_interval_key">pref_library_update_interval_key</string>
     <string name="pref_update_only_non_completed_key">pref_update_only_non_completed_key</string>
+    <string name="pref_update_only_when_charging_key">pref_update_only_when_charging_key</string>
     <string name="pref_auto_update_manga_sync_key">pref_auto_update_manga_sync_key</string>
     <string name="pref_ask_update_manga_sync_key">pref_ask_update_manga_sync_key</string>
     <string name="pref_theme_key">pref_theme_key</string>
@@ -30,8 +31,8 @@
     <string name="pref_reader_theme_key">pref_reader_theme_key</string>
     <string name="pref_image_decoder_key">pref_image_decoder_key</string>
     <string name="pref_seamless_mode_key">pref_seamless_mode_key</string>
-    <string name="pref_filter_downloaded">pref_filter_downloaded</string>
-    <string name="pref_filter_unread">pref_filter_unread</string>
+    <string name="pref_filter_downloaded_key">pref_filter_downloaded_key</string>
+    <string name="pref_filter_unread_key">pref_filter_unread_key</string>
 
     <string name="pref_download_directory_key">pref_download_directory_key</string>
     <string name="pref_download_slots_key">pref_download_slots_key</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e23653c05..fa73030f7e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,6 +50,7 @@
     <string name="action_display_mode">Change display mode</string>
     <string name="action_cancel">Cancel</string>
     <string name="action_sort">Sort</string>
+    <string name="action_force">Force refresh</string>
 
     <!-- Operations -->
     <string name="deleting">Deleting…</string>
@@ -72,6 +73,7 @@
     <string name="default_columns">Default</string>
     <string name="pref_library_update_interval">Library update frequency</string>
     <string name="pref_update_only_non_completed">Only update incomplete manga</string>
+    <string name="pref_update_only_when_charging">Only update when charging</string>
     <string name="update_never">Manual</string>
     <string name="update_1hour">Hourly</string>
     <string name="update_2hour">Every 2 hours</string>
@@ -256,6 +258,10 @@
     <string name="notification_new_chapters">New chapters found for:</string>
     <string name="notification_manga_update_failed">Failed to update manga:</string>
     <string name="notification_first_add_to_library">Please add the manga to your library before doing this</string>
+    <string name="notification_not_connected_to_ac_title">Sync canceled</string>
+    <string name="notification_not_connected_to_ac_body">Not connected to AC power</string>
+    <string name="notification_no_connection_title">Sync canceled</string>
+    <string name="notification_no_connection_body">Connection not available</string>
 
     <!-- File Picker Titles -->
     <string name="file_select_cover">Select cover image</string>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 7450c8bf2f..72584f3bf3 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -3,30 +3,35 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <eu.kanade.tachiyomi.widget.preference.SimpleDialogPreference
+        android:dialogLayout="@layout/pref_library_columns"
         android:key="@string/pref_library_columns_dialog_key"
         android:persistent="false"
-        android:title="@string/pref_library_columns"
-        android:dialogLayout="@layout/pref_library_columns"/>
+        android:title="@string/pref_library_columns"/>
 
     <eu.kanade.tachiyomi.widget.preference.IntListPreference
-        android:key="@string/pref_library_update_interval_key"
-        android:title="@string/pref_library_update_interval"
+        android:defaultValue="0"
         android:entries="@array/library_update_interval"
         android:entryValues="@array/library_update_interval_values"
-        android:defaultValue="0"
-        android:summary="%s"/>
+        android:key="@string/pref_library_update_interval_key"
+        android:summary="%s"
+        android:title="@string/pref_library_update_interval"/>
 
     <eu.kanade.tachiyomi.widget.preference.IntListPreference
-        android:title="@string/pref_theme"
-        android:key="@string/pref_theme_key"
+        android:defaultValue="1"
         android:entries="@array/themes"
         android:entryValues="@array/themes_values"
-        android:defaultValue="1"
-        android:summary="%s"/>
+        android:key="@string/pref_theme_key"
+        android:summary="%s"
+        android:title="@string/pref_theme"/>
 
     <SwitchPreferenceCompat
+        android:defaultValue="false"
         android:key="@string/pref_update_only_non_completed_key"
-        android:title="@string/pref_update_only_non_completed"
-        android:defaultValue="false"/>
+        android:title="@string/pref_update_only_non_completed"/>
+
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="@string/pref_update_only_when_charging_key"
+        android:title="@string/pref_update_only_when_charging"/>
 
 </android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateAlarmTest.java b/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateAlarmTest.java
index ea5d04019b..d6f7115fe6 100644
--- a/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateAlarmTest.java
+++ b/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateAlarmTest.java
@@ -101,6 +101,7 @@ public class LibraryUpdateAlarmTest {
     @Test
     public void testLibraryUpdateServiceIsStartedWhenUpdateIntentIsReceived() {
         Intent intent = new Intent(context, LibraryUpdateService.class);
+        intent.putExtra("is_forced", false);
         assertThat(app.getNextStartedService()).isNotEqualTo(intent);
 
         LibraryUpdateAlarm alarm = new LibraryUpdateAlarm();