From 0bd0639a4ed270524443c637be9320eb822cc0cf Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Fri, 11 Jan 2019 15:41:38 +0800
Subject: Following and unfollowing users are now properly implemented.

---
 .../main/java/ml/docilealligator/infinityforreddit/ParseUserData.java   | 1 -
 app/src/main/java/ml/docilealligator/infinityforreddit/RedditUtils.java | 1 -
 .../main/java/ml/docilealligator/infinityforreddit/UserFollowing.java   | 2 +-
 .../ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java    | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java/ml')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java
index 12402f03..4666ffef 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java
@@ -27,7 +27,6 @@ public class ParseUserData {
 
         ParseUserDataAsyncTask(String response, ParseUserDataListener parseUserDataListener){
             try {
-                Log.i("response", response);
                 jsonResponse = new JSONObject(response);
                 this.parseUserDataListener = parseUserDataListener;
                 parseFailed = false;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditUtils.java
index 44c46d7e..d598f684 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditUtils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditUtils.java
@@ -47,7 +47,6 @@ public class RedditUtils {
 
     static final String ACTION_KEY = "action";
     static final String SR_NAME_KEY = "sr_name";
-    static final String SR_KEY = "sr";
 
     static Map<String, String> getHttpBasicAuthHeader() {
         Map<String, String> params = new HashMap<>();
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/UserFollowing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/UserFollowing.java
index c5af5a26..56040fa8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/UserFollowing.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/UserFollowing.java
@@ -46,7 +46,7 @@ class UserFollowing {
 
         Map<String, String> params = new HashMap<>();
         params.put(RedditUtils.ACTION_KEY, action);
-        params.put(RedditUtils.SR_KEY, "u/" + userName);
+        params.put(RedditUtils.SR_NAME_KEY, "u_" + userName);
 
         Call<String> subredditSubscriptionCall = api.subredditSubscription(RedditUtils.getOAuthHeader(accessToken), params);
         subredditSubscriptionCall.enqueue(new Callback<String>() {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java
index 8b3fa0a1..636bb98a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java
@@ -130,7 +130,7 @@ public class ViewUserDetailActivity extends AppCompatActivity {
         subscribeUserChip.setOnClickListener(view -> {
             if(subscriptionReady) {
                 subscriptionReady = false;
-                if(subscribeUserChip.getText().equals(getResources().getString(R.string.subscribe))) {
+                if(subscribeUserChip.getText().equals(getResources().getString(R.string.follow))) {
                     UserFollowing.followUser(mOauthRetrofit, mRetrofit, sharedPreferences,
                             userName, subscribedUserDao, new UserFollowing.UserFollowingListener() {
                                 @Override
-- 
cgit v1.2.3