From cf9a6b851d7ca4307ab604ce7be78419fd5d8089 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 19 Feb 2019 12:49:47 +0100 Subject: [PATCH] RepoAdapter: code cleanup Remove unused code and simplify to only present args that are used. This is remnants from: fdroidclient#490 fdroidclient#606 fdroidclient!295 fdroidclient!242 --- .../fdroid/views/ManageReposActivity.java | 3 +-- .../org/fdroid/fdroid/views/RepoAdapter.java | 20 +++---------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java index d484c2f97..edcedc037 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java @@ -63,7 +63,6 @@ import org.fdroid.fdroid.IndexUpdater; import org.fdroid.fdroid.R; import org.fdroid.fdroid.UpdateService; import org.fdroid.fdroid.Utils; -import org.fdroid.fdroid.compat.CursorAdapterCompat; import org.fdroid.fdroid.data.NewRepoConfig; import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.RepoProvider; @@ -114,7 +113,7 @@ public class ManageReposActivity extends AppCompatActivity getSupportActionBar().setDisplayHomeAsUpEnabled(true); final ListView repoList = (ListView) findViewById(R.id.list); - repoAdapter = RepoAdapter.create(this, null, CursorAdapterCompat.FLAG_AUTO_REQUERY); + repoAdapter = new RepoAdapter(this); repoAdapter.setEnabledListener(this); repoList.setAdapter(repoAdapter); repoList.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java index 9c1a48b7b..af631a623 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.CompoundButton; import android.widget.TextView; import org.fdroid.fdroid.R; +import org.fdroid.fdroid.compat.CursorAdapterCompat; import org.fdroid.fdroid.data.Repo; public class RepoAdapter extends CursorAdapter { @@ -21,23 +22,8 @@ public class RepoAdapter extends CursorAdapter { private EnabledListener enabledListener; - public static RepoAdapter create(Context context, Cursor cursor, int flags) { - return new RepoAdapter(context, cursor, flags); - } - - private RepoAdapter(Context context, Cursor c, int flags) { - super(context, c, flags); - inflater = LayoutInflater.from(context); - } - - public RepoAdapter(Context context, Cursor c, boolean autoRequery) { - super(context, c, autoRequery); - inflater = LayoutInflater.from(context); - } - - @SuppressWarnings("deprecation") - private RepoAdapter(Context context, Cursor c) { - super(context, c); + RepoAdapter(Context context) { + super(context, null, CursorAdapterCompat.FLAG_AUTO_REQUERY); inflater = LayoutInflater.from(context); }