Usage of new API, cleanups (reduced)

src/org/adblockplus/android/updater/UpdaterActivity.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 19 matching lines @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.Window;
 
 /**
  * Prompts user to download update or installs downloaded update.
  */
 public class UpdaterActivity extends Activity
 {
   @Override
-  public void onCreate(Bundle savedInstanceState)
+  public void onCreate(final Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
 
     requestWindowFeature(Window.FEATURE_NO_TITLE);
 
     // Prompt user to download update
     if ("download".equals(getIntent().getAction()))
     {
       final Bundle extras = getIntent().getExtras();
       if (extras == null || extras.getString("url") == null)
       {
         finish();
         return;
       }
 
-      new AlertDialog.Builder(this).setTitle(R.string.msg_update_available).setMessage(getString(R.string.msg_update_description)).setIcon(android.R.drawable.ic_dialog_info)
-          .setPositiveButton(R.string.ok, new OnClickListener() {
+      new AlertDialog.Builder(this).setTitle(R.string.msg_update_available).setMessage(getString(R.string.msg_update_description))

[Felix Dahlke, 2014/04/28 07:29:01]

Looks like weird whitespace changes again, the code shouldn't really change
apart from the final.

[René Jeschke, 2014/04/28 08:34:32]

Done.

+          .setIcon(android.R.drawable.ic_dialog_info)
+          .setPositiveButton(R.string.ok, new OnClickListener()
+          {
             @Override
-            public void onClick(DialogInterface arg0, int arg1)
+            public void onClick(final DialogInterface arg0, final int arg1)
             {
               // Start download service
               startService(new Intent(UpdaterActivity.this, UpdaterService.class).putExtras(extras));
               finish();
             }
-          }).setNegativeButton(R.string.cancel, new OnClickListener() {
+          }).setNegativeButton(R.string.cancel, new OnClickListener()
+          {
             @Override
-            public void onClick(DialogInterface dialog, int which)
+            public void onClick(final DialogInterface dialog, final int which)
             {
               finish();
             }
-          }).setOnCancelListener(new OnCancelListener() {
+          }).setOnCancelListener(new OnCancelListener()
+          {
             @Override
-            public void onCancel(DialogInterface dialog)
+            public void onCancel(final DialogInterface dialog)
             {
               finish();
             }
           }).create().show();
     }
     // Install downloaded update
     else
     {
-      String file = getIntent().getStringExtra("path");
-      File updateFile = new File(file);
+      final String file = getIntent().getStringExtra("path");
+      final File updateFile = new File(file);
       try
       {
-        Intent installerIntent = new Intent();
+        final Intent installerIntent = new Intent();
         installerIntent.setAction(Intent.ACTION_VIEW);
         installerIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         installerIntent.setDataAndType(Uri.fromFile(updateFile), "application/vnd.android.package-archive");
         startActivity(installerIntent);
         android.os.Process.killProcess(android.os.Process.myPid());
       }
-      catch (Exception e)
+      catch (final Exception e)
       {
         e.printStackTrace();
       }
     }
   }
-
 }