From b1f0f4354623e453cfb2f9dd38ef07470dfa6575 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 25 Apr 2018 22:39:36 +0200
Subject: [PATCH] bump targetSdkVersion to 25

We have a lot of work to do to bump to the latest version: #1440
---
 app/src/main/AndroidManifest.xml                       |  2 +-
 .../fdroid/fdroid/net/ConnectivityMonitorService.java  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 168915be6..5f942aed2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
             android:minSdkVersion="14"
-            android:targetSdkVersion="24"
+            android:targetSdkVersion="25"
     />
 
     <supports-screens
diff --git a/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java b/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java
index 8d943a191..0bfd2bc04 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java
@@ -17,6 +17,12 @@ import org.fdroid.fdroid.Preferences;
  * An {@link JobIntentService} subclass for tracking whether there is metered or
  * unmetered internet available, based on
  * {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION}
+ * <p>
+ * {@link Build.VERSION_CODES#N Android 7.0} removed
+ * {@link android.net.ConnectivityManager#CONNECTIVITY_ACTION} so this will
+ * need to be totally changed to support that.
+ *
+ * @see <a href="https://developer.android.com/topic/performance/background-optimization">Background Optimizations</a>
  */
 public class ConnectivityMonitorService extends JobIntentService {
     public static final String TAG = "ConnectivityMonitorServ";
@@ -36,7 +42,9 @@ public class ConnectivityMonitorService extends JobIntentService {
 
     /**
      * Register the {@link BroadcastReceiver} which also starts this
-     * {@code Service} since it is a sticky broadcast.
+     * {@code Service} since it is a sticky broadcast. This cannot be
+     * registered in the manifest, since {@link Build.VERSION_CODES#N Android 7.0}
+     * makes that not work.
      */
     public static void registerAndStart(Context context) {
         context.registerReceiver(CONNECTIVITY_RECEIVER, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));