From a7ec65d88f534de513a24103383e2136ce76aefc Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Wed, 2 Sep 2020 13:20:19 -0400
Subject: [PATCH] conflict resolution

---
 app/src/main/java/awais/instagrabber/MainHelper.java | 10 +++++++++-
 app/src/main/res/values/strings.xml                  |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/awais/instagrabber/MainHelper.java b/app/src/main/java/awais/instagrabber/MainHelper.java
index 8c0e3661..821a29f3 100755
--- a/app/src/main/java/awais/instagrabber/MainHelper.java
+++ b/app/src/main/java/awais/instagrabber/MainHelper.java
@@ -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) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76368dfa..3bbca35b 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,10 +34,13 @@
     <string name="title_user_story">User Story</string>
     <string name="title_changelog">Changelog</string>
     <string name="bottom_toolbar">Show toolbar at bottom</string>
+    <string name="update_check">Check for new updates on GitHub at startup</string>
     <string name="download_user_folder">Download posts to username folder in Downloads</string>
     <string name="autoload_posts">Auto-load all posts from user</string>
     <string name="mark_as_seen_setting">Mark stories as seen after viewing</string>
     <string name="mark_as_seen_setting_summary">Story author will know you viewed it</string>
+    <string name="dm_mark_as_seen_setting">Automatically mark DM as seen after viewing</string>
+    <string name="dm_mark_as_seen_setting_summary">Other members will know you viewed it</string>
     <string name="activity_setting">Enable activity notifications</string>
     <string name="error_loading_profile">Error loading profile!\nTry logging in and search again.</string>
     <string name="error_creating_folders">Error creating Download folder(s).</string>
@@ -85,6 +88,7 @@
     <string name="story_quizzed">You have already answered!</string>
     <string name="story_mentions">Mentions</string>
     <string name="priv_acc">This Account is Private</string>
+    <string name="priv_acc_confirm">You won\'t be able to access posts after unfollowing! Are you sure?</string>
     <string name="no_acc">You can log in via Settings on the bottom-right corner. Or, you can view public accounts without login!</string>
     <string name="no_acc_logged_in">You can swipe left/right for explore/feed, or search something below!</string>
     <string name="empty_acc">This Account has No Posts</string>
@@ -174,6 +178,8 @@
     <string name="dms_action_success">Great success!</string>
     <string name="dms_action_leave">Leave</string>
     <string name="dms_action_leave_question">Leave this chat?</string>
+    <string name="dms_action_kick">Kick</string>
+    <string name="dms_left_users">Left users</string>
     <string name="direct_download">Download directly</string>
     <string name="direct_download_desc">Downloads posts directly to the phone!</string>
     <string name="direct_download_loading">Fetching post(s)</string>
@@ -243,4 +249,4 @@
     <string name="relogin">Relogin</string>
     <string name="relogin_summary">Refresh your cookies if facing any issues</string>
     <string name="logout_success">Successfully logged out!</string>
-</resources>
+</resources>
\ No newline at end of file