Issue 98 - Use the libadblockplus update mechanism

src/org/adblockplus/android/AdblockPlus.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.android;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.Calendar;
 import java.util.List;
-import java.util.TimeZone;
 import java.util.regex.Pattern;
 
-import org.adblockplus.android.updater.AlarmReceiver;
 import org.adblockplus.libadblockplus.FilterEngine.ContentType;
 import org.apache.commons.lang.StringUtils;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
-import android.app.AlarmManager;
 import android.app.Application;
-import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.util.Log;
 
 public class AdblockPlus extends Application
 {
   private static final String TAG = Utils.getTag(AdblockPlus.class);
 
   private static final Pattern RE_JS = Pattern.compile("\\.js$", Pattern.CASE_INSENSITIVE);
   private static final Pattern RE_CSS = Pattern.compile("\\.css$", Pattern.CASE_INSENSITIVE);
   private static final Pattern RE_IMAGE = Pattern.compile("\\.(?:gif|png|jpe?g|bmp|ico)$", Pattern.CASE_INSENSITIVE);
   private static final Pattern RE_FONT = Pattern.compile("\\.(?:ttf|woff)$", Pattern.CASE_INSENSITIVE);
   private static final Pattern RE_HTML = Pattern.compile("\\.html?$", Pattern.CASE_INSENSITIVE);
 
   /**
-   * Update notification id.
-   */
-  public static final int UPDATE_NOTIFICATION_ID = R.string.app_name + 1;
-  /**
    * Broadcasted when filtering is enabled or disabled.
    */
   public static final String BROADCAST_FILTERING_CHANGE = "org.adblockplus.android.filtering.status";
   /**
    * Broadcasted when subscription status changes.
    */
   public static final String BROADCAST_SUBSCRIPTION_STATUS = "org.adblockplus.android.subscription.status";
   /**
    * Cached list of recommended subscriptions.
    */
@@ skipping 337 matching lines @@
   }
 
   /**
    * Initiates immediate interactive check for available update.
    */
   public void checkUpdates()
   {
     abpEngine.checkForUpdates();
   }
 
-  /**
-   * Sets Alarm to call updater after specified number of minutes or after one
-   * day if
-   * minutes are set to 0.
-   *
-   * @param minutes
-   *          number of minutes to wait
-   */
-  public void scheduleUpdater(final int minutes)
-  {
-    final Calendar updateTime = Calendar.getInstance();
-
-    if (minutes == 0)
-    {
-      // Start update checks at 10:00 GMT...
-      updateTime.setTimeZone(TimeZone.getTimeZone("GMT"));
-      updateTime.set(Calendar.HOUR_OF_DAY, 10);
-      updateTime.set(Calendar.MINUTE, 0);
-      // ...next day
-      updateTime.add(Calendar.HOUR_OF_DAY, 24);
-      // Spread out the “mass downloading” for 6 hours
-      updateTime.add(Calendar.MINUTE, (int) (Math.random() * 60 * 6));
-    }
-    else
-    {
-      updateTime.add(Calendar.MINUTE, minutes);
-    }
-
-    final Intent updater = new Intent(this, AlarmReceiver.class);
-    final PendingIntent recurringUpdate = PendingIntent.getBroadcast(this, 0, updater, PendingIntent.FLAG_CANCEL_CURRENT);
-    // Set non-waking alarm
-    final AlarmManager alarms = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
-    alarms.set(AlarmManager.RTC, updateTime.getTimeInMillis(), recurringUpdate);
-  }
-
   @Override
   public void onCreate()
   {
     super.onCreate();
     instance = this;
 
     // Check for crash report
     try
     {
       final InputStreamReader reportFile = new InputStreamReader(openFileInput(CrashHandler.REPORT_FILE));
@@ skipping 20 matching lines @@
     {
       // ignore
     }
     catch (final IOException e)
     {
       Log.e(TAG, e.getMessage(), e);
     }
 
     // Set crash handler
     Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(this));
-
-    // Initiate update check
-    scheduleUpdater(0);
   }
 }