mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-02-06 14:44:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't search nsfw users when nsfw is off.

Browse Source
This commit is contained in:
Alex Ning 2020-09-30 23:15:32 +08:00
parent 773c82a2b7
commit 13bed5d234
6 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ml/docilealligator/infinityforreddit/API/RedditAPI.java
View File

@ -128,9 +128,9 @@ public interface RedditAPI {
@Query("sort") String sort, @Query("include_over_18") int nsfw, @Query("sort") String sort, @Query("include_over_18") int nsfw,
@HeaderMap Map<String, String> headers); @HeaderMap Map<String, String> headers);
@GET("search.json?include_over_18=1&raw_json=1&type=user") @GET("search.json?raw_json=1&type=user")
Call<String> searchUsers(@Query("q") String profileName, @Query("after") String after, Call<String> searchUsers(@Query("q") String profileName, @Query("after") String after,
@Query("sort") String sort); @Query("sort") String sort, @Query("include_over_18") int nsfw);
@GET("search.json?include_over_18=1&raw_json=1&type=link") @GET("search.json?include_over_18=1&raw_json=1&type=link")
Call<String> searchPostsOauth(@Query("q") String query, @Query("after") String after, Call<String> searchPostsOauth(@Query("q") String query, @Query("after") String after,

14
app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/UserListingFragment.java
View File

@ -80,6 +80,9 @@ public class UserListingFragment extends Fragment implements FragmentCommunicato
@Named("sort_type") @Named("sort_type")
SharedPreferences mSortTypeSharedPreferences; SharedPreferences mSortTypeSharedPreferences;
@Inject @Inject
@Named("nsfw_and_spoiler")
SharedPreferences mNsfwAndSpoilerSharedPreferences;
@Inject
CustomThemeWrapper customThemeWrapper; CustomThemeWrapper customThemeWrapper;
private LinearLayoutManager mLinearLayoutManager; private LinearLayoutManager mLinearLayoutManager;
private String mQuery; private String mQuery;
@ -124,6 +127,7 @@ public class UserListingFragment extends Fragment implements FragmentCommunicato
String accountName = getArguments().getString(EXTRA_ACCOUNT_NAME); String accountName = getArguments().getString(EXTRA_ACCOUNT_NAME);
String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_SEARCH_USER, SortType.Type.RELEVANCE.value); String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_SEARCH_USER, SortType.Type.RELEVANCE.value);
sortType = new SortType(SortType.Type.valueOf(sort.toUpperCase())); sortType = new SortType(SortType.Type.valueOf(sort.toUpperCase()));
boolean nsfw = mNsfwAndSpoilerSharedPreferences.getBoolean((accountName == null ? "" : accountName) + SharedPreferencesUtils.NSFW_BASE, false);
mAdapter = new UserListingRecyclerViewAdapter(getActivity(), mOauthRetrofit, mRetrofit, mAdapter = new UserListingRecyclerViewAdapter(getActivity(), mOauthRetrofit, mRetrofit,
customThemeWrapper, accessToken, accountName, mRedditDataRoomDatabase.subscribedUserDao(), customThemeWrapper, accessToken, accountName, mRedditDataRoomDatabase.subscribedUserDao(),
@ -132,11 +136,11 @@ public class UserListingFragment extends Fragment implements FragmentCommunicato
mUserListingRecyclerView.setAdapter(mAdapter); mUserListingRecyclerView.setAdapter(mAdapter);
UserListingViewModel.Factory factory = new UserListingViewModel.Factory(mRetrofit, mQuery, UserListingViewModel.Factory factory = new UserListingViewModel.Factory(mRetrofit, mQuery,
sortType); sortType, nsfw);
mUserListingViewModel = new ViewModelProvider(this, factory).get(UserListingViewModel.class); mUserListingViewModel = new ViewModelProvider(this, factory).get(UserListingViewModel.class);
mUserListingViewModel.getUsers().observe(this, UserData -> mAdapter.submitList(UserData)); mUserListingViewModel.getUsers().observe(getViewLifecycleOwner(), UserData -> mAdapter.submitList(UserData));
mUserListingViewModel.hasUser().observe(this, hasUser -> { mUserListingViewModel.hasUser().observe(getViewLifecycleOwner(), hasUser -> {
mSwipeRefreshLayout.setRefreshing(false); mSwipeRefreshLayout.setRefreshing(false);
if (hasUser) { if (hasUser) {
mFetchUserListingInfoLinearLayout.setVisibility(View.GONE); mFetchUserListingInfoLinearLayout.setVisibility(View.GONE);
@ -148,7 +152,7 @@ public class UserListingFragment extends Fragment implements FragmentCommunicato
} }
}); });
mUserListingViewModel.getInitialLoadingState().observe(this, networkState -> { mUserListingViewModel.getInitialLoadingState().observe(getViewLifecycleOwner(), networkState -> {
if (networkState.getStatus().equals(NetworkState.Status.SUCCESS)) { if (networkState.getStatus().equals(NetworkState.Status.SUCCESS)) {
mSwipeRefreshLayout.setRefreshing(false); mSwipeRefreshLayout.setRefreshing(false);
} else if (networkState.getStatus().equals(NetworkState.Status.FAILED)) { } else if (networkState.getStatus().equals(NetworkState.Status.FAILED)) {
@ -160,7 +164,7 @@ public class UserListingFragment extends Fragment implements FragmentCommunicato
} }
}); });
mUserListingViewModel.getPaginationNetworkState().observe(this, networkState -> { mUserListingViewModel.getPaginationNetworkState().observe(getViewLifecycleOwner(), networkState -> {
mAdapter.setNetworkState(networkState); mAdapter.setNetworkState(networkState);
}); });

4
app/src/main/java/ml/docilealligator/infinityforreddit/User/FetchUserData.java
View File

@ -41,11 +41,11 @@ public class FetchUserData {
}); });
} }
public static void fetchUserListingData(Retrofit retrofit, String query, String after, String sortType, public static void fetchUserListingData(Retrofit retrofit, String query, String after, String sortType, boolean nsfw,
FetchUserListingDataListener fetchUserListingDataListener) { FetchUserListingDataListener fetchUserListingDataListener) {
RedditAPI api = retrofit.create(RedditAPI.class); RedditAPI api = retrofit.create(RedditAPI.class);
Call<String> userInfo = api.searchUsers(query, after, sortType); Call<String> userInfo = api.searchUsers(query, after, sortType, nsfw ? 1 : 0);
userInfo.enqueue(new Callback<String>() { userInfo.enqueue(new Callback<String>() {
@Override @Override
public void onResponse(@NonNull Call<String> call, @NonNull retrofit2.Response<String> response) { public void onResponse(@NonNull Call<String> call, @NonNull retrofit2.Response<String> response) {

8
app/src/main/java/ml/docilealligator/infinityforreddit/User/UserListingDataSource.java
View File

@ -15,6 +15,7 @@ public class UserListingDataSource extends PageKeyedDataSource<String, UserData>
private Retrofit retrofit; private Retrofit retrofit;
private String query; private String query;
private SortType sortType; private SortType sortType;
private boolean nsfw;
private MutableLiveData<NetworkState> paginationNetworkStateLiveData; private MutableLiveData<NetworkState> paginationNetworkStateLiveData;
private MutableLiveData<NetworkState> initialLoadStateLiveData; private MutableLiveData<NetworkState> initialLoadStateLiveData;
@ -23,10 +24,11 @@ public class UserListingDataSource extends PageKeyedDataSource<String, UserData>
private PageKeyedDataSource.LoadParams<String> params; private PageKeyedDataSource.LoadParams<String> params;
private PageKeyedDataSource.LoadCallback<String, UserData> callback; private PageKeyedDataSource.LoadCallback<String, UserData> callback;
UserListingDataSource(Retrofit retrofit, String query, SortType sortType) { UserListingDataSource(Retrofit retrofit, String query, SortType sortType, boolean nsfw) {
this.retrofit = retrofit; this.retrofit = retrofit;
this.query = query; this.query = query;
this.sortType = sortType; this.sortType = sortType;
this.nsfw = nsfw;
paginationNetworkStateLiveData = new MutableLiveData<>(); paginationNetworkStateLiveData = new MutableLiveData<>();
initialLoadStateLiveData = new MutableLiveData<>(); initialLoadStateLiveData = new MutableLiveData<>();
hasUserLiveData = new MutableLiveData<>(); hasUserLiveData = new MutableLiveData<>();
@ -48,7 +50,7 @@ public class UserListingDataSource extends PageKeyedDataSource<String, UserData>
public void loadInitial(@NonNull PageKeyedDataSource.LoadInitialParams<String> params, @NonNull PageKeyedDataSource.LoadInitialCallback<String, UserData> callback) { public void loadInitial(@NonNull PageKeyedDataSource.LoadInitialParams<String> params, @NonNull PageKeyedDataSource.LoadInitialCallback<String, UserData> callback) {
initialLoadStateLiveData.postValue(NetworkState.LOADING); initialLoadStateLiveData.postValue(NetworkState.LOADING);
FetchUserData.fetchUserListingData(retrofit, query, null, sortType.getType().value, FetchUserData.fetchUserListingData(retrofit, query, null, sortType.getType().value, nsfw,
new FetchUserData.FetchUserListingDataListener() { new FetchUserData.FetchUserListingDataListener() {
@Override @Override
public void onFetchUserListingDataSuccess(ArrayList<UserData> UserData, String after) { public void onFetchUserListingDataSuccess(ArrayList<UserData> UserData, String after) {
@ -83,7 +85,7 @@ public class UserListingDataSource extends PageKeyedDataSource<String, UserData>
return; return;
} }
FetchUserData.fetchUserListingData(retrofit, query, params.key, sortType.getType().value, FetchUserData.fetchUserListingData(retrofit, query, params.key, sortType.getType().value, nsfw,
new FetchUserData.FetchUserListingDataListener() { new FetchUserData.FetchUserListingDataListener() {
@Override @Override
public void onFetchUserListingDataSuccess(ArrayList<UserData> UserData, String after) { public void onFetchUserListingDataSuccess(ArrayList<UserData> UserData, String after) {

6
app/src/main/java/ml/docilealligator/infinityforreddit/User/UserListingDataSourceFactory.java
View File

@ -11,21 +11,23 @@ public class UserListingDataSourceFactory extends DataSource.Factory {
private Retrofit retrofit; private Retrofit retrofit;
private String query; private String query;
private SortType sortType; private SortType sortType;
private boolean nsfw;
private UserListingDataSource userListingDataSource; private UserListingDataSource userListingDataSource;
private MutableLiveData<UserListingDataSource> userListingDataSourceMutableLiveData; private MutableLiveData<UserListingDataSource> userListingDataSourceMutableLiveData;
UserListingDataSourceFactory(Retrofit retrofit, String query, SortType sortType) { UserListingDataSourceFactory(Retrofit retrofit, String query, SortType sortType, boolean nsfw) {
this.retrofit = retrofit; this.retrofit = retrofit;
this.query = query; this.query = query;
this.sortType = sortType; this.sortType = sortType;
this.nsfw = nsfw;
userListingDataSourceMutableLiveData = new MutableLiveData<>(); userListingDataSourceMutableLiveData = new MutableLiveData<>();
} }
@NonNull @NonNull
@Override @Override
public DataSource create() { public DataSource create() {
userListingDataSource = new UserListingDataSource(retrofit, query, sortType); userListingDataSource = new UserListingDataSource(retrofit, query, sortType, nsfw);
userListingDataSourceMutableLiveData.postValue(userListingDataSource); userListingDataSourceMutableLiveData.postValue(userListingDataSource);
return userListingDataSource; return userListingDataSource;
} }

10
app/src/main/java/ml/docilealligator/infinityforreddit/User/UserListingViewModel.java
View File

@ -21,8 +21,8 @@ public class UserListingViewModel extends ViewModel {
private LiveData<PagedList<UserData>> users; private LiveData<PagedList<UserData>> users;
private MutableLiveData<SortType> sortTypeLiveData; private MutableLiveData<SortType> sortTypeLiveData;
public UserListingViewModel(Retrofit retrofit, String query, SortType sortType) { public UserListingViewModel(Retrofit retrofit, String query, SortType sortType, boolean nsfw) {
userListingDataSourceFactory = new UserListingDataSourceFactory(retrofit, query, sortType); userListingDataSourceFactory = new UserListingDataSourceFactory(retrofit, query, sortType, nsfw);
initialLoadingState = Transformations.switchMap(userListingDataSourceFactory.getUserListingDataSourceMutableLiveData(), initialLoadingState = Transformations.switchMap(userListingDataSourceFactory.getUserListingDataSourceMutableLiveData(),
UserListingDataSource::getInitialLoadStateLiveData); UserListingDataSource::getInitialLoadStateLiveData);
@ -78,17 +78,19 @@ public class UserListingViewModel extends ViewModel {
private Retrofit retrofit; private Retrofit retrofit;
private String query; private String query;
private SortType sortType; private SortType sortType;
private boolean nsfw;
public Factory(Retrofit retrofit, String query, SortType sortType) { public Factory(Retrofit retrofit, String query, SortType sortType, boolean nsfw) {
this.retrofit = retrofit; this.retrofit = retrofit;
this.query = query; this.query = query;
this.sortType = sortType; this.sortType = sortType;
this.nsfw = nsfw;
} }
@NonNull @NonNull
@Override @Override
public <T extends ViewModel> T create(@NonNull Class<T> modelClass) { public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
return (T) new UserListingViewModel(retrofit, query, sortType); return (T) new UserListingViewModel(retrofit, query, sortType, nsfw);
} }
} }
} }