SyncProtocol_3.java in rhodes-3.1.0.beta.1

- old
+ new

@@ -1,5 +1,31 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rho.sync;
 
 import com.rho.RhoConf;
 import com.rho.FilePath;
 
@@ -20,11 +46,11 @@
         return RhoConf.getInstance().getPath("syncserver") + "clientlogin";
     }
 
     public String getLoginBody( String name, String password)
     {
-        return "{\"login\":\"" + name + "\",\"password\":\"" + password + "\",\"remember_me\":1}";
+        return "{\"login\":" + JSONEntry.quoteValue(name) + ",\"password\":" + JSONEntry.quoteValue(password) + ",\"remember_me\":1}";
     }
 
     public String getClientCreateUrl()
     {
         return RhoConf.getInstance().getPath("syncserver") + "clientcreate";
@@ -35,13 +61,13 @@
         return RhoConf.getInstance().getPath("syncserver") + "clientregister";
     }
 
     public String getClientRegisterBody( String strClientID, String strPin, int nPort, String strType )
     {
-        return "{\"client_id\":\"" + strClientID +
-        	"\",\"device_pin\":\"" + strPin +
-            "\",\"device_port\":\"" + nPort +
-            "\",\"device_type\":\"" + strType + "\"}";
+        return "{\"client_id\":" + JSONEntry.quoteValue(strClientID) +
+        	",\"device_pin\":" + JSONEntry.quoteValue(strPin) +
+            ",\"device_port\":\"" + nPort +
+            "\",\"device_type\":" + JSONEntry.quoteValue(strType) + "}";
     }
 
     public String getClientResetUrl(String strClientID)
     {
         return RhoConf.getInstance().getPath("syncserver") + "clientreset?client_id=" + strClientID;