Usage of new API, cleanups (reduced)

src/org/adblockplus/android/CrashReportDialog.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 24 matching lines @@
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Xml;
 import android.view.View;
 import android.view.Window;
 import android.widget.EditText;
 import android.widget.Toast;
 
 /**
- * Shows crash report dialog asking user to submit crash report together with
- * comments.
+ * Shows crash report dialog asking user to submit crash report together with comments.
  */
 public final class CrashReportDialog extends Activity
 {
-  private final static String TAG = Utils.getTag(CrashReportDialog.class);
-
+  private static final String TAG = Utils.getTag(CrashReportDialog.class);
   private String report;
 
   @Override
   protected void onCreate(final Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
-    this.requestWindowFeature(Window.FEATURE_LEFT_ICON);
-    this.setContentView(R.layout.crashreport);
+    requestWindowFeature(Window.FEATURE_LEFT_ICON);
+    setContentView(R.layout.crashreport);
 
-    final Bundle extras = this.getIntent().getExtras();
+    final Bundle extras = getIntent().getExtras();
     if (extras == null)
     {
-      this.finish();
+      finish();
       return;
     }
-    this.report = extras.getString("report");
+    report = extras.getString("report");
 
-    this.getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, android.R.drawable.ic_dialog_alert);
+    getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, android.R.drawable.ic_dialog_alert);
   }
 
   public void onOk(final View v)
   {
-    final String comment = ((EditText)this.findViewById(R.id.comments)).getText().toString();
+    final String comment = ((EditText) findViewById(R.id.comments)).getText().toString();
 
     try
     {
-      final String[] reportLines = this.report.split(System.getProperty("line.separator"));
+      final String[] reportLines = report.split(System.getProperty("line.separator"));
       final int api = Integer.parseInt(reportLines[0]);
       final int build = Integer.parseInt(reportLines[1]);
 
       final XmlSerializer xmlSerializer = Xml.newSerializer();
       final StringWriter writer = new StringWriter();
 
       xmlSerializer.setOutput(writer);
       xmlSerializer.startDocument("UTF-8", true);
       xmlSerializer.startTag("", "crashreport");
       xmlSerializer.attribute("", "version", "1");
@@ skipping 31 matching lines @@
         xmlSerializer.attribute("", "class", element[0]);
         xmlSerializer.attribute("", "method", element[1]);
         xmlSerializer.attribute("", "isnative", element[2]);
         xmlSerializer.attribute("", "file", element[3]);
         xmlSerializer.attribute("", "line", element[4]);
         xmlSerializer.endTag("", "frame");
         i++;
       }
       xmlSerializer.endTag("", "stacktrace");
       if (hasCause)
-      {
         xmlSerializer.endTag("", "cause");
-      }
       xmlSerializer.endTag("", "error");
       xmlSerializer.startTag("", "comment");
       xmlSerializer.text(comment);
       xmlSerializer.endTag("", "comment");
       xmlSerializer.endTag("", "crashreport");
       xmlSerializer.endDocument();
 
       final String xml = writer.toString();
       final HttpClient httpclient = new DefaultHttpClient();
-      final HttpPost httppost = new HttpPost(this.getString(R.string.crash_report_url));
+      final HttpPost httppost = new HttpPost(getString(R.string.crash_report_url));
       httppost.setHeader("Content-Type", "text/xml; charset=UTF-8");
       httppost.addHeader("X-Adblock-Plus", "yes");
       httppost.setEntity(new StringEntity(xml));
       final HttpResponse httpresponse = httpclient.execute(httppost);
       final StatusLine statusLine = httpresponse.getStatusLine();
       Log.e(TAG, statusLine.getStatusCode() + " " + statusLine.getReasonPhrase());
       Log.e(TAG, EntityUtils.toString(httpresponse.getEntity()));
       if (statusLine.getStatusCode() != 200)
-      {
         throw new ClientProtocolException();
-      }
       final String response = EntityUtils.toString(httpresponse.getEntity());
       if (!"saved".equals(response))
-      {
         throw new ClientProtocolException();
-      }
-      this.deleteFile(CrashHandler.REPORT_FILE);
+      deleteFile(CrashHandler.REPORT_FILE);
     }
     catch (final ClientProtocolException e)
     {
       Log.e(TAG, "Failed to submit a crash", e);
       Toast.makeText(this, R.string.msg_crash_submission_failure, Toast.LENGTH_LONG).show();
     }
     catch (final IOException e)
     {
       Log.e(TAG, "Failed to submit a crash", e);
       Toast.makeText(this, R.string.msg_crash_submission_failure, Toast.LENGTH_LONG).show();
     }
     catch (final Exception e)
     {
       Log.e(TAG, "Failed to create report", e);
       // Assuming corrupted report file, just silently deleting it
-      this.deleteFile(CrashHandler.REPORT_FILE);
+      deleteFile(CrashHandler.REPORT_FILE);
     }
-    this.finish();
+    finish();
   }
 
   public void onCancel(final View v)
   {
-    this.deleteFile(CrashHandler.REPORT_FILE);
-    this.finish();
+    deleteFile(CrashHandler.REPORT_FILE);
+    finish();
   }
 }