Changed the ChartServer and Search Book Contents URLs back to google.com instead...

git-svn-id: http://zxing.googlecode.com/svn/trunk@687 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/src/com/google/zxing/client/android/QRCodeEncoder.java b/android/src/com/google/zxing/client/android/QRCodeEncoder.java
index 47a4bb6..141e84e 100755 (executable)
--- a/android/src/com/google/zxing/client/android/QRCodeEncoder.java
+++ b/android/src/com/google/zxing/client/android/QRCodeEncoder.java
@@ -35,8 +35,9 @@ import java.net.URLEncoder;
 public final class QRCodeEncoder {
 
   private static final String TAG = "QRCodeEncoder";
-  private static final String CHART_SERVER_URL = 
-      "//chart.apis.google." + LocaleManager.getCountryTLD() + "/chart?cht=qr&chs=";
+
+  // Since this is an API call rather than a website, we don't use LocaleManager to change the TLD.
+  private static final String CHART_SERVER_URL = "//chart.apis.google.com/chart?cht=qr&chs=";
 
   private final Activity mActivity;
   private String mContents;

diff --git a/android/src/com/google/zxing/client/android/SearchBookContentsActivity.java b/android/src/com/google/zxing/client/android/SearchBookContentsActivity.java
index 6ef73b9..22debd6 100644 (file)
--- a/android/src/com/google/zxing/client/android/SearchBookContentsActivity.java
+++ b/android/src/com/google/zxing/client/android/SearchBookContentsActivity.java
@@ -53,8 +53,9 @@ public final class SearchBookContentsActivity extends Activity {
   private static final String TAG = "SearchBookContents";
 
   // These return a JSON result which describes if and where the query was found. This API may
-  // break or disappear at any time in the future.
-  private static final String BOOK_SEARCH_URL = "//www.google." + LocaleManager.getCountryTLD() + "/books?vid=isbn";
+  // break or disappear at any time in the future. Since this is an API call rather than a website,
+  // we don't use LocaleManager to change the TLD.
+  private static final String BOOK_SEARCH_URL = "//www.google.com/books?vid=isbn";
   private static final String BOOK_SEARCH_COMMAND = "&jscmd=SearchWithinVolume2&q=";
 
   private NetworkThread mNetworkThread;