From bb8a2151387148e66bdd0b0ceb5d70d9db84ba69 Mon Sep 17 00:00:00 2001 From: Zhomart Mukhamejanov Date: Thu, 10 May 2018 12:19:16 -0700 Subject: updater_sample: fix UpdateConfig - fix UpdateConfig - fix smaple.json - fix FileDownloaderTest Test: manually Change-Id: I09d272f77c89a02f54a24cf753fdfda4ce243927 Signed-off-by: Zhomart Mukhamejanov --- updater_sample/res/raw/sample.json | 2 +- .../src/com/example/android/systemupdatersample/UpdateConfig.java | 8 ++++++-- .../android/systemupdatersample/util/FileDownloaderTest.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/updater_sample/res/raw/sample.json b/updater_sample/res/raw/sample.json index 7ac8ffab7..46fbfa33e 100644 --- a/updater_sample/res/raw/sample.json +++ b/updater_sample/res/raw/sample.json @@ -1,7 +1,7 @@ { "__name": "name will be visible on UI", "__url": "https:// or file:// uri to update package (zip, xz, ...)", - "__type": "NON_STREAMING (from a local file) OR STREAMING (on the fly)", + "__ab_install_type": "NON_STREAMING (from a local file) OR STREAMING (on the fly)", "name": "SAMPLE-cake-release BUILD-12345", "url": "http://foo.bar/builds/ota-001.zip", "ab_install_type": "NON_STREAMING", diff --git a/updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java b/updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java index b08bfd0f6..9bdd8b9e8 100644 --- a/updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java +++ b/updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java @@ -79,9 +79,13 @@ public class UpdateConfig implements Parcelable { p.getLong("offset"), p.getLong("size")); } + String authorization = null; + if (meta.has("authorization")) { + authorization = meta.getString("authorization"); + } c.mAbStreamingMetadata = new StreamingMetadata( propertyFiles, - meta.getString("authorization_token")); + authorization); } c.mRawJson = json; return c; @@ -196,7 +200,7 @@ public class UpdateConfig implements Parcelable { } public Optional getAuthorization() { - return Optional.of(mAuthorization); + return mAuthorization == null ? Optional.empty() : Optional.of(mAuthorization); } } diff --git a/updater_sample/tests/src/com/example/android/systemupdatersample/util/FileDownloaderTest.java b/updater_sample/tests/src/com/example/android/systemupdatersample/util/FileDownloaderTest.java index 009610e86..a136ff0ed 100644 --- a/updater_sample/tests/src/com/example/android/systemupdatersample/util/FileDownloaderTest.java +++ b/updater_sample/tests/src/com/example/android/systemupdatersample/util/FileDownloaderTest.java @@ -16,7 +16,7 @@ package com.example.android.systemupdatersample.util; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import android.content.Context; import android.support.test.InstrumentationRegistry; -- cgit v1.2.3