| commit | f55b296cf8edd9024d5a231e83d5cc93528844f8 | [log] [tgz] |
|---|---|---|
| author | Dirk Vogt <dirk@fairphone.com> | Mon Mar 06 13:53:30 2017 +0100 |
| committer | Dirk Vogt <dirk@fairphone.com> | Mon Mar 06 13:53:30 2017 +0100 |
| tree | 3e2c873e9d348bae7a59dcbdbcbc8f9b430c79ff | |
| parent | ef9e2d42715d4c51a33090d8ddc42dd7af60f21c [diff] | |
| parent | 65126172a3f3fbfa14fb587befa0f0fe7f303fa8 [diff] |
Merge branch 'UPD-49' into 'master' Filename in cache missing unique ID See merge request !44
diff --git a/app/src/main/java/com/fairphone/updater/data/Version.java b/app/src/main/java/com/fairphone/updater/data/Version.java index e861f31..0939e71 100644 --- a/app/src/main/java/com/fairphone/updater/data/Version.java +++ b/app/src/main/java/com/fairphone/updater/data/Version.java
@@ -45,6 +45,8 @@ private final List<Integer> mDependencies; + public static final String ZIP_INSTALL_VERSION = "999"; + private String mBasebandVersion; public Version()
diff --git a/app/src/main/java/com/fairphone/updater/fragments/DownloadAndRestartFragment.java b/app/src/main/java/com/fairphone/updater/fragments/DownloadAndRestartFragment.java index 592222a..9c55136 100644 --- a/app/src/main/java/com/fairphone/updater/fragments/DownloadAndRestartFragment.java +++ b/app/src/main/java/com/fairphone/updater/fragments/DownloadAndRestartFragment.java
@@ -120,7 +120,7 @@ version = new Version(); version.setName(resources.getString(R.string.install) + " " + zipName); version.setDownloadLink(mainActivity.getZipFilePath()); - version.setId(null); + version.setId(Version.ZIP_INSTALL_VERSION); } else { version = mainActivity.getSelectedVersion();
diff --git a/app/src/main/java/com/fairphone/updater/tools/Utils.java b/app/src/main/java/com/fairphone/updater/tools/Utils.java index ab569a2..1a13404 100644 --- a/app/src/main/java/com/fairphone/updater/tools/Utils.java +++ b/app/src/main/java/com/fairphone/updater/tools/Utils.java
@@ -330,6 +330,7 @@ if (item != null) { filename.append(type); + filename.append(item.getId()); } filename.append(".zip"); return filename;