mirror/Infinity-For-Reddit
3
0
Fork 0
mirror of https://github.com/Docile-Alligator/Infinity-For-Reddit.git synced 2026-03-30 11:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix RuntimeException related to Handler in SubredditListingDataSource.

Browse Source
This commit is contained in:
Docile-Alligator
2024-06-04 15:00:53 -04:00
parent d278bd873d
commit 43f389f12f
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/ml/docilealligator/infinityforreddit/fragments/SubredditListingFragment.java
View File

@ -7,6 +7,7 @@ import android.content.SharedPreferences;
import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -157,7 +158,7 @@ public class SubredditListingFragment extends Fragment implements FragmentCommun
}
SubredditListingViewModel.Factory factory = new SubredditListingViewModel.Factory(mExecutor,
mOauthRetrofit, query, sortType, mActivity.accessToken, mActivity.accountName, nsfw);
new Handler(), mOauthRetrofit, query, sortType, mActivity.accessToken, mActivity.accountName, nsfw);
mSubredditListingViewModel = new ViewModelProvider(this, factory).get(SubredditListingViewModel.class);
mSubredditListingViewModel.getSubreddits().observe(getViewLifecycleOwner(), subredditData -> mAdapter.submitList(subredditData));

4
app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditListingDataSource.java
View File

@ -34,7 +34,7 @@ public class SubredditListingDataSource extends PageKeyedDataSource<String, Subr
private LoadParams<String> params;
private LoadCallback<String, SubredditData> callback;
SubredditListingDataSource(Executor executor, Retrofit retrofit, String query, SortType sortType,
SubredditListingDataSource(Executor executor, Handler handler, Retrofit retrofit, String query, SortType sortType,
@Nullable String accessToken, @NonNull String accountName, boolean nsfw) {
this.executor = executor;
this.retrofit = retrofit;
@ -43,7 +43,7 @@ public class SubredditListingDataSource extends PageKeyedDataSource<String, Subr
this.accessToken = accessToken;
this.accountName = accountName;
this.nsfw = nsfw;
handler = new Handler();
this.handler = handler;
paginationNetworkStateLiveData = new MutableLiveData<>();
initialLoadStateLiveData = new MutableLiveData<>();
hasSubredditLiveData = new MutableLiveData<>();

8
app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditListingDataSourceFactory.java
View File

@ -1,5 +1,7 @@
package ml.docilealligator.infinityforreddit.subreddit;
import android.os.Handler;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.MutableLiveData;
@ -12,6 +14,7 @@ import retrofit2.Retrofit;
public class SubredditListingDataSourceFactory extends DataSource.Factory {
private final Executor executor;
private final Handler handler;
private final Retrofit retrofit;
private final String query;
private SortType sortType;
@ -24,9 +27,10 @@ public class SubredditListingDataSourceFactory extends DataSource.Factory {
private SubredditListingDataSource subredditListingDataSource;
private final MutableLiveData<SubredditListingDataSource> subredditListingDataSourceMutableLiveData;
SubredditListingDataSourceFactory(Executor executor, Retrofit retrofit, String query, SortType sortType,
SubredditListingDataSourceFactory(Executor executor, Handler handler, Retrofit retrofit, String query, SortType sortType,
@Nullable String accessToken, @NonNull String accountName, boolean nsfw) {
this.executor = executor;
this.handler = handler;
this.retrofit = retrofit;
this.query = query;
this.sortType = sortType;
@ -39,7 +43,7 @@ public class SubredditListingDataSourceFactory extends DataSource.Factory {
@NonNull
@Override
public DataSource create() {
subredditListingDataSource = new SubredditListingDataSource(executor, retrofit, query, sortType,
subredditListingDataSource = new SubredditListingDataSource(executor, handler, retrofit, query, sortType,
accessToken, accountName, nsfw);
subredditListingDataSourceMutableLiveData.postValue(subredditListingDataSource);
return subredditListingDataSource;

12
app/src/main/java/ml/docilealligator/infinityforreddit/subreddit/SubredditListingViewModel.java
View File

@ -1,5 +1,7 @@
package ml.docilealligator.infinityforreddit.subreddit;
import android.os.Handler;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.LiveData;
@ -24,9 +26,9 @@ public class SubredditListingViewModel extends ViewModel {
private final LiveData<PagedList<SubredditData>> subreddits;
private final MutableLiveData<SortType> sortTypeLiveData;
public SubredditListingViewModel(Executor executor, Retrofit retrofit, String query, SortType sortType,
public SubredditListingViewModel(Executor executor, Handler handler, Retrofit retrofit, String query, SortType sortType,
@Nullable String accessToken, @NonNull String accountName, boolean nsfw) {
subredditListingDataSourceFactory = new SubredditListingDataSourceFactory(executor, retrofit, query,
subredditListingDataSourceFactory = new SubredditListingDataSourceFactory(executor, handler, retrofit, query,
sortType, accessToken, accountName, nsfw);
initialLoadingState = Transformations.switchMap(subredditListingDataSourceFactory.getSubredditListingDataSourceMutableLiveData(),
@ -80,6 +82,7 @@ public class SubredditListingViewModel extends ViewModel {
public static class Factory extends ViewModelProvider.NewInstanceFactory {
private final Executor executor;
private final Handler handler;
private final Retrofit retrofit;
private final String query;
private final SortType sortType;
@ -89,9 +92,10 @@ public class SubredditListingViewModel extends ViewModel {
private final String accountName;
private final boolean nsfw;
public Factory(Executor executor, Retrofit retrofit, String query, SortType sortType,
public Factory(Executor executor, Handler handler, Retrofit retrofit, String query, SortType sortType,
@Nullable String accessToken, @NonNull String accountName, boolean nsfw) {
this.executor = executor;
this.handler = handler;
this.retrofit = retrofit;
this.query = query;
this.sortType = sortType;
@ -103,7 +107,7 @@ public class SubredditListingViewModel extends ViewModel {
@NonNull
@Override
public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
return (T) new SubredditListingViewModel(executor, retrofit, query, sortType, accessToken,accountName, nsfw);
return (T) new SubredditListingViewModel(executor, handler, retrofit, query, sortType, accessToken,accountName, nsfw);
}
}
}