From 75d13d60ae7a14ca9aaa201561d3ea8c6ac7f86f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Sat, 2 Sep 2017 22:29:32 +0200
Subject: [PATCH] move swap webpage's F-Droid.apk link so it doesn't get
cleaned up
This is because of the previous commit.
---
.../java/org/fdroid/fdroid/localrepo/LocalRepoManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java
index e7be8e674..5e6f3736f 100644
--- a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java
+++ b/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java
@@ -127,10 +127,10 @@ public final class LocalRepoManager {
try {
appInfo = pm.getApplicationInfo(fdroidPackageName, PackageManager.GET_META_DATA);
SanitizedFile apkFile = SanitizedFile.knownSanitized(appInfo.publicSourceDir);
- SanitizedFile fdroidApkLink = new SanitizedFile(webRoot, "fdroid.client.apk");
+ SanitizedFile fdroidApkLink = new SanitizedFile(fdroidDir, "F-Droid.apk");
attemptToDelete(fdroidApkLink);
if (Utils.symlinkOrCopyFileQuietly(apkFile, fdroidApkLink)) {
- fdroidClientURL = "/" + fdroidApkLink.getName();
+ fdroidClientURL = "/" + fdroidDir.getName() + "/" + fdroidApkLink.getName();
}
} catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "Could not set up F-Droid apk in the webroot", e);