Fixed an issue with subscriptions after re-authenticating

Author: QuantumBadger

src/main/assets/changelog-alpha.txt

@@ -1,3 +1,6 @@
+/Alpha 335 (2023-07-02)
+Fixed an issue with subscriptions after re-authenticating
+
 /Alpha 334 (2023-06-25)
 Due to Reddit API changes, any active accounts must be logged in again
 

src/main/assets/changelog.txt

@@ -1,4 +1,4 @@
-105/1.21
+106/1.21.1
 Show Reddit user agreement prompt at startup
 Due to Reddit API changes, any active accounts must be logged in again
 More specific error message when a subreddit is private
@@ -12,6 +12,7 @@ Fix for MediaMuxer crash
 Imgur links on non-standard subdomains are now handled correctly
 Detects more bot usernames
 Dependency updates
+v1.21.1: Fixed an issue with subscriptions after re-authenticating
 
 104/1.20
 Renamed "Find Subreddit" to "Find Location"

src/main/java/org/quantumbadger/redreader/account/RedditAccount.java

@@ -22,6 +22,8 @@
 import org.quantumbadger.redreader.common.StringUtils;
 import org.quantumbadger.redreader.reddit.api.RedditOAuth;
 
+import java.util.Objects;
+
 public class RedditAccount {
 
 	@NonNull public final String username;
@@ -71,8 +73,16 @@ public synchronized void setAccessToken(final RedditOAuth.AccessToken token) {
 
 	@Override
 	public boolean equals(final Object o) {
-		return o instanceof RedditAccount
-				&& username.equalsIgnoreCase(((RedditAccount)o).username);
+
+		if(!(o instanceof RedditAccount)) {
+			return false;
+		}
+
+		final RedditAccount other = (RedditAccount)o;
+
+		return username.equalsIgnoreCase(other.username)
+				&& Objects.equals(clientId, other.clientId)
+				&& Objects.equals(refreshToken, other.refreshToken);
 	}
 
 	@Override