From d38058497ec88020d401e00ca3eff8121e63c52f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 29 Mar 2016 11:52:17 +0200
Subject: [PATCH] move ApkDownloader.EXTRA_URL to Intent.setDataString()

This is part of the move to standardizing all internal broadcasts to use
the Intent's Uri field as the standard place for a download URL, and then
using that in IntentFilters to do matching.
---
 app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java    | 4 ++--
 .../main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java
index 0fa6811b6..a8c76093c 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java
@@ -22,6 +22,7 @@ package org.fdroid.fdroid.net;
 
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
@@ -54,7 +55,6 @@ public class ApkDownloader implements AsyncDownloader.Listener {
     public static final String EVENT_ERROR = "apkDownloadError";
 
     public static final String ACTION_STATUS = "apkDownloadStatus";
-    public static final String EXTRA_URL = "apkDownloadUrl";
 
     public static final int ERROR_HASH_MISMATCH = 101;
 
@@ -224,8 +224,8 @@ public class ApkDownloader implements AsyncDownloader.Listener {
         }
 
         Intent intent = new Intent(ACTION_STATUS);
+        intent.setData(Uri.parse(Utils.getApkUrl(repoAddress, curApk)));
         intent.putExtras(event.getData());
-        intent.putExtra(EXTRA_URL, Utils.getApkUrl(repoAddress, curApk));
         LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
     }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
index 664884a20..b13f4f1e5 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
@@ -278,7 +278,7 @@ public class SwapAppsView extends ListView implements
                     // once for each ViewHolder in order to get the repository address for the
                     // apkToInstall. This way, we can wait until we receive an incoming intent (if
                     // at all) and then lazily load the apk to install.
-                    String broadcastUrl = intent.getStringExtra(ApkDownloader.EXTRA_URL);
+                    String broadcastUrl = intent.getDataString();
                     if (TextUtils.equals(Utils.getApkUrl(apk.repoAddress, apk), broadcastUrl)) {
                         resetView();
                     }