From 3a0d40d86d8a420aebd540ece9ed5fa853c2260f Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 19 Feb 2014 19:53:38 -0500 Subject: [PATCH] remove all unused variables This reduces the number of warnings so that we can see the useful ones! --- src/org/fdroid/fdroid/FDroidApp.java | 7 ------- src/org/fdroid/fdroid/UpdateService.java | 1 - src/org/fdroid/fdroid/data/ApkProvider.java | 2 +- src/org/fdroid/fdroid/data/AppProvider.java | 2 +- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/org/fdroid/fdroid/FDroidApp.java b/src/org/fdroid/fdroid/FDroidApp.java index 13f01829b..c3fa5b717 100644 --- a/src/org/fdroid/fdroid/FDroidApp.java +++ b/src/org/fdroid/fdroid/FDroidApp.java @@ -49,7 +49,6 @@ import com.nostra13.universalimageloader.utils.StorageUtils; import de.duenndns.ssl.MemorizingTrustManager; -import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.AppProvider; import org.thoughtcrime.ssl.pinning.PinningTrustManager; import org.thoughtcrime.ssl.pinning.SystemKeyStore; @@ -124,7 +123,6 @@ public class FDroidApp extends Application { } } - apps = null; invalidApps = new ArrayList(); ctx = getApplicationContext(); UpdateService.schedule(ctx); @@ -187,12 +185,8 @@ public class FDroidApp extends Application { private Context ctx; - // Global list of all known applications. - private List apps; - // Set when something has changed (database or installed apps) so we know // we should invalidate the apps. - private volatile boolean appsAllInvalid = false; private Semaphore appsInvalidLock = new Semaphore(1, false); private List invalidApps; @@ -201,7 +195,6 @@ public class FDroidApp extends Application { public void invalidateAllApps() { try { appsInvalidLock.acquire(); - appsAllInvalid = true; } catch (InterruptedException e) { // Don't care } finally { diff --git a/src/org/fdroid/fdroid/UpdateService.java b/src/org/fdroid/fdroid/UpdateService.java index 7baf088ac..dc3aa0711 100644 --- a/src/org/fdroid/fdroid/UpdateService.java +++ b/src/org/fdroid/fdroid/UpdateService.java @@ -247,7 +247,6 @@ public class UpdateService extends IntentService implements ProgressListener { // Grab some preliminary information, then we can release the // database while we do all the downloading, etc... - int updates = 0; List repos = RepoProvider.Helper.all(this); // Process each repo... diff --git a/src/org/fdroid/fdroid/data/ApkProvider.java b/src/org/fdroid/fdroid/data/ApkProvider.java index 8e7be5ed9..27987908e 100644 --- a/src/org/fdroid/fdroid/data/ApkProvider.java +++ b/src/org/fdroid/fdroid/data/ApkProvider.java @@ -442,7 +442,7 @@ public class ApkProvider extends FDroidProvider { public Uri insert(Uri uri, ContentValues values) { removeRepoFields(values); validateFields(DataColumns.ALL, values); - long id = write().insertOrThrow(getTableName(), null, values); + write().insertOrThrow(getTableName(), null, values); if (!isApplyingBatch()) { getContext().getContentResolver().notifyChange(uri, null); } diff --git a/src/org/fdroid/fdroid/data/AppProvider.java b/src/org/fdroid/fdroid/data/AppProvider.java index c931fa2bd..0ce0b1ac0 100644 --- a/src/org/fdroid/fdroid/data/AppProvider.java +++ b/src/org/fdroid/fdroid/data/AppProvider.java @@ -458,7 +458,7 @@ public class AppProvider extends FDroidProvider { @Override public Uri insert(Uri uri, ContentValues values) { - long id = write().insertOrThrow(getTableName(), null, values); + write().insertOrThrow(getTableName(), null, values); if (!isApplyingBatch()) { getContext().getContentResolver().notifyChange(uri, null); }