From d0a9885a5047d4f23dae565a37c78570a1f5f8c5 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Wed, 27 Nov 2013 14:23:38 -0800
Subject: [PATCH] Add custom error message when trying to make a track public
 in Google Drive

---
 MyTracks/res/values/strings.xml                    |  7 +++++++
 .../io/sendtogoogle/UploadResultActivity.java      | 14 +++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index d9c8b9f0e..59ba58067 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -674,6 +674,13 @@ limitations under the License.
       %2$s service url. E.g, maps.google.com.">
     An error has occurred. Unable to export to %1$s (%2$s). Please try again.
   </string>
+  <string name="export_google_error_public"
+    translation_description="The error message when not able to make a track public.
+
+      %1$s service name. E.g, Google Drive.
+      %2$s service url. E.g, drive.google.com.">
+    Unable to make track public in %1$s (%2$s).
+  </string>
   <string name="export_google_fusion_tables"
     translation_description="When exporting a track, the option to export to Google Fusion Tables.">
     Google Fusion Tables
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java
index 9b7499162..f17d84478 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java
@@ -97,9 +97,17 @@ public class UploadResultActivity extends FragmentActivity implements ChooseActi
       success = sendRequest.isSpreadsheetsSuccess();
     }
 
-    String message = getString(
-        success ? R.string.export_google_success : R.string.export_google_error,
-        getString(serviceName), getString(serviceUrl));
+    int messageId;
+    if (success) {
+      messageId = R.string.export_google_success;
+    } else {
+      if (sendRequest.isDriveSharePublic()) {
+        messageId = R.string.export_google_error_public;
+      } else {
+        messageId = R.string.export_google_error;
+      }
+    }
+    String message = getString(messageId, getString(serviceName), getString(serviceUrl));
     AlertDialog.Builder builder = new AlertDialog.Builder(this).setCancelable(true)
         .setIcon(success ? R.drawable.ic_dialog_success : android.R.drawable.ic_dialog_alert)
         .setMessage(message)