Fixed Cursor initialization deprecation

f-droid · Mar 30, 2016 · df9954b · df9954b
1 parent 0473ac7
commit df9954b
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 12 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
@@ -22,6 +22,7 @@ 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
@@ -2,18 +2,27 @@
 
 import android.content.Context;
 import android.database.Cursor;
+import android.os.Build;
 
 public class AvailableAppListAdapter extends AppListAdapter {
 
-    public AvailableAppListAdapter(Context context, Cursor c) {
+    public static AvailableAppListAdapter create(Context context, Cursor cursor, int flags)   {
+        if (Build.VERSION.SDK_INT >= 11) {
+            return new AvailableAppListAdapter(context, cursor, flags);
+        } else {
+            return new AvailableAppListAdapter(context, cursor);
+        }
+    }
+
+    private AvailableAppListAdapter(Context context, Cursor c) {
         super(context, c);
     }
 
     public AvailableAppListAdapter(Context context, Cursor c, boolean autoRequery) {
         super(context, c, autoRequery);
     }
 
-    public AvailableAppListAdapter(Context context, Cursor c, int flags) {
+    private 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
@@ -2,18 +2,27 @@
 
 import android.content.Context;
 import android.database.Cursor;
+import android.os.Build;
 
 public class CanUpdateAppListAdapter extends AppListAdapter {
 
-    public CanUpdateAppListAdapter(Context context, Cursor c) {
+    public static CanUpdateAppListAdapter create(Context context, Cursor cursor, int flags) {
+        if (Build.VERSION.SDK_INT >= 11) {
+            return new CanUpdateAppListAdapter(context, cursor, flags);
+        } else {
+            return new CanUpdateAppListAdapter(context, cursor);
+        }
+    }
+
+    private CanUpdateAppListAdapter(Context context, Cursor c) {
         super(context, c);
     }
 
     public CanUpdateAppListAdapter(Context context, Cursor c, boolean autoRequery) {
         super(context, c, autoRequery);
     }
 
-    public CanUpdateAppListAdapter(Context context, Cursor c, int flags) {
+    private 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
@@ -2,18 +2,27 @@
 
 import android.content.Context;
 import android.database.Cursor;
+import android.os.Build;
 
 public class InstalledAppListAdapter extends AppListAdapter {
 
-    public InstalledAppListAdapter(Context context, Cursor c) {
+    public static InstalledAppListAdapter create(Context context, Cursor cursor, int flags)  {
+        if (Build.VERSION.SDK_INT >= 11) {
+            return new InstalledAppListAdapter(context, cursor, flags);
+        } else {
+            return new InstalledAppListAdapter(context, cursor);
+        }
+    }
+
+    private InstalledAppListAdapter(Context context, Cursor c) {
         super(context, c);
     }
 
     public InstalledAppListAdapter(Context context, Cursor c, boolean autoRequery) {
         super(context, c, autoRequery);
     }
 
-    public InstalledAppListAdapter(Context context, Cursor c, int flags) {
+    private 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
@@ -767,7 +767,7 @@ public void onCreate(Bundle savedInstanceState) {
             setRetainInstance(true);
             setHasOptionsMenu(true);
 
-            repoAdapter = new RepoAdapter(getActivity(), null);
+            repoAdapter = RepoAdapter.create(getActivity(), null, 0);
             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
@@ -2,6 +2,7 @@
 
 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;
@@ -22,7 +23,15 @@ public interface EnabledListener {
 
     private EnabledListener enabledListener;
 
-    public RepoAdapter(Context context, Cursor c, int flags) {
+    public static RepoAdapter create(Context context, Cursor cursor, int flags)   {
+        if (Build.VERSION.SDK_INT >= 11) {
+            return new RepoAdapter(context, cursor, flags);
+        } else {
+            return new RepoAdapter(context, cursor);
+        }
+    }
+
+    private RepoAdapter(Context context, Cursor c, int flags) {
         super(context, c, flags);
         inflater = LayoutInflater.from(context);
     }
@@ -32,7 +41,8 @@ public RepoAdapter(Context context, Cursor c, boolean autoRequery) {
         inflater = LayoutInflater.from(context);
     }
 
-    public RepoAdapter(Context context, Cursor c) {
+    @SuppressWarnings("deprecation")
+    private 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
@@ -58,7 +58,7 @@ protected String getFromTitle() {
     @Override
     protected AppListAdapter getAppListAdapter() {
         if (adapter == null) {
-            final AppListAdapter a = new AvailableAppListAdapter(getActivity(), null);
+            final AppListAdapter a = AvailableAppListAdapter.create(getActivity(), null, 0);
             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
@@ -15,7 +15,7 @@ public class CanUpdateAppsFragment extends AppListFragment {
 
     @Override
     protected AppListAdapter getAppListAdapter() {
-        return new CanUpdateAppListAdapter(getActivity(), null);
+        return CanUpdateAppListAdapter.create(getActivity(), null, 0);
     }
 
     @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
@@ -15,7 +15,7 @@ public class InstalledAppsFragment extends AppListFragment {
 
     @Override
     protected AppListAdapter getAppListAdapter() {
-        return new InstalledAppListAdapter(getActivity(), null);
+        return InstalledAppListAdapter.create(getActivity(), null, 0);
     }
 
     @Override