From 59e6a5ae65babbcb081915a43636c64e04077306 Mon Sep 17 00:00:00 2001 From: Gary van der Merwe Date: Wed, 20 Dec 2017 14:17:51 +0200 Subject: [PATCH] Remove code that was originally included for supporting older SDK APIs that are now older than our minSdkVersion. --- .../org/traccar/client/AutostartReceiver.java | 1 + .../org/traccar/client/TrackingService.java | 1 - .../client/WakefulBroadcastReceiver.java | 62 ------------------- 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 app/src/main/java/org/traccar/client/WakefulBroadcastReceiver.java diff --git a/app/src/main/java/org/traccar/client/AutostartReceiver.java b/app/src/main/java/org/traccar/client/AutostartReceiver.java index d1d6aa9..6cc506e 100644 --- a/app/src/main/java/org/traccar/client/AutostartReceiver.java +++ b/app/src/main/java/org/traccar/client/AutostartReceiver.java @@ -19,6 +19,7 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.preference.PreferenceManager; +import android.support.v4.content.WakefulBroadcastReceiver; public class AutostartReceiver extends WakefulBroadcastReceiver { diff --git a/app/src/main/java/org/traccar/client/TrackingService.java b/app/src/main/java/org/traccar/client/TrackingService.java index eb5b00f..9b7291b 100644 --- a/app/src/main/java/org/traccar/client/TrackingService.java +++ b/app/src/main/java/org/traccar/client/TrackingService.java @@ -53,7 +53,6 @@ public class TrackingService extends Service { return builder.build(); } - @TargetApi(Build.VERSION_CODES.ECLAIR) public static class HideNotificationService extends Service { @Override public IBinder onBind(Intent intent) { diff --git a/app/src/main/java/org/traccar/client/WakefulBroadcastReceiver.java b/app/src/main/java/org/traccar/client/WakefulBroadcastReceiver.java deleted file mode 100644 index ef1c262..0000000 --- a/app/src/main/java/org/traccar/client/WakefulBroadcastReceiver.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.client; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.os.PowerManager; -import android.support.v4.content.ContextCompat; -import android.util.SparseArray; - -public abstract class WakefulBroadcastReceiver extends BroadcastReceiver { - private static final String EXTRA_WAKE_LOCK_ID = "android.support.content.wakelockid"; - private static final SparseArray mActiveWakeLocks = new SparseArray<>(); - private static int mNextId = 1; - - public static void startWakefulService(Context context, Intent intent) { - synchronized (mActiveWakeLocks) { - int id = mNextId; - mNextId++; - if (mNextId <= 0) { - mNextId = 1; - } - intent.putExtra(EXTRA_WAKE_LOCK_ID, id); - ContextCompat.startForegroundService(context, intent); - PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE); - PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, - WakefulBroadcastReceiver.class.getSimpleName()); - wl.setReferenceCounted(false); - wl.acquire(60*1000); - mActiveWakeLocks.put(id, wl); - } - } - - public static boolean completeWakefulIntent(Intent intent) { - final int id = intent.getIntExtra(EXTRA_WAKE_LOCK_ID, 0); - if (id == 0) { - return false; - } - synchronized (mActiveWakeLocks) { - PowerManager.WakeLock wl = mActiveWakeLocks.get(id); - if (wl != null) { - wl.release(); - mActiveWakeLocks.remove(id); - return true; - } - return true; - } - } -}