Usage of new API, cleanups (reduced)

src/org/adblockplus/android/CrashHandler.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 15 matching lines @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Build;
 import android.util.Log;
 
 /**
  * Writes crash data in file.
  */
 public class CrashHandler implements UncaughtExceptionHandler
 {
-  public final static String REPORT_FILE = "AdblockPlus_Crash_Report.txt";
-
+  public static final String REPORT_FILE = "AdblockPlus_Crash_Report.txt";
   private final UncaughtExceptionHandler defaultUEH;
+  private NotificationManager notificationManager;
   private final Context context;
 
-  private NotificationManager notificationManager;
   private boolean generateReport;
   private boolean restoreProxy;
   private String host;
   private String port;
   private String excl;
 
   public CrashHandler(final Context context)
   {
-    this.defaultUEH = Thread.getDefaultUncaughtExceptionHandler();
+    defaultUEH = Thread.getDefaultUncaughtExceptionHandler();
     this.context = context;
-    this.notificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
-    this.generateReport = false;
-    this.restoreProxy = false;
+    notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+    generateReport = false;
+    restoreProxy = false;
   }
 
   public UncaughtExceptionHandler getDefault()
   {
-    return this.defaultUEH;
+    return defaultUEH;
   }
 
   @Override
   public void uncaughtException(final Thread t, final Throwable e)
   {
-    if (this.generateReport)
-    {
-      this.writeToFile(e, REPORT_FILE);
-    }
+    if (generateReport)
+      writeToFile(e, REPORT_FILE);
 
-    if (this.restoreProxy)
-    {
-      this.clearProxySettings();
-    }
+    if (restoreProxy)
+      clearProxySettings();
 
-    if (this.notificationManager != null)
+    if (notificationManager != null)
     {
       try
       {
-        this.notificationManager.cancel(ProxyService.ONGOING_NOTIFICATION_ID);
+        notificationManager.cancel(ProxyService.ONGOING_NOTIFICATION_ID);
       }
       catch (final Throwable ex)
       {
         ex.printStackTrace();
       }
     }
-    this.notificationManager = null;
+    notificationManager = null;
 
-    this.defaultUEH.uncaughtException(t, e);
+    defaultUEH.uncaughtException(t, e);
   }
 
   public void generateReport(final boolean report)
   {
-    this.generateReport = report;
+    generateReport = report;
   }
 
   @SuppressLint("WorldReadableFiles")
   private void writeToFile(final Throwable error, final String filename)
   {
     Log.e("DCR", "Writing crash report");
     int versionCode = -1;
     try
     {
-      final PackageInfo pi = this.context.getPackageManager().getPackageInfo(this.context.getPackageName(), 0);
+      final PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
       versionCode = pi.versionCode;
     }
     catch (final NameNotFoundException ex)
     {
     }
     try
     {
-      final PrintWriter pw = new PrintWriter(this.context.openFileOutput(filename, Context.MODE_WORLD_READABLE));
+      final PrintWriter pw = new PrintWriter(context.openFileOutput(filename, Context.MODE_WORLD_READABLE));
       // Write Android version
       pw.println(Build.VERSION.SDK_INT);
       // Write application build number
       pw.println(versionCode);
 
       // Write exception data
-      this.printThrowable(error, pw);
+      printThrowable(error, pw);
       final Throwable cause = error.getCause();
       // Write cause data
       if (cause != null)
       {
         pw.println("cause");
-        this.printThrowable(cause, pw);
+        printThrowable(cause, pw);
       }
       pw.flush();
       pw.close();
     }
     catch (final Throwable e)
     {
       e.printStackTrace();
     }
   }
 
@@ skipping 17 matching lines @@
       pw.println();
     }
   }
 
   public void saveProxySettings(final String host, final String port, final String excl)
   {
     Log.e("DCR", "Saving proxy " + host + ":" + port + "/" + excl);
     this.host = host;
     this.port = port;
     this.excl = excl;
-    this.restoreProxy = true;
+    restoreProxy = true;
   }
 
   public void clearProxySettings()
   {
     Log.e("DCR", "Clearing proxy");
-    this.restoreProxy = false;
+    restoreProxy = false;
     int p = 0;
     try
     {
-      p = Integer.valueOf(this.port);
+      p = Integer.valueOf(port);
     }
     catch (final NumberFormatException e)
     {
       // ignore - no valid port, it will be correctly processed later
     }
-    ProxySettings.setConnectionProxy(this.context, this.host, p, this.excl);
+    ProxySettings.setConnectionProxy(context, host, p, excl);
   }
 }