Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'auto-requery-for-adapters' into 'master'

Browse Source 
Ensure `FLAG_AUTO_REQUERY` is used for main app list adapters.

**NOTE: This has a sister MR which is targeting the `stable-v0.100` and thus should *not* be cherry-picked across to that branch.**
 
Although this is deprecated, and will result in queries being run on the main thread, it is required to fix #606. In the future, `LoaderManagers` should be used to address the concerns of querying on the main thread.

See merge request !294
This commit is contained in:
Daniel Martí 2016-05-16 14:54:43 +00:00
commit 97807b8f0a
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/fdroid/fdroid/compat/CursorAdapterCompat.java Normal file
View File

@ -0,0 +1,7 @@
package org.fdroid.fdroid.compat;
public class CursorAdapterCompat {
public static final int FLAG_AUTO_REQUERY = 0x01;
}

3
app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java
View File

@ -60,6 +60,7 @@ import org.fdroid.fdroid.R;
import org.fdroid.fdroid.UpdateService;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.compat.ClipboardCompat;
import org.fdroid.fdroid.compat.CursorAdapterCompat;
import org.fdroid.fdroid.data.NewRepoConfig;
import org.fdroid.fdroid.data.Repo;
import org.fdroid.fdroid.data.RepoProvider;
@ -767,7 +768,7 @@ public class ManageReposActivity extends ActionBarActivity {
setRetainInstance(true);
setHasOptionsMenu(true);
repoAdapter = RepoAdapter.create(getActivity(), null, 0);
repoAdapter = RepoAdapter.create(getActivity(), null, CursorAdapterCompat.FLAG_AUTO_REQUERY);
repoAdapter.setEnabledListener(this);
setListAdapter(repoAdapter);
}

3
app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
View File

@ -24,6 +24,7 @@ import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.compat.ArrayAdapterCompat;
import org.fdroid.fdroid.compat.CursorAdapterCompat;
import org.fdroid.fdroid.compat.PreferencesCompat;
import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.views.AppListAdapter;
@ -59,7 +60,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 = AvailableAppListAdapter.create(getActivity(), null, CursorAdapterCompat.FLAG_AUTO_REQUERY);
Preferences.get().registerUpdateHistoryListener(new Preferences.ChangeListener() {
@Override
public void onPreferenceChange() {

3
app/src/main/java/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
View File

@ -7,6 +7,7 @@ import android.view.View;
import android.view.ViewGroup;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.compat.CursorAdapterCompat;
import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.views.AppListAdapter;
import org.fdroid.fdroid.views.CanUpdateAppListAdapter;
@ -15,7 +16,7 @@ public class CanUpdateAppsFragment extends AppListFragment {
@Override
protected AppListAdapter getAppListAdapter() {
return CanUpdateAppListAdapter.create(getActivity(), null, 0);
return CanUpdateAppListAdapter.create(getActivity(), null, CursorAdapterCompat.FLAG_AUTO_REQUERY);
}
@Override

3
app/src/main/java/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
View File

@ -7,6 +7,7 @@ import android.view.View;
import android.view.ViewGroup;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.compat.CursorAdapterCompat;
import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.views.AppListAdapter;
import org.fdroid.fdroid.views.InstalledAppListAdapter;
@ -15,7 +16,7 @@ public class InstalledAppsFragment extends AppListFragment {
@Override
protected AppListAdapter getAppListAdapter() {
return InstalledAppListAdapter.create(getActivity(), null, 0);
return InstalledAppListAdapter.create(getActivity(), null, CursorAdapterCompat.FLAG_AUTO_REQUERY);
}
@Override