Usage of new API, cleanups (reduced)

src/org/adblockplus/android/AboutDialog.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 13 matching lines @@
 import android.os.Bundle;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.Window;
 import android.widget.TextView;
 
 public class AboutDialog extends Dialog
 {
   private static Context context = null;
 
-  public AboutDialog(Context context)
+  public AboutDialog(final Context context)
   {
     super(context);
     AboutDialog.context = context;
   }
 
   @Override
-  public void onCreate(Bundle savedInstanceState)
+  public void onCreate(final Bundle savedInstanceState)
   {
-    requestWindowFeature(Window.FEATURE_NO_TITLE);
-    setContentView(R.layout.about);
+    this.requestWindowFeature(Window.FEATURE_NO_TITLE);

[Felix Dahlke, 2014/04/16 15:24:25]

As before, I'm fine with the "final" change, but not with the "this." one.

[René Jeschke, 2014/04/16 17:51:47]

Done.

+    this.setContentView(R.layout.about);
 
     // Get package version code and name
     String versionName = "--";
     int versionCode = -1;
     try
     {
-      PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+      final PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
       versionName = pi.versionName;
       versionCode = pi.versionCode;
     }
-    catch (NameNotFoundException ex)
+    catch (final NameNotFoundException ex)
     {
       // ignore - it can not happen because we query information about ourselves
     }
 
     // Construct html
-    StringBuilder info = new StringBuilder();
+    final StringBuilder info = new StringBuilder();
     info.append("<h3>");
     info.append(context.getString(R.string.app_name));
     info.append("</h3>");
     info.append("<p>");
     info.append(context.getString(R.string.version));
     info.append(": ");
     info.append(versionName);
     info.append(" ");
     info.append(context.getString(R.string.build));
     info.append(" ");
     info.append(versionCode);
     info.append("</p>");
     AdblockPlus.appendRawTextFile(context, info, R.raw.info);
     AdblockPlus.appendRawTextFile(context, info, R.raw.legal);
 
     // Show text
-    TextView tv = (TextView) findViewById(R.id.about_text);
+    final TextView tv = (TextView)this.findViewById(R.id.about_text);
     tv.setText(Html.fromHtml(info.toString()));
     tv.setMovementMethod(LinkMovementMethod.getInstance());
   }
 }