Usage of new API, cleanups (reduced)

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
@@ skipping 14 matching lines @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.regex.Pattern;
 
 import org.adblockplus.android.updater.AlarmReceiver;
-
-import com.github.rjeschke.neetutils.Strings;
+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;
@@ skipping 163 matching lines @@
   }
 
   /**
    * Checks if ProxyService is running.
    *
    * @return true if service is running
    */
   public boolean isServiceRunning()
   {
     final ActivityManager manager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
-
     // Actually it returns not only running services, so extra check is required
     for (final RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE))
     {
       if (service.service.getClassName().equals(ProxyService.class.getCanonicalName()) && service.pid > 0)
         return true;
     }
     return false;
   }
 
   /**
@@ skipping 95 matching lines @@
    * @return A list of CSS selectors
    */
   public String[] getSelectorsForDomain(final String domain)
   {
     /* We need to ignore element hiding rules here to work around two bugs:
      * 1. CSS is being injected even when there's an exception rule with $elemhide
      * 2. The injected CSS causes blank pages in Chrome for Android
      *
      * Starting with 1.1.2, we ignored element hiding rules after download anyway, to keep the
      * memory usage down. Doing this with libadblockplus is trickier, but would be the clean
-     * solution.
-     */
+     * solution. */
     return null;
 /*
     if (!filteringEnabled)
       return null;
 
     return abpEngine.getSelectorsForDomain(domain);
- */
+*/
   }
 
   /**
    * Checks if filters match request parameters.
    *
    * @param url
    *          Request URL
    * @param query
    *          Request query string
    * @param referrer
@@ skipping 71 matching lines @@
   /**
    * Enables or disables filtering.
    */
   public void setFilteringEnabled(final boolean enable)
   {
     filteringEnabled = enable;
     sendBroadcast(new Intent(BROADCAST_FILTERING_CHANGE).putExtra("enabled", filteringEnabled));
   }
 
   /**
-   * Starts ABP engine. It also initiates subscription refresh if it is enabled in user settings.
+   * Starts ABP engine. It also initiates subscription refresh if it is enabled
+   * in user settings.
    */
   public void startEngine()
   {
     if (abpEngine == null)
     {
       final File basePath = getFilesDir();
       abpEngine = ABPEngine.create(AdblockPlus.getApplication(), ABPEngine.generateAppInfo(this), basePath.getAbsolutePath());
     }
   }
 
@@ skipping 67 matching lines @@
       final StringBuilder out = new StringBuilder();
       int read;
       do
       {
         read = reportFile.read(buffer, 0, buffer.length);
         if (read > 0)
           out.append(buffer, 0, read);
       }
       while (read >= 0);
       final String report = out.toString();
-      if (!Strings.isEmpty(report))
+      if (StringUtils.isNotEmpty(report))
       {
         final Intent intent = new Intent(this, CrashReportDialog.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra("report", report);
         startActivity(intent);
       }
     }
     catch (final FileNotFoundException e)
     {
       // ignore
     }
     catch (final IOException e)
     {
       Log.e(TAG, e.getMessage(), e);
     }
 
     // Set crash handler
     Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(this));
 
     // Initiate update check
     scheduleUpdater(0);
   }
 }