FPII-1905: Fairphone Updater - Stop sending unused URL parameters
Remove unused parameters from outgoing URLs.
Change-Id: Ia777797994b041efd2e637e19c206a448209662d
diff --git a/res/values/config.xml b/res/values/config.xml
index e29ac31..bdc372e 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -10,8 +10,6 @@
<string name="defaultVersionId">1</string>
<string name="defaultVersionName" translatable="false">Almond</string>
<string name="defaultBuildNumber" translatable="false">1.0</string>
- <string name="defaultBuildDate" translatable="false">0</string>
- <string name="defaultAndroidVersionNumber" translatable="false">4.2.2</string>
<string name="defaultImageType" translatable="false">fairphone</string>
<string name="defaultBetaStatus" translatable="false">0</string>
diff --git a/src/com/fairphone/updater/UpdaterService.java b/src/com/fairphone/updater/UpdaterService.java
index 81fd271..629141d 100644
--- a/src/com/fairphone/updater/UpdaterService.java
+++ b/src/com/fairphone/updater/UpdaterService.java
@@ -306,7 +306,7 @@
sb.append(resources.getString(R.string.config_zip));
- addModelAndOS(context, sb);
+ addUrlParameters(context, sb);
String downloadLink = sb.toString();
@@ -315,21 +315,20 @@
return downloadLink;
}
- private static void addModelAndOS(Context context, StringBuilder sb)
+ private static void addUrlParameters(Context context, StringBuilder sb)
{
- // attach the model and the os
sb.append("?");
- sb.append("model=").append(Build.MODEL.replaceAll("\\s", ""));
Version currentVersion = VersionParserHelper.getDeviceVersion(context.getApplicationContext());
- if (currentVersion != null)
- {
+ if (currentVersion != null) {
try {
final String defaultCharset = Charset.defaultCharset().displayName();
- sb.append("&os=").append(URLEncoder.encode(currentVersion.getAndroidVersion(), defaultCharset));
- sb.append("&b_n=").append(URLEncoder.encode(currentVersion.getBuildNumber(), defaultCharset));
+
+ String modelWithoutSpaces = Build.MODEL.replaceAll("\\s", "");
+ if(modelWithoutSpaces.startsWith(context.getResources().getString(R.string.FP1Model))) {
+ sb.append("&b_n=").append(URLEncoder.encode(currentVersion.getBuildNumber(), defaultCharset));
+ }
sb.append("&ota_v_n=").append(URLEncoder.encode(String.valueOf(currentVersion.getId()), defaultCharset));
- sb.append("&d=").append(URLEncoder.encode(currentVersion.getReleaseDate(), defaultCharset));
sb.append("&beta=").append(URLEncoder.encode(currentVersion.getBetaStatus(), defaultCharset));
sb.append("&dev=").append(FairphoneUpdater.DEV_MODE_ENABLED ? "1" : "0");
} catch (UnsupportedEncodingException e) {
diff --git a/src/com/fairphone/updater/data/DownloadableItem.java b/src/com/fairphone/updater/data/DownloadableItem.java
index f631809..05dcf40 100644
--- a/src/com/fairphone/updater/data/DownloadableItem.java
+++ b/src/com/fairphone/updater/data/DownloadableItem.java
@@ -142,11 +142,6 @@
mReleaseDate = releaseDate;
}
- public String getReleaseDate()
- {
- return mReleaseDate;
- }
-
public void setThumbnailLink(String thumbnailImageLink)
{
mThumbnailImageLink = thumbnailImageLink;
diff --git a/src/com/fairphone/updater/data/Version.java b/src/com/fairphone/updater/data/Version.java
index 483fe27..ac0ff34 100644
--- a/src/com/fairphone/updater/data/Version.java
+++ b/src/com/fairphone/updater/data/Version.java
@@ -77,11 +77,6 @@
return mErasePartitionsWarning;
}
- public String getAndroidVersion()
- {
- return mAndroidVersion;
- }
-
public void setAndroidVersion(String mAndroid)
{
this.mAndroidVersion = mAndroid;
diff --git a/src/com/fairphone/updater/data/VersionParserHelper.java b/src/com/fairphone/updater/data/VersionParserHelper.java
index 2df0e43..3bf8d1c 100644
--- a/src/com/fairphone/updater/data/VersionParserHelper.java
+++ b/src/com/fairphone/updater/data/VersionParserHelper.java
@@ -46,9 +46,7 @@
private static final String CURRENT_VERSION_NAME = "fairphone.ota.version.name";
private static final String CURRENT_VERSION_BUILD_NUMBER = "fairphone.ota.build_number";
private static final String CURRENT_BETA_STATUS = "fairphone.ota.beta";
- private static final String CURRENT_ANDROID_VERSION = "fairphone.ota.android_version";
private static final String CURRENT_VERSION_IMAGE_TYPE = "fairphone.ota.image_type";
- private static final String CURRENT_VERSION_BUILD_DATE = "ro.build.date.utc";
private static final String CURRENT_VERSION_ID = "ro.build.version.incremental"; // for FP2
@@ -89,9 +87,7 @@
versionBuilder.setBuildNumber(getSystemData(context, CURRENT_VERSION_BUILD_NUMBER, knownFPDevice));
}
- versionBuilder.setAndroidVersion(getSystemData(context, CURRENT_ANDROID_VERSION, knownFPDevice));
versionBuilder.setImageType(getSystemData(context, CURRENT_VERSION_IMAGE_TYPE, knownFPDevice));
- versionBuilder.setReleaseDate(getSystemData(context, CURRENT_VERSION_BUILD_DATE, knownFPDevice));
versionBuilder.setBetaStatus(getSystemData(context, CURRENT_BETA_STATUS, knownFPDevice));
Version versionData = UpdaterData.getInstance().getVersion(versionBuilder.getImageType(), versionBuilder.getId());
@@ -113,18 +109,12 @@
case CURRENT_VERSION_NAME:
result = Utils.getprop(CURRENT_VERSION_NAME, useDefaults ? context.getResources().getString(R.string.defaultVersionName) : "");
break;
- case CURRENT_ANDROID_VERSION:
- result = Utils.getprop(CURRENT_ANDROID_VERSION, useDefaults ? context.getResources().getString(R.string.defaultAndroidVersionNumber) : "");
- break;
case CURRENT_VERSION_BUILD_NUMBER:
result = Utils.getprop(CURRENT_VERSION_BUILD_NUMBER, useDefaults ? context.getResources().getString(R.string.defaultBuildNumber) : "");
break;
case CURRENT_VERSION_IMAGE_TYPE:
result = Utils.getprop(CURRENT_VERSION_IMAGE_TYPE, useDefaults ? context.getResources().getString(R.string.defaultImageType) : "");
break;
- case CURRENT_VERSION_BUILD_DATE:
- result = Utils.getprop(CURRENT_VERSION_BUILD_DATE, useDefaults ? context.getResources().getString(R.string.defaultBuildDate) : "");
- break;
case CURRENT_BETA_STATUS:
result = Utils.getprop(CURRENT_BETA_STATUS, useDefaults ? context.getResources().getString(R.string.defaultBetaStatus) : "0");
break;
diff --git a/src/com/fairphone/updater/fragments/VersionDetailFragment.java b/src/com/fairphone/updater/fragments/VersionDetailFragment.java
index 0520448..b03a643 100644
--- a/src/com/fairphone/updater/fragments/VersionDetailFragment.java
+++ b/src/com/fairphone/updater/fragments/VersionDetailFragment.java
@@ -295,7 +295,7 @@
Log.w(TAG, "Potentially malformed download link " + download_link + ": " + e.getLocalizedMessage());
}
}
- Request request = createDownloadRequest(download_link + Utils.getModelAndOS(mainActivity), fileName, downloadTitle);
+ Request request = createDownloadRequest(download_link, fileName, downloadTitle);
if (request != null && mDownloadManager != null)
{
//Guarantee that only we have only one download
diff --git a/src/com/fairphone/updater/tools/Utils.java b/src/com/fairphone/updater/tools/Utils.java
index 2036f3d..f766aca 100644
--- a/src/com/fairphone/updater/tools/Utils.java
+++ b/src/com/fairphone/updater/tools/Utils.java
@@ -243,24 +243,6 @@
}
}
- public static String getModelAndOS(Context context)
- {
- StringBuilder sb = new StringBuilder();
-
- // attach the model and the os
- sb.append("?");
- sb.append("model=").append(Build.MODEL.replaceAll("\\s", ""));
- Version currentVersion = VersionParserHelper.getDeviceVersion(context);
-
- if (currentVersion != null)
- {
- sb.append("&");
- sb.append("os=").append(currentVersion.getAndroidVersion());
- }
-
- return sb.toString();
- }
-
public static void copy(File src, File dst) throws IOException {
if (PrivilegeChecker.isPrivilegedApp()) {
copyPrivileged(src, dst);