From 59a533234e0744d52117e2d94b2368d210d61782 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Mon, 16 May 2016 23:45:17 +1000 Subject: [PATCH] Revert "Fixed Cursor initialization deprecation" This reverts commit df9954ba0b927183d8fa4765e51f5b0033ff6168. The revert is to fix #606 for the 0.100 stable release. --- .../org/fdroid/fdroid/views/AppListAdapter.java | 1 - .../fdroid/views/AvailableAppListAdapter.java | 12 ++---------- .../fdroid/views/CanUpdateAppListAdapter.java | 12 ++---------- .../fdroid/views/InstalledAppListAdapter.java | 12 ++---------- .../fdroid/fdroid/views/ManageReposActivity.java | 2 +- .../java/org/fdroid/fdroid/views/RepoAdapter.java | 13 ++----------- .../views/fragments/AvailableAppsFragment.java | 2 +- .../views/fragments/CanUpdateAppsFragment.java | 2 +- .../views/fragments/InstalledAppsFragment.java | 2 +- 9 files changed, 12 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java index a1f222dc0..e57dcaabb 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java @@ -22,7 +22,6 @@ public abstract class AppListAdapter extends CursorAdapter { private DisplayImageOptions displayImageOptions; private String upgradeFromTo; - @SuppressWarnings("deprecation") public AppListAdapter(Context context, Cursor c) { super(context, c); init(context); diff --git a/app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java index e39f67ee1..0a1b8e5f8 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java @@ -2,18 +2,10 @@ package org.fdroid.fdroid.views; import android.content.Context; import android.database.Cursor; -import android.os.Build; public class AvailableAppListAdapter extends AppListAdapter { - public static AvailableAppListAdapter create(Context context, Cursor cursor, int flags) { - if (Build.VERSION.SDK_INT >= 11) { - return new AvailableAppListAdapter(context, cursor, flags); - } - return new AvailableAppListAdapter(context, cursor); - } - - private AvailableAppListAdapter(Context context, Cursor c) { + public AvailableAppListAdapter(Context context, Cursor c) { super(context, c); } @@ -21,7 +13,7 @@ public class AvailableAppListAdapter extends AppListAdapter { super(context, c, autoRequery); } - private AvailableAppListAdapter(Context context, Cursor c, int flags) { + public AvailableAppListAdapter(Context context, Cursor c, int flags) { super(context, c, flags); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java index 9578370aa..5d5034e0c 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java @@ -2,18 +2,10 @@ package org.fdroid.fdroid.views; import android.content.Context; import android.database.Cursor; -import android.os.Build; public class CanUpdateAppListAdapter extends AppListAdapter { - public static CanUpdateAppListAdapter create(Context context, Cursor cursor, int flags) { - if (Build.VERSION.SDK_INT >= 11) { - return new CanUpdateAppListAdapter(context, cursor, flags); - } - return new CanUpdateAppListAdapter(context, cursor); - } - - private CanUpdateAppListAdapter(Context context, Cursor c) { + public CanUpdateAppListAdapter(Context context, Cursor c) { super(context, c); } @@ -21,7 +13,7 @@ public class CanUpdateAppListAdapter extends AppListAdapter { super(context, c, autoRequery); } - private CanUpdateAppListAdapter(Context context, Cursor c, int flags) { + public CanUpdateAppListAdapter(Context context, Cursor c, int flags) { super(context, c, flags); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java index 4c97ecc9e..1224458fc 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java @@ -2,18 +2,10 @@ package org.fdroid.fdroid.views; import android.content.Context; import android.database.Cursor; -import android.os.Build; public class InstalledAppListAdapter extends AppListAdapter { - public static InstalledAppListAdapter create(Context context, Cursor cursor, int flags) { - if (Build.VERSION.SDK_INT >= 11) { - return new InstalledAppListAdapter(context, cursor, flags); - } - return new InstalledAppListAdapter(context, cursor); - } - - private InstalledAppListAdapter(Context context, Cursor c) { + public InstalledAppListAdapter(Context context, Cursor c) { super(context, c); } @@ -21,7 +13,7 @@ public class InstalledAppListAdapter extends AppListAdapter { super(context, c, autoRequery); } - private InstalledAppListAdapter(Context context, Cursor c, int flags) { + public InstalledAppListAdapter(Context context, Cursor c, int flags) { super(context, c, flags); } 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 f5ec59b13..c7d42cec6 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java @@ -767,7 +767,7 @@ public class ManageReposActivity extends ActionBarActivity { setRetainInstance(true); setHasOptionsMenu(true); - repoAdapter = RepoAdapter.create(getActivity(), null, 0); + repoAdapter = new RepoAdapter(getActivity(), null); repoAdapter.setEnabledListener(this); setListAdapter(repoAdapter); } 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 fbb139c01..6e171a876 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java @@ -2,7 +2,6 @@ package org.fdroid.fdroid.views; import android.content.Context; import android.database.Cursor; -import android.os.Build; import android.support.v4.widget.CursorAdapter; import android.view.LayoutInflater; import android.view.View; @@ -23,14 +22,7 @@ public class RepoAdapter extends CursorAdapter { private EnabledListener enabledListener; - public static RepoAdapter create(Context context, Cursor cursor, int flags) { - if (Build.VERSION.SDK_INT >= 11) { - return new RepoAdapter(context, cursor, flags); - } - return new RepoAdapter(context, cursor); - } - - private RepoAdapter(Context context, Cursor c, int flags) { + public RepoAdapter(Context context, Cursor c, int flags) { super(context, c, flags); inflater = LayoutInflater.from(context); } @@ -40,8 +32,7 @@ public class RepoAdapter extends CursorAdapter { inflater = LayoutInflater.from(context); } - @SuppressWarnings("deprecation") - private RepoAdapter(Context context, Cursor c) { + public RepoAdapter(Context context, Cursor c) { super(context, c); inflater = LayoutInflater.from(context); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java index b0bb69e0a..c75ba46f6 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java @@ -59,7 +59,7 @@ public class AvailableAppsFragment extends AppListFragment implements @Override protected AppListAdapter getAppListAdapter() { if (adapter == null) { - final AppListAdapter a = AvailableAppListAdapter.create(getActivity(), null, 0); + final AppListAdapter a = new AvailableAppListAdapter(getActivity(), null); Preferences.get().registerUpdateHistoryListener(new Preferences.ChangeListener() { @Override public void onPreferenceChange() { diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java index 093f5a83f..1267499b8 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java @@ -15,7 +15,7 @@ public class CanUpdateAppsFragment extends AppListFragment { @Override protected AppListAdapter getAppListAdapter() { - return CanUpdateAppListAdapter.create(getActivity(), null, 0); + return new CanUpdateAppListAdapter(getActivity(), null); } @Override diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java index 8c752c3a7..b67140e4d 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java @@ -15,7 +15,7 @@ public class InstalledAppsFragment extends AppListFragment { @Override protected AppListAdapter getAppListAdapter() { - return InstalledAppListAdapter.create(getActivity(), null, 0); + return new InstalledAppListAdapter(getActivity(), null); } @Override