Allow dynamic patches without a patch number. (flutter#7309)

Unique patch numbers are mainly useful for canary and A-B testing, but otherwise complicate things and can now be omitted. Also, always append .zip to patch download URL. This obviates the need to configure redirects on the server when not using patch numbers.
amirh · Dec 27, 2018 · 732ea76 · 732ea76
1 parent 20ee4e3
commit 732ea76
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/shell/platform/android/io/flutter/view/ResourceExtractor.java b/shell/platform/android/io/flutter/view/ResourceExtractor.java
@@ -218,19 +218,17 @@ private String checkTimestamp(File dataDir, JSONObject updateManifest) {
                 String buildNumber = updateManifest.optString("buildNumber", null);
                 if (buildNumber == null) {
                     Log.w(TAG, "Invalid update manifest: buildNumber");
-                }
-
-                String patchNumber = updateManifest.optString("patchNumber", null);
-                if (patchNumber == null) {
-                    Log.w(TAG, "Invalid update manifest: patchNumber");
-                }
-
-                if (buildNumber != null && patchNumber != null) {
-                  if (!buildNumber.equals(Long.toString(getVersionCode(packageInfo)))) {
+                } else {
+                    String patchNumber = updateManifest.optString("patchNumber", null);
+                    if (!buildNumber.equals(Long.toString(getVersionCode(packageInfo)))) {
                         Log.w(TAG, "Outdated update file for " + getVersionCode(packageInfo));
                     } else {
                         final File updateFile = new File(FlutterMain.getUpdateInstallationPath());
-                        expectedTimestamp += "-" + patchNumber + "-" + updateFile.lastModified();
+                        if (patchNumber != null) {
+                            expectedTimestamp += "-" + patchNumber + "-" + updateFile.lastModified();
+                        } else {
+                            expectedTimestamp += "-" + updateFile.lastModified();
+                        }
                     }
                 }
             }

diff --git a/shell/platform/android/io/flutter/view/ResourceUpdater.java b/shell/platform/android/io/flutter/view/ResourceUpdater.java
@@ -126,7 +126,7 @@ public String buildUpdateDownloadURL() {
 
         URI uri;
         try {
-            uri = new URI(metaData.getString("UpdateServerURL") + "/" + getAPKVersion());
+            uri = new URI(metaData.getString("UpdateServerURL") + "/" + getAPKVersion() + ".zip");
 
         } catch (URISyntaxException e) {
             Log.w(TAG, "Invalid AndroidManifest.xml UpdateServerURL: " + e.getMessage());