Suppressed warnings, removed trailing spaces

astrid/common-src/com/localytics/android/DatapointHelper.java

@@ -8,15 +8,6 @@
 
 package com.localytics.android;
 
-import android.Manifest.permission;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Build;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -27,11 +18,21 @@ import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
+import android.Manifest.permission;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Build;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
 /**
  * Provides a number of static functions to aid in the collection and formatting of datapoints.
  * <p>
  * Note: this is not a public API.
  */
+@SuppressWarnings("nls")
 /* package */final class DatapointHelper
 {
     /**
@@ -72,7 +73,7 @@ import java.security.NoSuchAlgorithmException;
                Class<?> buildClass = Build.VERSION.class;
                return buildClass.getField("SDK_INT").getInt(null); // $NON-NLS-1$
            }
-           catch (Exception ignore) { }
+           catch (Exception ignore) { /**/ }
        }
 
        return 3;
@@ -107,7 +108,7 @@ import java.security.NoSuchAlgorithmException;
                     return deviceId;
                 }
                 catch (final FileNotFoundException e)
-                {
+                { //
                 }
                 finally
                 {
@@ -118,7 +119,7 @@ import java.security.NoSuchAlgorithmException;
                 }
             }
             catch (final IOException e)
-            {
+            { //
             }
         }
 

astrid/common-src/com/localytics/android/LocalyticsSession.java

@@ -8,23 +8,6 @@
 
 package com.localytics.android;
 
-import android.Manifest.permission;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.CursorJoiner;
-import android.os.Build;
-import android.os.Build.VERSION;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
-import android.os.SystemClock;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.util.Log;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -51,6 +34,23 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import android.Manifest.permission;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.CursorJoiner;
+import android.os.Build;
+import android.os.Build.VERSION;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.os.SystemClock;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.util.Log;
+
 import com.localytics.android.JsonObjects.BlobHeader;
 import com.localytics.android.LocalyticsProvider.ApiKeysDbColumns;
 import com.localytics.android.LocalyticsProvider.AttributesDbColumns;
@@ -579,12 +579,12 @@ public final class LocalyticsSession
         // if less than smallest value
         if (actualValue < steps[0])
         {
-            bucket = "less than " + steps[0];
+            bucket = "less than " + steps[0]; //$NON-NLS-1$
         }
         // if greater than largest value
         else if (actualValue >= steps[steps.length - 1])
         {
-            bucket = steps[steps.length - 1] + " and above";
+            bucket = steps[steps.length - 1] + " and above"; //$NON-NLS-1$
         }
         else
         {
@@ -2006,7 +2006,7 @@ public final class LocalyticsSession
                         }
                     }
                     catch (final JSONException e)
-                    {
+                    { //
                     }
                 }
             }

astrid/src/com/todoroo/astrid/service/TaskService.java

@@ -121,7 +121,7 @@ public class TaskService {
                         continue;
 
                     if(GtasksMetadata.METADATA_KEY.equals(metadata.getValue(Metadata.KEY)))
-                        metadata.setValue(GtasksMetadata.ID, "");
+                        metadata.setValue(GtasksMetadata.ID, ""); //$NON-NLS-1$
                     if(ProducteevTask.METADATA_KEY.equals(metadata.getValue(Metadata.KEY)))
                         metadata.setValue(ProducteevTask.ID, 0L);
                     if(MilkTaskFields.METADATA_KEY.equals(metadata.getValue(Metadata.KEY))) {
@@ -152,7 +152,6 @@ public class TaskService {
         if(!item.isSaved())
             return;
         else if(item.containsValue(Task.TITLE) && item.getValue(Task.TITLE).length() == 0) {
-            GCalHelper.deleteTaskEvent(item);
             taskDao.delete(item.getId());
             item.setId(Task.NO_ID);
         } else {