From 8eea0f6c3428c1b5b87da3869e48932f8e2a7b4d Mon Sep 17 00:00:00 2001 From: AJ Jordan Date: Thu, 21 Mar 2019 13:18:08 -0400 Subject: [PATCH] Mention F-Droid in index file fetch error string The problem here is that oftentimes, the index fetch will happen automatically in the background while the user is in a different app. If the fetch fails, the warning text changed here is displayed as a toast, but without this change there's no way to tell that it's coming from F-Droid. --- app/src/main/java/org/fdroid/fdroid/IndexUpdater.java | 2 +- app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java b/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java index 2b70965b4..d4ad76cc1 100644 --- a/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java +++ b/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java @@ -142,7 +142,7 @@ public class IndexUpdater { } } - throw new UpdateException("Error getting index file", e); + throw new UpdateException("Error getting F-Droid index file", e); } catch (InterruptedException e) { // ignored if canceled, the local database just won't be updated e.printStackTrace(); diff --git a/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java b/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java index 82a00247f..518b23016 100644 --- a/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java +++ b/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java @@ -176,7 +176,7 @@ public class IndexV1Updater extends IndexUpdater { if (downloader != null) { FileUtils.deleteQuietly(downloader.outputFile); } - throw new IndexUpdater.UpdateException("Error getting index file", e2); + throw new IndexUpdater.UpdateException("Error getting F-Droid index file", e2); } catch (InterruptedException e2) { // ignored if canceled, the local database just won't be updated } @@ -185,7 +185,7 @@ public class IndexV1Updater extends IndexUpdater { if (downloader != null) { FileUtils.deleteQuietly(downloader.outputFile); } - throw new IndexUpdater.UpdateException("Error getting index file", e); + throw new IndexUpdater.UpdateException("Error getting F-Droid index file", e); } catch (InterruptedException e) { // ignored if canceled, the local database just won't be updated }