mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2024-12-25 02:18:23 +01:00
Correctly handle the case that the value of SELFTEXT_HTML or BODY_HTML_KEY is null. Delete the constraint that only when all the subscribed subreddits and users data have been inserted can the two RecyclerViews update their data in order to avoid the newly fetched data cannot be observed by observers and make the RecyclerView getting the new data impossible.
This commit is contained in:
parent
80058ff6ab
commit
97079663ff
@ -54,7 +54,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
private String mBannerImageUrl;
|
||||
private String mKarma;
|
||||
private boolean mFetchUserInfoSuccess;
|
||||
private boolean mIsInserting;
|
||||
private boolean mInsertSuccess;
|
||||
|
||||
private SubscribedSubredditViewModel mSubscribedSubredditViewModel;
|
||||
@ -153,7 +152,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
mSubscribedSubredditViewModel.getAllSubscribedSubreddits().observe(this, new Observer<List<SubscribedSubredditData>>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable final List<SubscribedSubredditData> subscribedSubredditData) {
|
||||
if(!mIsInserting) {
|
||||
if (subscribedSubredditData == null || subscribedSubredditData.size() == 0) {
|
||||
subscriptionsLabelTextView.setVisibility(View.GONE);
|
||||
} else {
|
||||
@ -162,7 +160,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
subredditadapter.setSubscribedSubreddits(subscribedSubredditData);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
final SubscribedUserRecyclerViewAdapter userAdapter = new SubscribedUserRecyclerViewAdapter(this);
|
||||
@ -171,8 +168,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
mSubscribedUserViewModel.getAllSubscribedUsers().observe(this, new Observer<List<SubscribedUserData>>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable final List<SubscribedUserData> subscribedUserData) {
|
||||
if(!mIsInserting) {
|
||||
Log.i("view", "observed");
|
||||
if (subscribedUserData == null || subscribedUserData.size() == 0) {
|
||||
followingLabelTextView.setVisibility(View.GONE);
|
||||
} else {
|
||||
@ -180,7 +175,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
userAdapter.setSubscribedUsers(subscribedUserData);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -240,7 +234,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
public void onFetchSubscribedSubredditsSuccess(ArrayList<SubscribedSubredditData> subscribedSubredditData,
|
||||
ArrayList<SubscribedUserData> subscribedUserData,
|
||||
ArrayList<SubredditData> subredditData) {
|
||||
mIsInserting = true;
|
||||
new InsertSubscribedThingsAsyncTask(
|
||||
SubscribedSubredditRoomDatabase.getDatabase(MainActivity.this),
|
||||
SubscribedUserRoomDatabase.getDatabase(MainActivity.this),
|
||||
@ -251,7 +244,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
new InsertSubscribedThingsAsyncTask.InsertSubscribedThingListener() {
|
||||
@Override
|
||||
public void insertSuccess() {
|
||||
mIsInserting = false;
|
||||
mInsertSuccess = true;
|
||||
}
|
||||
}).execute();
|
||||
|
@ -72,7 +72,10 @@ class ParseComment {
|
||||
String fullName = data.getString(JSONUtils.LINK_ID);
|
||||
String author = data.getString(JSONUtils.AUTHOR_KEY);
|
||||
boolean isSubmitter = data.getBoolean(JSONUtils.IS_SUBMITTER_KEY);
|
||||
String commentContent = data.getString(JSONUtils.BODY_HTML_KEY);
|
||||
String commentContent = "";
|
||||
if(!data.isNull(JSONUtils.BODY_HTML_KEY)) {
|
||||
commentContent = data.getString(JSONUtils.BODY_HTML_KEY);
|
||||
}
|
||||
String permalink = data.getString(JSONUtils.PERMALINK_KEY);
|
||||
int score = data.getInt(JSONUtils.SCORE_KEY);
|
||||
long submitTime = data.getLong(JSONUtils.CREATED_UTC_KEY) * 1000;
|
||||
|
@ -135,7 +135,6 @@ class ParsePost {
|
||||
} else {
|
||||
postData.setSelfText(data.getString(JSONUtils.SELFTEXT_HTML_KEY).trim());
|
||||
}
|
||||
postData.setSelfText(data.getString(JSONUtils.SELFTEXT_HTML_KEY).trim());
|
||||
bestPostData.add(postData);
|
||||
} else {
|
||||
//No preview link post
|
||||
|
Loading…
Reference in New Issue
Block a user