Fix latest version due to recent website changes

Author: javiersantos

app/src/main/java/com/javiersantos/whatsappbetaupdater/Config.java

@@ -6,7 +6,10 @@ public class Config {
     public static final String GITHUB_TAGS = GITHUB_URL.concat("/tags");
     public static final String GITHUB_APK = GITHUB_URL.concat("/releases/download/");
     public static final String WHATSAPP_URL = "http://www.whatsapp.com/android/";
+    public static final String WHATSAPP_URL_CDN = "https://www.cdn.whatsapp.net/android/";
     public static final String WHATSAPP_APK = WHATSAPP_URL.concat("current/WhatsApp.apk");
     public static final String PAYPAL_DONATION = "[email protected]";
 
+    public static final String PATTERN_LATEST_VERSION = "<a class=\"button\" href=\"";
+
 }

app/src/main/java/com/javiersantos/whatsappbetaupdater/util/UtilsApp.java

@@ -4,6 +4,7 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.SystemClock;
 
 import com.javiersantos.whatsappbetaupdater.Config;
@@ -93,4 +94,19 @@ private static Integer getHoursToMilliseconds(Integer hours) {
         return hours * 60 * 60 * 1000;
     }
 
+    public static String getVersionFromString(String s) {
+        String res = "0.0.0.0";
+
+        Uri uri = Uri.parse(s);
+        String withoutHost = uri.getPath();
+        String[] split = withoutHost.split("/");
+        String version = split[2];
+
+        if (!version.equals("current")) {
+            res = version;
+        }
+
+        return res;
+    }
+
 }

app/src/main/java/com/javiersantos/whatsappbetaupdater/util/UtilsAsync.java

@@ -314,15 +314,17 @@ public static String getLatestWhatsAppVersion() {
 
         try {
             HttpClient client = new DefaultHttpClient();
-            HttpGet request = new HttpGet(Config.WHATSAPP_URL);
+            HttpGet request = new HttpGet(Config.WHATSAPP_URL_CDN);
             HttpResponse response = client.execute(request);
 
             InputStream in = response.getEntity().getContent();
             BufferedReader reader = new BufferedReader(new InputStreamReader(in));
             StringBuilder str = new StringBuilder();
             String line;
             while((line = reader.readLine()) != null) {
-                str.append(line);
+                if (line.contains(Config.PATTERN_LATEST_VERSION)) {
+                    str.append(line);
+                }
             }
 
             in.close();
@@ -332,18 +334,10 @@ public static String getLatestWhatsAppVersion() {
             e.printStackTrace();
         }
 
-        String[] split = source.split(">");
-        int i = 0;
-        while (i < split.length) {
-            if (split[i].startsWith("Version")) {
-                split = split[i].split("( )|(<)");
-                res = split[1].trim();
-                break;
-            }
-            i++;
-        }
+        String[] split = source.split(Config.PATTERN_LATEST_VERSION);
+        String urlWithVersion = split[1].split("\"")[0];
 
-        return res;
+        return UtilsApp.getVersionFromString(urlWithVersion);
     }
 
     public static String getLatestAppVersion() {