ABP/Android core

src/org/adblockplus/android/AdblockPlus.java

 package org.adblockplus.android;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
@@ skipping 20 matching lines @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.xml.sax.SAXException;
 
 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.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.AssetManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
 public class AdblockPlus extends Application
 {
@@ skipping 15 matching lines @@
   private JSThread js;
 
   /**
    * Indicates interactive mode (used to listen for subscription status
    * changes).
    */
   private boolean interactive = false;
 
   private boolean generateCrashReport = false;
 
-  private static AdblockPlus myself;

[Felix Dahlke, 2012/10/29 15:06:36]

Nit: Isn't "instance" a more typical name for a singleton instance field?

[Andrey Novikov, 2012/10/30 07:53:22]

Done.

+  private static AdblockPlus instance;
 
   /**
    * Returns pointer to itself (singleton pattern).
    */
   public static AdblockPlus getApplication()
   {
-    return myself;
+    return instance;
+  }
+
+  public int getBuildNumber()
+  {
+    int buildNumber = -1;
+    try
+    {
+      PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
+      buildNumber = pi.versionCode;
+    }
+    catch (NameNotFoundException e)
+    {
+      // ignore - this shouldn't happen
+      Log.e(TAG, e.getMessage(), e);
+    }
+    return buildNumber;
+  }
+
+  /**
+   * Returns device name in user-friendly format
+   */
+  public static String getDeviceName()
+  {
+    String manufacturer = Build.MANUFACTURER;
+    String model = Build.MODEL;
+    if (model.startsWith(manufacturer))
+      return capitalize(model);
+    else
+      return capitalize(manufacturer) + " " + model;
+  }
+
+  private static String capitalize(String s)
+  {
+    if (s == null || s.length() == 0)
+      return "";
+    char first = s.charAt(0);
+    if (Character.isUpperCase(first))
+      return s;
+    else
+      return Character.toUpperCase(first) + s.substring(1);
   }
 
   /**
    * Checks if device has a WiFi connection available.
    */
   public static boolean isWiFiConnected(Context context)
   {
     ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
     NetworkInfo networkInfo = null;
     if (connectivityManager != null)
@@ skipping 23 matching lines @@
     {
       subscriptions = new ArrayList<Subscription>();
 
       SAXParserFactory factory = SAXParserFactory.newInstance();
       SAXParser parser;
       try
       {
         parser = factory.newSAXParser();
         parser.parse(getAssets().open("subscriptions.xml"), new SubscriptionParser(subscriptions));
       }
       catch (ParserConfigurationException e)

[Felix Dahlke, 2012/10/29 15:06:36]

Can we log the following exceptions as an error instead of using
printStackTrace()?

[Andrey Novikov, 2012/10/30 07:53:22]

printStackTrace does pretty much the same, I use it to distinguish the parts,
where I have decided on how to deal with an error and where I have left it
as-is. But if you think that it's not good, I'll change it.

[Felix Dahlke, 2012/10/30 08:08:42]

I think Log.e() is the canonical way to log exceptions in Android. Aren't we
using quite a bit of extra information in logcat with printStackTrace()? I
believe it doesn't show application, activity etc.

       {
         // TODO Auto-generated catch block
-        e.printStackTrace();
+        Log.e(TAG, e.getMessage(), e);
       }
       catch (SAXException e)
       {
         // TODO Auto-generated catch block
-        e.printStackTrace();
+        Log.e(TAG, e.getMessage(), e);
       }
       catch (IOException e)
       {
         // TODO Auto-generated catch block
-        e.printStackTrace();
+        Log.e(TAG, e.getMessage(), e);
       }
     }
     return subscriptions;
   }
 
   /**
    * Returns subscription information.
    * 
    * @param url
    *          subscription url
@@ skipping 11 matching lines @@
   }
 
   /**
    * Adds provided subscription and removes previous subscriptions if any.
    * 
    * @param subscription
    *          Subscription to add
    */
   public void setSubscription(Subscription subscription)
   {
-    /*
-     * Subscription test = new Subscription();

[Felix Dahlke, 2012/10/29 15:06:36]

Can we remove this commented code? It's in source control should we need it in
the future.

[Andrey Novikov, 2012/10/30 07:53:22]

Done.

-     * test.url =
-     * "https://easylist-downloads.adblockplus.org/exceptionrules.txt";
-     * test.title = "Test";
-     * test.homepage = "https://easylist-downloads.adblockplus.org/";
-     * selectedItem = test;
-     */
-
     if (subscription != null)
     {
       final JSONObject jsonSub = new JSONObject();
       try
       {
         jsonSub.put("url", subscription.url);
         jsonSub.put("title", subscription.title);
         jsonSub.put("homepage", subscription.homepage);
-        js.execute(new Runnable() {
+        js.execute(new Runnable()
+        {
           @Override
           public void run()
           {
             js.evaluate("clearSubscriptions()");
             js.evaluate("addSubscription(\"" + StringEscapeUtils.escapeJavaScript(jsonSub.toString()) + "\")");
           }
         });
       }
       catch (JSONException e)
       {
         // TODO Auto-generated catch block

[Felix Dahlke, 2012/10/29 15:06:36]

Can we log this exception as an error instead of using printStackTrace()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

-        e.printStackTrace();
+        Log.e(TAG, e.getMessage(), e);
       }
     }
   }
 
   /**
    * Forces subscriptions refresh.
    */
   public void refreshSubscription()
   {
-    js.execute(new Runnable() {
+    js.execute(new Runnable()
+    {
       @Override
       public void run()
       {
         js.evaluate("refreshSubscriptions()");
       }
     });
   }
 
   /**
    * Selects which subscription to offer for the first time.
@@ skipping 40 matching lines @@
   }
 
   /**
    * Verifies that subscriptions are loaded and returns flag of subscription
    * presence.
    * 
    * @return true if at least one subscription is present and downloaded
    */
   public boolean verifySubscriptions()
   {
-    Future<Boolean> future = js.submit(new Callable<Boolean>() {
+    Future<Boolean> future = js.submit(new Callable<Boolean>()
+    {
       @Override
       public Boolean call() throws Exception
       {
         Boolean result = (Boolean) js.evaluate("verifySubscriptions()");
         return result;
       }
     });
     try
     {
       return future.get().booleanValue();
     }
     catch (InterruptedException e)
     {
       // TODO Auto-generated catch block

[Felix Dahlke, 2012/10/29 15:06:36]

Like above, log an error instead?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

-      e.printStackTrace();
+      Log.e(TAG, e.getMessage(), e);
     }
     catch (ExecutionException e)
     {
       // TODO Auto-generated catch block
-      e.printStackTrace();
+      Log.e(TAG, e.getMessage(), e);
     }
     return false;
   }
 
   /**
    * Returns ElemHide selectors for domain.
    * 
    * @return ready to use HTML element with CSS selectors
    */
   public String getSelectorsForDomain(final String domain)
   {
-    Future<String> future = js.submit(new Callable<String>() {

[Felix Dahlke, 2012/10/29 15:06:36]

Is the future really necessary here? It seems you just submit it and then wait
for it, can't you call js.evaluate() directly with pretty much the same results?

[Andrey Novikov, 2012/10/30 07:53:22]

No, I can't. JS runs in separate asynchronous thread, I can't access it
directly.

[Felix Dahlke, 2012/10/30 08:08:42]

Oh, I see.

+    Future<String> future = js.submit(new Callable<String>()
+    {
       @Override
       public String call() throws Exception
       {
         String result = (String) js.evaluate("ElemHide.getSelectorsForDomain('" + domain + "')");
         return result;
       }
     });
     try
     {
       return future.get();
     }
     catch (InterruptedException e)
     {
       // TODO Auto-generated catch block

[Felix Dahlke, 2012/10/29 15:06:36]

Like above, error logging.

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

-      e.printStackTrace();
+      Log.e(TAG, e.getMessage(), e);
     }
     catch (ExecutionException e)
     {
       // TODO Auto-generated catch block
-      e.printStackTrace();
+      Log.e(TAG, e.getMessage(), e);
     }
     return null;
   }
 
   private class MatchesCallable implements Callable<Boolean>
   {
     private String url;
     private String query;
     private String reqHost;
     private String refHost;
     private String accept;
 
     MatchesCallable(String url, String query, String reqHost, String refHost, String accept)
     {
       this.url = url;
       this.query = query;
       this.reqHost = reqHost != null ? reqHost : "";
       this.refHost = refHost != null ? refHost : "";
       this.accept = accept != null ? accept : "";
     }
 
     @Override
     public Boolean call() throws Exception
     {
       Boolean result = (Boolean) js.evaluate("matchesAny('" + url + "', '" + query + "', '" + reqHost + "', '" + refHost + "', '" + accept + "');");

[Felix Dahlke, 2012/10/29 15:06:36]

Nit: You could just return this directly

[Andrey Novikov, 2012/10/30 07:53:22]

See above.

       return result;
     }
   }
 
   /**
    * Checks if filters match request parameters.
    * 
    * @param url
    *          Request URL
    * @param query
@@ skipping 14 matching lines @@
     boolean matches = future.get().booleanValue();
     sendBroadcast(new Intent(BROADCAST_FILTER_MATCHES).putExtra("url", url).putExtra("matches", matches));
     return matches;
   }
 
   /**
    * Notifies JS code that application entered interactive mode.
    */
   public void startInteractive()
   {
-    js.execute(new Runnable() {
+    js.execute(new Runnable()
+    {
       @Override
       public void run()
       {
         js.evaluate("startInteractive()");
       }
     });
     interactive = true;
   }
 
   /**
    * Notifies JS code that application quit interactive mode.
    */
   public void stopInteractive()
   {
-    js.execute(new Runnable() {
+    js.execute(new Runnable()
+    {
       @Override
       public void run()
       {
         js.evaluate("stopInteractive()");
       }
     });
     interactive = false;
   }
 
   /**
@@ skipping 14 matching lines @@
   }
 
   /**
    * Starts JS engine. It also initiates subscription refresh if it is enabled
    * in user settings.
    */
   public void startEngine()
   {
     if (js == null)
     {
-      Log.e(TAG, "startEngine");

[Felix Dahlke, 2012/10/29 15:06:36]

Shouldn't this be Log.d()?

[Andrey Novikov, 2012/10/30 07:53:22]

I use logging not only for error reporting but also as a debug aid. This is why
I use log high levels to emphasize major execution flow points. It helps much
when I debug a lot. If you consider this bad style I will change log levels to
appropriate ones.

[Felix Dahlke, 2012/10/30 08:08:42]

That's fine for debugging of course, but I think we should either remove them or
turn them into Log.d() if they should be permanent before committing. I don't
know, seems strange to have errors that aren't errors in the log.

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+      Log.i(TAG, "startEngine");
       js = new JSThread(this);
       js.start();
 
       final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
       final int refresh = Integer.valueOf(prefs.getString(getString(R.string.pref_refresh), Integer.toString(getResources().getInteger(R.integer.def_refresh))));

[Felix Dahlke, 2012/10/29 15:06:36]

We should use a fixed string for storing these preferences, not locale dependent
ones. Otherwise I'd loose all preferences when switching languages, right?

[Andrey Novikov, 2012/10/30 07:53:22]

These are not locale dependent. Locale dependent strings are put in separate
file and only they will be exposed for localization.

[Felix Dahlke, 2012/10/30 08:08:42]

The string "pref_refresh" is "Subscription refresh". Are you sure that doesn't
have to be translated? Why not use the string literal "refresh" for the
preference instead? That's how the official examples do it:

http://developer.android.com/guide/topics/data/data-storage.html#pref

[Andrey Novikov, 2012/10/30 09:24:17]

No, the string pref_refresh is "refresh", and what you mean is
pref_refresh_title. Yes, it's how examples are written, for simplicity, but it's
a bad style:
1. You can mistype it in some other part of a code and result in dealing with
another parameter.
2. There are situations when the parameter need to be renamed (back
compatibility issues).

But I can simplify things if you wish.

[Felix Dahlke, 2012/10/30 09:30:50]

True, repeated string literals aren't great. How about constants though?

       final boolean wifionly = prefs.getBoolean(getString(R.string.pref_wifirefresh), getResources().getBoolean(R.bool.def_wifirefresh));
       // Refresh if user selected refresh on each start
       if (refresh == 1 && (!wifionly || isWiFiConnected(this)))
       {
         refreshSubscription();
       }
     }
   }
 
   /**
    * Stops JS engine.
    * 
    * @param implicitly
    *          stop even in interactive mode
    */
   public void stopEngine(boolean implicitly)
   {
     if ((implicitly || !interactive) && js != null)
     {
       js.stopEngine();
       try
       {
         js.join();
       }
       catch (InterruptedException e)
       {
-        e.printStackTrace();

[Felix Dahlke, 2012/10/29 15:06:36]

As before, error logging?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+        Log.e(TAG, e.getMessage(), e);
       }
       js = null;
     }
   }
 
   /**
    * Sets or removes crash handler according to user setting
    */
   public void updateCrashReportStatus()
   {
@@ skipping 15 matching lines @@
         catch (ClassCastException e)
         {
           // ignore - already default handler
         }
       }
       generateCrashReport = report;
     }
   }
 
   /**
-   * Sets Alarm to call updater after specified number of minutes or after one day if
+   * Sets Alarm to call updater after specified number of minutes or after one
+   * day if
    * minutes are set to 0.
    * 
    * @param minutes
    *          number of minutes to wait
    */
   public void scheduleUpdater(int minutes)
   {
     Calendar updateTime = Calendar.getInstance();
 
     if (minutes == 0)
     {
       // Start update checks at 10:00 GMT...
       updateTime.setTimeZone(TimeZone.getTimeZone("GMT"));
       updateTime.set(Calendar.HOUR_OF_DAY, 10);
       updateTime.set(Calendar.MINUTE, 0);
       // ...next day
       updateTime.add(Calendar.HOUR_OF_DAY, 24);
       // Spread out the “mass downloading” for 6 hours
       updateTime.add(Calendar.MINUTE, (int) Math.random() * 60 * 6);
     }
     else
     {
       updateTime.add(Calendar.MINUTE, minutes);
     }
 
     Intent updater = new Intent(this, AlarmReceiver.class);
     PendingIntent recurringUpdate = PendingIntent.getBroadcast(this, 0, updater, PendingIntent.FLAG_CANCEL_CURRENT);
     // Set non-waking alarm
     AlarmManager alarms = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
-    Log.e(TAG, "Set updater alarm");

[Felix Dahlke, 2012/10/29 15:06:36]

I guess Log.d() is more appropriate here?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

     alarms.set(AlarmManager.RTC, updateTime.getTimeInMillis(), recurringUpdate);
   }
 
   @Override
   public void onCreate()
   {
     super.onCreate();
-    myself = this;
+    instance = this;
 
     // Check for crash report
     try
     {
       InputStreamReader reportFile = new InputStreamReader(openFileInput(CrashHandler.REPORT_FILE));
       final char[] buffer = new char[0x1000];
       StringBuilder out = new StringBuilder();
       int read;
       do
       {
@@ skipping 10 matching lines @@
         intent.putExtra("report", report);
         startActivity(intent);
       }
     }
     catch (FileNotFoundException e)
     {
       // ignore
     }
     catch (IOException e)
     {
       // TODO Auto-generated catch block

[Felix Dahlke, 2012/10/29 15:06:36]

Log.e()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

-      e.printStackTrace();
+      Log.e(TAG, e.getMessage(), e);
     }
 
     if (!getResources().getBoolean(R.bool.def_release))
     {
       // Set crash handler
       updateCrashReportStatus();
       // Initiate update check
       scheduleUpdater(0);
     }
   }
 
   /**
    * Handler for showing toast messages from JS code.
    */
-  private final Handler messageHandler = new Handler() {
+  private static final Handler messageHandler = new Handler()
+  {
     public void handleMessage(Message msg)
     {
       if (msg.what == MSG_TOAST)
       {
-        Toast.makeText(AdblockPlus.this, msg.getData().getString("message"), Toast.LENGTH_LONG).show();
+        Toast.makeText(AdblockPlus.getApplication(), msg.getData().getString("message"), Toast.LENGTH_LONG).show();
       }
     }
   };
 
   /**
    * JS execution thread.
    */
   private final class JSThread extends Thread
   {
     private JSEngine jsEngine;
@@ skipping 23 matching lines @@
         {
           read = reader.read(buffer, 0, buffer.length);
           if (read > 0)
             out.append(buffer, 0, read);
         }
         while (read >= 0);
         result = out.toString();
       }
       catch (IOException e)
       {
-        e.printStackTrace();

[Felix Dahlke, 2012/10/29 15:06:36]

Log.e()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+        Log.e(TAG, e.getMessage(), e);
       }
       return result;
     }
 
     // JS helper
     public FileInputStream getInputStream(String path)
     {
-      Log.e(TAG, path);

[Felix Dahlke, 2012/10/29 15:06:36]

Log.d()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+      Log.d(TAG, path);
       File f = new File(path);
       try
       {
         return openFileInput(f.getName());
       }
       catch (FileNotFoundException e)
       {
-        e.printStackTrace();

[Felix Dahlke, 2012/10/29 15:06:36]

Log.e()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+        Log.e(TAG, e.getMessage(), e);
       }
       return null;
     }
 
     // JS helper
     public FileOutputStream getOutputStream(String path)
     {
-      Log.e(TAG, path);

[Felix Dahlke, 2012/10/29 15:06:36]

Log.d()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+      Log.d(TAG, path);
       File f = new File(path);
       try
       {
         return openFileOutput(f.getName(), MODE_PRIVATE);
       }
       catch (FileNotFoundException e)
       {
-        e.printStackTrace();

[Felix Dahlke, 2012/10/29 15:06:36]

Log.e()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+        Log.e(TAG, e.getMessage(), e);
       }
       return null;
     }
 
     // JS helper
     public String getVersion()
     {
       String versionName = null;
       try
       {
@@ skipping 13 matching lines @@
       final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
       final int refresh = Integer.valueOf(prefs.getString(getString(R.string.pref_refresh), Integer.toString(context.getResources().getInteger(R.integer.def_refresh))));
       final boolean wifionly = prefs.getBoolean(getString(R.string.pref_wifirefresh), getResources().getBoolean(R.bool.def_wifirefresh));
       return refresh == 2 && (!wifionly || isWiFiConnected(context));
     }
 
     // JS helper
     @SuppressWarnings("unused")
     public void httpSend(final String method, final String url, final String[][] headers, final boolean async, final long callback)
     {
-      Log.e(TAG, "httpSend('" + method + "', '" + url + "')");

[Felix Dahlke, 2012/10/29 15:06:36]

Log.d()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

-      messageHandler.post(new Runnable() {
+      Log.d(TAG, "httpSend('" + method + "', '" + url + "')");
+      messageHandler.post(new Runnable()
+      {
         @Override
         public void run()
         {
           try
           {
             Task task = new Task();
             task.callback = callback;
             task.connection = (HttpURLConnection) new URL(url).openConnection();
             task.connection.setRequestMethod(method);
             for (int i = 0; i < headers.length; i++)
             {
               task.connection.setRequestProperty(headers[i][0], headers[i][1]);
             }
             DownloadTask downloadTask = new DownloadTask(context);
             downloadTask.execute(task);
             if (!async)
             {
               downloadTask.get();
             }
           }
           catch (Exception e)
           {
-            e.printStackTrace();
+            Log.e(TAG, e.getMessage(), e);
             js.callback(callback, null);
           }
         }
       });
     }
 
     // JS helper
     @SuppressWarnings("unused")

[Felix Dahlke, 2012/10/29 15:06:36]

I don't think this is necessary

[Andrey Novikov, 2012/10/30 07:53:22]

This is necessary because Eclipse highlights all warning and error points in
source code, I do not want correct code to be highlighted and hinder locating
real problems.

[Felix Dahlke, 2012/10/30 08:08:42]

I know what it's for, but I can't see any unused variables in this method. Same
below.

[Andrey Novikov, 2012/10/30 09:24:17]

It's not about variables but about the method itself.

[Felix Dahlke, 2012/10/30 09:30:50]

Ah, I see. You only need that code for debugging?

[Andrey Novikov, 2012/10/30 09:45:28]

No, it's called by JS engine from native code, that's why Eclipse thinks that
it's not used.

     public void setStatus(String text, long time)
     {
       sendBroadcast(new Intent(BROADCAST_SUBSCRIPTION_STATUS).putExtra("text", text).putExtra("time", time));
     }
 
     // JS helper
     @SuppressWarnings("unused")

[Felix Dahlke, 2012/10/29 15:06:36]

I don't think this is necessary

     public void showToast(String text)
     {
-      Log.e(TAG, "Toast: " + text);
+      Log.d(TAG, "Toast: " + text);
       Message msg = messageHandler.obtainMessage(MSG_TOAST);

[Felix Dahlke, 2012/10/29 15:06:36]

Log.d()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

       Bundle data = new Bundle();
       data.putString("message", text);
       msg.setData(data);
       messageHandler.sendMessage(msg);
     }
 
     // JS helper
     @SuppressWarnings("unused")

[Felix Dahlke, 2012/10/29 15:06:36]

I don't  think this is necessary

     public void notify(long delay)
     {
       if (this.delay < 0 || delay < this.delay)
       {
         this.delay = delay;
         synchronized (queue)
         {
           queue.notify();
         }
       }
@@ skipping 43 matching lines @@
       jsEngine.put("_datapath", getFilesDir().getAbsolutePath());
       jsEngine.put("_separator", File.separator);
       jsEngine.put("_version", getVersion());
 
       try
       {
         jsEngine.evaluate("Android.load(\"start.js\");");
       }
       catch (Exception e)
       {
-        e.printStackTrace();

[Felix Dahlke, 2012/10/29 15:06:36]

Log.e()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+        Log.e(TAG, e.getMessage(), e);
       }
 
       while (run)
       {
         try
         {
           Runnable r = null;
           synchronized (queue)
           {
             r = queue.poll();
           }
           if (r != null)
           {
             r.run();
           }
           else if (delay > 0)
           {
             long t = SystemClock.uptimeMillis();
             synchronized (queue)
             {
               try
               {
                 queue.wait(delay);
               }
               catch (InterruptedException e)
               {

[Felix Dahlke, 2012/10/29 15:06:36]

Log.e()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

               }
             }
             delay -= SystemClock.uptimeMillis() - t;
           }
           else if (delay <= 0)
           {
             delay = jsEngine.runCallbacks();
           }
           else
           {
             synchronized (queue)
             {
               try
               {
                 queue.wait();
               }
               catch (InterruptedException e)
               {

[Felix Dahlke, 2012/10/29 15:06:36]

Log.e()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+                Log.e(TAG, e.getMessage(), e);
               }
             }
           }
         }
         catch (Exception e)
         {
-          e.printStackTrace();

[Felix Dahlke, 2012/10/29 15:06:36]

Log.e()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+          Log.e(TAG, e.getMessage(), e);
         }
       }
 
       jsEngine.release();
     }
   }
 
   /**
    * Helper class for XMLHttpRequest implementation.
    */
@@ skipping 46 matching lines @@
           {
             headers[i][0] = header;
             headers[i][1] = StringUtils.join(result.headers.get(header).toArray(), "; ");
             i++;
           }
         }
         params[0] = result.code;
         params[1] = result.message;
         params[2] = headers;
         params[3] = result.data;
-        js.execute(new Runnable() {
+        js.execute(new Runnable()
+        {
           @Override
           public void run()
           {
             js.callback(callback, params);
           }
 
         });
       }
     }
 
     @Override
     protected void onCancelled()
     {
     }
 
     @Override
     protected Result doInBackground(Task... tasks)
     {
       Task task = tasks[0];
       Result result = new Result();
       result.callback = task.callback;
       try
       {
         HttpURLConnection connection = task.connection;
         connection.connect();
         int lenghtOfFile = connection.getContentLength();
-        Log.w("D", "S: " + lenghtOfFile);

[Felix Dahlke, 2012/10/29 15:06:36]

Log.d()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+        Log.d("D", "S: " + lenghtOfFile);
 
         result.code = connection.getResponseCode();
         result.message = connection.getResponseMessage();
         result.headers = connection.getHeaderFields();
 
         // download the file
         String encoding = connection.getContentEncoding();
         if (encoding == null)
           encoding = "utf-8";
         BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), encoding));
 
         final char[] buffer = new char[0x10000];

[Felix Dahlke, 2012/10/29 15:06:36]

Reminds me of the code up there, maybe have a single method for reading from a
reader into a string?

[Andrey Novikov, 2012/10/30 07:53:22]

No, I can't. At least do not know how. Because here it can be canceled by user
and publishes progress to UI.

         StringBuilder out = new StringBuilder();
         long total = 0;
         int read;
         do
         {
           read = in.read(buffer, 0, buffer.length);
           if (read > 0)
           {
             out.append(buffer, 0, read);
             total += read;
             publishProgress((int) (total * 100. / lenghtOfFile));
           }
         }
         while (!isCancelled() && read >= 0);
         result.data = out.toString();
         in.close();
       }
       catch (Exception e)
       {
-        e.printStackTrace();

[Felix Dahlke, 2012/10/29 15:06:36]

Log.e()?

[Andrey Novikov, 2012/10/30 09:24:17]

Done.

+        Log.e(TAG, e.getMessage(), e);
         result.data = "";
         result.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
         result.message = e.toString();
       }
       return result;
     }
 
     protected void onProgressUpdate(Integer... progress)
     {
-      Log.i("HTTP", "Progress: " + progress[0].intValue());
+      Log.d("HTTP", "Progress: " + progress[0].intValue());
     }
   }
 }