Merge with 28a6c6c0e8f12e489fa501609be4b564eb822f55

(Merge to Head)
This commit is contained in:
FNelson
2010-09-02 12:23:32 +01:00
parent 236bcba2bd
commit b84da40365
57 changed files with 4662 additions and 2465 deletions
@@ -114,7 +114,7 @@ public class MyMapsGDataWrapper {
} 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;
@@ -122,7 +122,7 @@ public class MyMapsGDataWrapper {
} 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;