Usage of new API, cleanups (reduced)

src/org/adblockplus/android/Utils.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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.adblockplus.android;
+
+import org.adblockplus.android.updater.UpdaterActivity;
+import org.adblockplus.libadblockplus.JsValue;
+import org.adblockplus.libadblockplus.Subscription;
+import org.apache.commons.lang.StringUtils;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.support.v4.app.NotificationCompat;
+
+public final class Utils
+{
+  private Utils()
+  {
+    //

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

What's this for?

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

Commented.

[Felix Dahlke, 2014/04/28 10:09:41]

Well that comment is kinda obvious. I meant what the empty comment is for, not
the private constructor. Do we need a comment here at all costs? Warnings or
something? (Didn't get one when quickly adding a private constructor somewhere.)

If we absolutely need it, I prefer the empty comment. If we don't need it, I'd
rather have none.

[René Jeschke, 2014/04/28 10:18:34]

Empty blocks should be commented to show that this is on purpose, depends on the
warning settings, I use pretty strict warnings. So I change it back to an empty
comment.

+  }
+
+  public static String getTag(final Class<?> clazz)
+  {
+    return clazz.getSimpleName();
+  }
+
+  public static String capitalizeString(final String s)
+  {
+    if (s == null || s.length() == 0)
+    {
+      return "";
+    }
+
+    final char first = s.charAt(0);
+
+    return Character.isUpperCase(first) ? s : Character.toUpperCase(first) + s.substring(1);
+  }
+
+  protected static Notification createUpdateNotification(final Context context, final String url, final String error)
+  {
+    final PendingIntent emptyIntent = PendingIntent.getActivity(context, 0, new Intent(), 0);
+
+    final NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
+    builder.setContentTitle(context.getText(R.string.app_name));
+    builder.setSmallIcon(R.drawable.ic_stat_warning);
+    builder.setWhen(System.currentTimeMillis());
+    builder.setAutoCancel(true);
+    builder.setOnlyAlertOnce(true);
+    builder.setContentIntent(emptyIntent);
+
+    if (url != null)
+    {
+      builder.setSmallIcon(R.drawable.ic_stat_download);
+
+      final Intent intent = new Intent(context, UpdaterActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+      intent.setAction("download");
+      intent.putExtra("url", url);
+      final PendingIntent updateIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+      builder.setContentIntent(updateIntent);
+      builder.setContentText(context.getString(R.string.msg_update_available));
+    }
+    else if (error != null)
+    {
+      // TODO Should we show error message to the user?
+      builder.setContentText(context.getString(R.string.msg_update_fail));
+    }
+    else
+    {
+      builder.setContentText(context.getString(R.string.msg_update_missing));
+    }
+
+    final Notification notification = builder.getNotification();
+    return notification;
+  }
+
+  protected static void updateSubscriptionStatus(final Context context, final Subscription sub)
+  {
+    final JsValue jsDownloadStatus = sub.getProperty("downloadStatus");
+    final String downloadStatus = jsDownloadStatus.isNull() ? "" : jsDownloadStatus.toString();
+    final long lastDownload = sub.getProperty("lastDownload").asLong();
+
+    String status = "synchronize_never";
+    long time = 0;
+
+    if (sub.isUpdating())
+    {
+      status = "synchronize_in_progress";
+    }
+    else if (StringUtils.isNotEmpty(downloadStatus) && !downloadStatus.equals("synchronize_ok"))
+    {
+      status = downloadStatus;
+    }
+    else if (lastDownload > 0)
+    {
+      time = lastDownload;
+      status = "synchronize_last_at";
+    }
+
+    context.sendBroadcast(new Intent(AdblockPlus.BROADCAST_SUBSCRIPTION_STATUS)
+        .putExtra("url", sub.getProperty("url").toString())
+        .putExtra("status", status)
+        .putExtra("time", time * 1000L));
+  }
+}