From 95cbaf19939514ea9142eee022c69c85e1c3b3e7 Mon Sep 17 00:00:00 2001
From: Matthew Simmons <simmonmt@google.com>
Date: Wed, 9 Feb 2011 11:34:46 -0500
Subject: [PATCH] Add a better status message to the exception wrapper. Be more
 paranoid about exception messages.

---
 .../google/android/apps/mytracks/io/SendToFusionTables.java   | 2 +-
 .../google/android/apps/mytracks/io/gdata/GDataWrapper.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
index 4928fe84e..16d096f39 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+++ b/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.getMessage());
+          throw new GDataWrapper.HttpException(e.response.statusCode, e.response.statusMessage);
         }
         boolean success = response.isSuccessStatusCode;
         if (success) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/gdata/GDataWrapper.java b/MyTracks/src/com/google/android/apps/mytracks/io/gdata/GDataWrapper.java
index 751be06bb..335dca66a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/gdata/GDataWrapper.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/gdata/GDataWrapper.java
@@ -212,7 +212,7 @@ public class GDataWrapper<C> {
     } catch (HttpException e) {
       Log.e(MyTracksConstants.TAG, "HttpException", e);
       errorMessage = e.getMessage();
-      if (errorMessage.contains("401")) {
+      if (errorMessage != null && errorMessage.contains("401")) {
         errorType = ERROR_AUTH;
       } else {
         errorType = ERROR_CONNECTION;
@@ -224,7 +224,7 @@ public class GDataWrapper<C> {
     } catch (IOException e) {
       Log.e(MyTracksConstants.TAG, "Exception", e);
       errorMessage = e.getMessage();
-      if (errorMessage.contains("503")) {
+      if (errorMessage != null && errorMessage.contains("503")) {
         errorType = ERROR_INTERNAL;
       } else {
         errorType = ERROR_CONNECTION;