Mirrors/Barinsta
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into pr/245

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java
View File

@ -425,7 +425,7 @@ public class DirectMessageThreadFragment extends Fragment {
@Override
public void 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) {

14
app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java
View File

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

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

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