Code review fix

Fix typo in proguard disabling comment.

MyTracks/AndroidManifest.xml

@@ -17,8 +17,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.maps.mytracks"
           android:installLocation="auto"
-          android:versionCode="24"
-          android:versionName="1.1.1">
+          android:versionCode="22"
+          android:versionName="1.0.21">
   <application android:icon="@drawable/arrow_icon"
                android:label="@string/app_name"
                android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">

MyTracks/proguard.cfg

@@ -15,17 +15,11 @@
 -dontwarn org.codehaus.**
 -dontwarn com.google.appengine.**
 
-# Make our stack traces useful
-# Line numbers will be correct, file names will be replaced by "MT" since the
-# class name is enough to get the file name.
--renamesourcefileattribute MT
--keepattributes SourceFile,LineNumberTable
-
 # Keep everything android references from XMLs
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Application
 -keep public class * extends android.app.Service
--keep public class * extends android.app.backup.BackupAgent
+-keep public class * extends android.app,backup.BackupAgent
 -keep public class * extends android.content.BroadcastReceiver
 -keep public class * extends android.content.ContentProvider
 -keep public class * extends android.preference.Preference

MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProvider.java

@@ -16,7 +16,6 @@
 package com.google.android.apps.mytracks.content;
 
 import com.google.android.apps.mytracks.MyTracksConstants;
-import com.google.android.apps.mytracks.util.ApiFeatures;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -372,11 +371,8 @@ public class MyTracksProvider extends ContentProvider {
       throw new IllegalArgumentException("Unknown URL " + url);
     }
 
-    if (ApiFeatures.getInstance().canReuseSQLiteQueryBuilder()) {
-      Log.i(MyTracksConstants.TAG,
-          "Build query: " + qb.buildQuery(projection, selection, selectionArgs, 
-          null, null, sortOrder, null));
-    }
+    Log.i(MyTracksConstants.TAG,
+        "Build query: " + qb.buildQuery(projection, selection, selectionArgs, null, null, sortOrder, null));
     Cursor c = qb.query(db, projection, selection, selectionArgs, null, null,
         sortOrder);
     c.setNotificationUri(getContext().getContentResolver(), url);

MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java

@@ -670,7 +670,7 @@ public class SendToFusionTables implements Runnable {
         try {
           response = request.execute();
         } catch (HttpResponseException e) {
-          throw new GDataWrapper.HttpException(e.response.statusCode, e.response.statusMessage);
+          throw new GDataWrapper.HttpException(e.response.statusCode, e.getMessage());
         }
         boolean success = response.isSuccessStatusCode;
         if (success) {

MyTracks/src/com/google/android/apps/mytracks/io/gdata/GDataWrapper.java

@@ -210,10 +210,9 @@ public class GDataWrapper<C> {
       errorType = ERROR_AUTH;
       errorMessage = e.getMessage();
     } catch (HttpException e) {
-      Log.e(MyTracksConstants.TAG, 
-          "HttpException, code " + e.getStatusCode() + " message " + e.getMessage(), e);
+      Log.e(MyTracksConstants.TAG, "HttpException", e);
       errorMessage = e.getMessage();
-      if (e.getStatusCode() == 401) {
+      if (errorMessage.contains("401")) {
         errorType = ERROR_AUTH;
       } else {
         errorType = ERROR_CONNECTION;
@@ -225,7 +224,7 @@ public class GDataWrapper<C> {
     } catch (IOException e) {
       Log.e(MyTracksConstants.TAG, "Exception", e);
       errorMessage = e.getMessage();
-      if (errorMessage != null && errorMessage.contains("503")) {
+      if (errorMessage.contains("503")) {
         errorType = ERROR_INTERNAL;
       } else {
         errorType = ERROR_CONNECTION;

MyTracks/src/com/google/android/apps/mytracks/util/ApiFeatures.java

@@ -106,18 +106,6 @@ public class ApiFeatures {
   public boolean hasStrictMode() {
     return getApiLevel() >= 9;
   }
-  
-  /**
-   * There's a bug (#1587) in Cupcake and Donut which prevents you from
-   * using a SQLiteQueryBuilder twice.  That is, if you call buildQuery
-   * on a given instance (to log the statement for debugging), and then
-   * call query on the same instance to make it actually do the query,
-   * it'll regenerate the query for the second call, and will screw it
-   * up.  Specifically, it'll add extra parens which don't belong.
-   */
-  public boolean canReuseSQLiteQueryBuilder() {
-    return getApiLevel() > 4;
-  }
 
   // Visible for testing.
   protected int getApiLevel() {