From 7321523a31d22c562ab5fd909698a1b9eecd57fb Mon Sep 17 00:00:00 2001
From: "burke.davey" <burke.davey@dad15e60-07c4-0504-eb71-dc8a1c21358d>
Date: Sun, 12 Sep 2010 21:56:41 +0000
Subject: [PATCH] Refactoring and disabling phone-to-chrome until 2.2

---
 android/AndroidManifest.xml                                | 4 +++-
 .../com/google/android/apps/chrometophone/ShareLink.java   | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 51a9a30..3eec50e 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -33,6 +33,7 @@
                   android:screenOrientation="portrait">
         </activity>
         
+        <!-- TODO: Enable for v2.2
         <activity android:name=".ShareLinkActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -40,7 +41,8 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
-       
+        -->
+        
         <!-- In order to use the c2dm library, an
              application must declare a class with the name C2DMReceiver, in its 
              own package, extending com.google.android.c2dm.C2DMBaseReceiver
diff --git a/android/src/com/google/android/apps/chrometophone/ShareLink.java b/android/src/com/google/android/apps/chrometophone/ShareLink.java
index a7a6cd9..7a1329c 100644
--- a/android/src/com/google/android/apps/chrometophone/ShareLink.java
+++ b/android/src/com/google/android/apps/chrometophone/ShareLink.java
@@ -33,7 +33,7 @@ import android.widget.Toast;
 
 public class ShareLink implements Handler.Callback {
     private static final String TOAST = "toast";
-    private static final String BROWSER_CHANNEL_PATH = "/browserchannel";
+    private static final String SEND_PATH = "/send";
     private static ShareLink mInstance;
     private final Handler mHandler;
     private final Context mContext;
@@ -56,12 +56,13 @@ public class ShareLink implements Handler.Callback {
                 sendToast(mContext.getString(R.string.sending_link_toast));
                 try {
                     List<NameValuePair> params = new ArrayList<NameValuePair>();
-                    params.add(new BasicNameValuePair("data", URLEncoder.encode(link)));
+                    params.add(new BasicNameValuePair("url", URLEncoder.encode(link)));
+                    params.add(new BasicNameValuePair("deviceType", "chrome"));
                     SharedPreferences settings = Prefs.get(mContext);
                     final String accountName = settings.getString("accountName", null);
 
                     AppEngineClient client = new AppEngineClient(mContext, accountName);
-                    HttpResponse res = client.makeRequest(BROWSER_CHANNEL_PATH, params);
+                    HttpResponse res = client.makeRequest(SEND_PATH, params);
                     if (res.getStatusLine().getStatusCode() == 200) {
                         sendToast(mContext.getString(R.string.link_sent_toast));
                     } else {