Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-12-23 13:26:59 +00:00
Code Issues Releases Wiki Activity

final resolution

Browse Source
This commit is contained in:
Austin Huang 2020-09-02 13:34:29 -04:00
parent b62dc66032
commit 0f1ddda001
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
1 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/java/awais/instagrabber/MainHelper.java
View File

@ -1414,10 +1414,9 @@ public final class MainHelper implements SwipeRefreshLayout.OnRefreshListener {
? mainActivity.locationModel.getName() ? mainActivity.locationModel.getName()
: mainActivity.userQuery.replaceAll("^@", ""))); : mainActivity.userQuery.replaceAll("^@", "")));
onRefresh(); onRefresh();
<<<<<<< HEAD
} else if (v == mainActivity.mainBinding.profileView.btnFollow) { } else if (v == mainActivity.mainBinding.profileView.btnFollow) {
if (mainActivity.profileModel.isPrivate() && mainActivity.profileModel.getFollowing()) { if (mainActivity.profileModel.isPrivate() && mainActivity.profileModel.getFollowing()) {
new AlertDialog.Builder(main) new AlertDialog.Builder(mainActivity)
.setTitle(R.string.priv_acc) .setTitle(R.string.priv_acc)
.setMessage(R.string.priv_acc_confirm) .setMessage(R.string.priv_acc_confirm)
.setNegativeButton(R.string.no, null) .setNegativeButton(R.string.no, null)
@ -1426,25 +1425,6 @@ public final class MainHelper implements SwipeRefreshLayout.OnRefreshListener {
} }
else new ProfileAction().execute("follow"); else new ProfileAction().execute("follow");
} else if (v == mainActivity.mainBinding.profileView.btnRestrict && isLoggedIn) { } else if (v == mainActivity.mainBinding.profileView.btnRestrict && isLoggedIn) {
||||||| merged common ancestors
} else if (v == main.mainBinding.profileView.btnFollow) {
new ProfileAction().execute("follow");
} else if (v == main.mainBinding.profileView.btnRestrict && isLoggedIn) {
=======
} else if (v == main.mainBinding.profileView.btnFollow) {
if (main.profileModel.isPrivate() && main.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 == main.mainBinding.profileView.btnRestrict && isLoggedIn) {
>>>>>>> 44db2db57f4461bbffa160e26cd734fb07f3b930
new ProfileAction().execute("restrict"); new ProfileAction().execute("restrict");
} else if (v == mainActivity.mainBinding.profileView.btnSaved && !isSelf) { } else if (v == mainActivity.mainBinding.profileView.btnSaved && !isSelf) {
new ProfileAction().execute("block"); new ProfileAction().execute("block");
@ -1475,7 +1455,6 @@ public final class MainHelper implements SwipeRefreshLayout.OnRefreshListener {
protected Void doInBackground(String... rawAction) { protected Void doInBackground(String... rawAction) {
action = rawAction[0]; action = rawAction[0];
<<<<<<< HEAD
final String url = "https://www.instagram.com/web/" + (action.equals("followtag") && mainActivity.hashtagModel != null final String url = "https://www.instagram.com/web/" + (action.equals("followtag") && mainActivity.hashtagModel != null
? "tags/" + (mainActivity.hashtagModel.getFollowing() ? "tags/" + (mainActivity.hashtagModel.getFollowing()
? "unfollow/" ? "unfollow/"
@ -1501,31 +1480,6 @@ public final class MainHelper implements SwipeRefreshLayout.OnRefreshListener {
.getBlocked() .getBlocked()
? "unblock/" ? "unblock/"
: "block/")); : "block/"));
||||||| merged common ancestors
final String url = "https://www.instagram.com/web/"+
((action == "followtag" && main.hashtagModel != null) ? ("tags/"+
(main.hashtagModel.getFollowing() == true ? "unfollow/" : "follow/")+main.hashtagModel.getName()+"/") : (
((action == "restrict" && main.profileModel != null) ? "restrict_action" : ("friendships/"+main.profileModel.getId()))+"/"+
((action == "follow" && main.profileModel != null) ?
((main.profileModel.getFollowing() == true ||
(main.profileModel.getFollowing() == false && main.profileModel.getRequested() == true))
? "unfollow/" : "follow/") :
((action == "restrict" && main.profileModel != null) ?
(main.profileModel.getRestricted() == true ? "unrestrict/" : "restrict/") :
(main.profileModel.getBlocked() == true ? "unblock/" : "block/")))));
=======
final String url = "https://www.instagram.com/web/"+
((action == "followtag" && main.hashtagModel != null) ? ("tags/"+
(main.hashtagModel.getFollowing() ? "unfollow/" : "follow/")+main.hashtagModel.getName()+"/") : (
((action == "restrict" && main.profileModel != null) ? "restrict_action" : ("friendships/"+main.profileModel.getId()))+"/"+
((action == "follow" && main.profileModel != null) ?
((main.profileModel.getFollowing() ||
(main.profileModel.getFollowing() == false && main.profileModel.getRequested() == true))
? "unfollow/" : "follow/") :
((action == "restrict" && main.profileModel != null) ?
(main.profileModel.getRestricted() ? "unrestrict/" : "restrict/") :
(main.profileModel.getBlocked() ? "unblock/" : "block/")))));
>>>>>>> 44db2db57f4461bbffa160e26cd734fb07f3b930
try { try {
final HttpURLConnection urlConnection = (HttpURLConnection) new URL(url).openConnection(); final HttpURLConnection urlConnection = (HttpURLConnection) new URL(url).openConnection();
urlConnection.setRequestMethod("POST"); urlConnection.setRequestMethod("POST");