Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2026-03-05 20:11:36 +00:00
Code Issues Releases Wiki Activity

conflict resolution

Browse source
This commit is contained in:
Austin Huang 2020-09-02 13:20:19 -04:00
parent 13cacf43f9
commit a7ec65d88f
No known key found for this signature in database
GPG key ID: 84C23AA04587A91F
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/awais/instagrabber/MainHelper.java
View file

@ -1415,7 +1415,15 @@ public final class MainHelper implements SwipeRefreshLayout.OnRefreshListener {
: mainActivity.userQuery.replaceAll("^@", "")));
onRefresh();
} else if (v == mainActivity.mainBinding.profileView.btnFollow) {
new ProfileAction().execute("follow");
if (mainActivity.profileModel.isPrivate() && mainActivity.profileModel.getFollowing()) {
new AlertDialog.Builder(main)
.setTitle(R.string.priv_acc)
.setMessage(R.string.priv_acc_confirm)
.setNegativeButton(R.string.no, null)
.setPositiveButton(R.string.yes, (dialog, which) -> new ProfileAction().execute("follow"))
.show();
}
else new ProfileAction().execute("follow");
} else if (v == mainActivity.mainBinding.profileView.btnRestrict && isLoggedIn) {
new ProfileAction().execute("restrict");
} else if (v == mainActivity.mainBinding.profileView.btnSaved && !isSelf) {