1
0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-09-28 21:57:30 +00:00

Merge branch 'master' into pr/245

This commit is contained in:
Austin Huang 2020-10-24 12:31:14 -04:00
commit a0f608442a
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
3 changed files with 11 additions and 9 deletions

View File

@ -425,7 +425,7 @@ public class DirectMessageThreadFragment extends Fragment {
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
listViewModel.getList().postValue(Collections.emptyList()); if (listViewModel != null) listViewModel.getList().postValue(Collections.emptyList());
} }
private void sendText(final String text, final String itemId, final boolean delete) { private void sendText(final String text, final String itemId, final boolean delete) {

View File

@ -765,12 +765,14 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
} }
private void showProfilePicDialog() { private void showProfilePicDialog() {
final FragmentManager fragmentManager = getParentFragmentManager(); if (profileModel != null) {
final ProfilePicDialogFragment fragment = new ProfilePicDialogFragment(profileModel.getId(), username, profileModel.getHdProfilePic()); final FragmentManager fragmentManager = getParentFragmentManager();
final FragmentTransaction ft = fragmentManager.beginTransaction(); final ProfilePicDialogFragment fragment = new ProfilePicDialogFragment(profileModel.getId(), username, profileModel.getHdProfilePic());
ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) final FragmentTransaction ft = fragmentManager.beginTransaction();
.add(fragment, "profilePicDialog") ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.commit(); .add(fragment, "profilePicDialog")
.commit();
}
} }
private void setUsernameDelayed() { private void setUsernameDelayed() {

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=10065868c78f1207afb3a92176f99a37d753a513dff453abb6b5cceda4058cda distributionSha256Sum=5252d2f1a984e5518e604678b3964bb0227c4573fcc880b92548bc687c851704
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-5-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists