Merge pull request #1133 from crankycoder/features/i-hate-master

1132 - Changed the Updater to stop looking in master branch.

Author: crankycoder

android/src/main/java/org/mozilla/mozstumbler/client/Updater.java

@@ -17,16 +17,19 @@
 import org.mozilla.mozstumbler.R;
 import org.mozilla.mozstumbler.service.AppGlobals;
 import org.mozilla.mozstumbler.service.core.http.IHttpUtil;
+import org.mozilla.mozstumbler.service.core.http.IResponse;
 import org.mozilla.mozstumbler.service.utils.NetworkInfo;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
+import java.util.Map;
 
 public class Updater {
     private static final String LOG_TAG = AppGlobals.LOG_PREFIX + Updater.class.getSimpleName();
-    private static final String VERSION_URL = "https://raw.github.com/mozilla/MozStumbler/master/VERSION";
+    private static final String LATEST_URL = "https://github.com/mozilla/MozStumbler/releases/latest";
     private static final String APK_URL_FORMAT = "https://github.com/mozilla/MozStumbler/releases/download/v%s/MozStumbler-v%s.apk";
     private final IHttpUtil httpClient;
 
@@ -51,20 +54,24 @@ public boolean checkForUpdates(final Activity activity, String api_key) {
             return false;
         }
 
-        new AsyncTask<Void, Void, String>() {
+        new AsyncTask<Void, Void, IResponse>() {
             @Override
-            public String doInBackground(Void... params) {
-                try {
-                    return  httpClient.getUrlAsString(VERSION_URL);
-                } catch (IOException ioEx) {
-                    Log.e(LOG_TAG, "", ioEx);
-                    return null;
-                }
-
+            public IResponse doInBackground(Void... params) {
+                return httpClient.head(LATEST_URL, null);
             }
 
             @Override
-            public void onPostExecute(String latestVersion) {
+            public void onPostExecute(IResponse response) {
+                if (response == null) {
+                    return;
+                }
+                Map<String, List<String>> headers = response.getHeaders();
+                Log.i(LOG_TAG, "Got headers: "+ headers.toString());
+                String locationUrl = headers.get("Location").get(0);
+                String[] parts = locationUrl.split("/");
+                String tag = parts[parts.length-1];
+                String latestVersion = tag.substring(1); // strip the 'v' from the beginning
+
                 String installedVersion = PackageUtils.getAppVersion(activity);
 
                 Log.d(LOG_TAG, "Installed version: " + installedVersion);

android/src/main/java/org/mozilla/mozstumbler/service/core/http/HTTPResponse.java

@@ -28,17 +28,25 @@ public HTTPResponse(int responseCode, Map<String, List<String>> headerFields, by
         }
     }
 
-    public boolean isErrorCode400BadRequest(){
+    public boolean isErrorCode400BadRequest() {
         return 400 == statusCode;
     }
 
-    public boolean isErrorCode4xx(){
+    public boolean isErrorCode4xx() {
         return statusCode / 100 == 4;
     }
 
+    @Override
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
     @Override
     public String getFirstHeader(String key) {
-        return headers.get(key).get(0);
+        List<String> matches = headers.get(key);
+        if (matches != null) {
+            return matches.get(0);
+        }
+        return null;
     }
 
     public boolean isSuccessCode2XX() {

android/src/main/java/org/mozilla/mozstumbler/service/core/http/HttpUtil.java

@@ -6,6 +6,7 @@
 
 import android.os.Build;
 
+import org.apache.http.protocol.HTTP;
 import org.mozilla.mozstumbler.client.ClientPrefs;
 import org.mozilla.mozstumbler.service.AppGlobals;
 import org.mozilla.mozstumbler.service.core.logging.Log;
@@ -130,6 +131,12 @@ public File getUrlAsFile(URL url, File file) throws IOException {
 
     public IResponse get(String urlString, Map<String, String> headers) {
 
+        String HTTP_METHOD = "GET";
+
+        return getHttpResponse(urlString, headers, HTTP_METHOD);
+    }
+
+    private IResponse getHttpResponse(String urlString, Map<String, String> headers, String HTTP_METHOD) {
         URL url = null;
         HttpURLConnection httpURLConnection = null;
 
@@ -146,15 +153,18 @@ public IResponse get(String urlString, Map<String, String> headers) {
 
         try {
             httpURLConnection = (HttpURLConnection) url.openConnection();
+            if (HTTP_METHOD.toUpperCase().equals("HEAD")) {
+                httpURLConnection.setInstanceFollowRedirects(false);
+            }
             httpURLConnection.setConnectTimeout(5000); // set timeout to 5 seconds
-            httpURLConnection.setRequestMethod("GET");
+
+            httpURLConnection.setRequestMethod(HTTP_METHOD);
             httpURLConnection.setRequestProperty(USER_AGENT_HEADER, userAgent);
         } catch (IOException e) {
             Log.e(LOG_TAG, "Couldn't open a connection: ", e);
             return null;
         }
 
-
         // Workaround for a bug in Android mHttpURLConnection. When the library
         // reuses a stale connection, the connection may fail with an EOFException
         // http://stackoverflow.com/questions/15411213/android-httpsurlconnection-eofexception/17791819#17791819
@@ -180,6 +190,12 @@ public IResponse get(String urlString, Map<String, String> headers) {
         return null;
     }
 
+    @Override
+    public IResponse head(String urlString, Map<String, String> headers) {
+        String HTTP_METHOD = "HEAD";
+        return getHttpResponse(urlString, headers, HTTP_METHOD);
+    }
+
     @Override
     public IResponse post(String urlString, byte[] data, Map<String, String> headers, boolean precompressed) {
 

android/src/main/java/org/mozilla/mozstumbler/service/core/http/IHttpUtil.java

@@ -30,4 +30,6 @@ public interface IHttpUtil {
     IResponse post(String urlString, byte[] data, Map<String, String> headers, boolean precompressed);
 
     IResponse get(String urlString, Map<String, String> headers);
+
+    IResponse head(String latestUrl,  Map<String, String> headers);
 }

android/src/main/java/org/mozilla/mozstumbler/service/core/http/IResponse.java

@@ -6,6 +6,8 @@
 
 package org.mozilla.mozstumbler.service.core.http;
 
+import java.util.List;
+import java.util.Map;
 
 public interface IResponse {
     public int httpResponse();
@@ -18,6 +20,8 @@ public interface IResponse {
     public boolean isSuccessCode2XX();
     public boolean isErrorCode4xx();
 
+    Map<String, List<String>> getHeaders();
+
     public String getFirstHeader(String key);
     public boolean isErrorCode400BadRequest();
 }

android/src/main/java/org/mozilla/mozstumbler/service/core/http/MockHttpUtil.java

@@ -41,6 +41,11 @@ public IResponse get(String urlString, Map<String, String> headers) {
         return null;
     }
 
+    @Override
+    public IResponse head(String latestUrl, Map<String, String> headers) {
+        return null;
+    }
+
     @Override
     public IResponse post(String urlString, byte[] data, Map<String, String> headers, boolean precompressed) {
         return null;