Merge pull request google#159 from matthewsibigtroth/lengthen_short_urls

reinstated lengthened url in the edit urls card
nazroll · Nov 2, 2014 · f4c634a · f4c634a
2 parents 888dadf + 88938de
commit f4c634a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/BeaconConfigFragment.java b/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/BeaconConfigFragment.java
@@ -202,13 +202,17 @@ public void onBeaconConfigReadUrlComplete(byte[] scanRecord, int status) {
       Log.e(TAG, "onUriBeaconRead - error " + status);
     } else {
       UriBeacon uriBeacon = UriBeacon.parseFromBytes(scanRecord);
-      final String url = (uriBeacon != null) ? uriBeacon.getUriString() : "";
+      String url = (uriBeacon != null) ? uriBeacon.getUriString() : "";
       Log.d(TAG, "onReadUrlComplete" + "  url:  " + url);
+      if (UrlShortener.isShortUrl(url)) {
+        url = UrlShortener.lengthenShortUrl(url);
+      }
+      final String urlToDisplay = url;
       getActivity().runOnUiThread(new Runnable() {
         @Override
         public void run() {
           // Update the url edit text field with the given url
-          mEditCardUrl.setText(url);
+          mEditCardUrl.setText(urlToDisplay);
           // Show the beacon configuration card
           showConfigurableBeaconCard();
         }

diff --git a/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/UrlShortener.java b/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/UrlShortener.java
@@ -47,6 +47,7 @@ class UrlShortener {
    * @param longUrl The url that will be shortened
    * @return The short url for the given longUrl
    */
+  // TODO: make sure this network operation is off the ui thread
   public static String shortenUrl(String longUrl) {
     String shortUrl = null;
     try {
@@ -112,6 +113,7 @@ public static boolean isShortUrl(String url) {
    * @param shortUrl The short url that will be lengthened
    * @return The lengthened url for the given short url
    */
+  // TODO: make sure this network operation is off the ui thread
   public static String lengthenShortUrl(String shortUrl) {
     String longUrl = null;
     try {