From 56f4de4edaca94037fca0134a604bc7aae39543d Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Mon, 9 Oct 2023 21:31:04 +0200
Subject: [PATCH] bug fix

---
 .../nuclearfog/twidda/backend/api/Connection.java |  8 ++++----
 .../twidda/backend/api/mastodon/Mastodon.java     | 15 ++++++++-------
 .../twidda/backend/async/HashtagLoader.java       |  2 +-
 .../twidda/backend/helper/update/UserUpdate.java  |  2 +-
 .../twidda/ui/activities/ProfileEditor.java       |  4 ++++
 .../twidda/ui/activities/SearchActivity.java      |  6 ++++--
 .../twidda/ui/dialogs/StatusPreferenceDialog.java |  2 +-
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/Connection.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/Connection.java
index bcff6ece..7a3ba33a 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/api/Connection.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/Connection.java
@@ -269,17 +269,17 @@ public interface Connection {
 	Statuses getPublicTimeline(long minId, long maxId) throws ConnectionException;
 
 	/**
-	 * get location trends
+	 * get trending hashtags
 	 *
-	 * @return trend list
+	 * @return hashtag list
 	 */
-	Hashtags getTrends() throws ConnectionException;
+	Hashtags getHashtags() throws ConnectionException;
 
 	/**
 	 * search hashtags matching search string
 	 *
 	 * @param search text to search hashtags
-	 * @return list of trends (Hashtags)
+	 * @return list of hashtags
 	 */
 	Hashtags searchHashtags(String search) throws ConnectionException;
 
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java
index 09665df0..2fffc79e 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java
@@ -458,8 +458,8 @@ public class Mastodon implements Connection {
 
 
 	@Override
-	public Hashtags getTrends() throws MastodonException {
-		Hashtags result = getTrends(ENDPOINT_TRENDS, new ArrayList<>());
+	public Hashtags getHashtags() throws MastodonException {
+		Hashtags result = getHashtags(ENDPOINT_TRENDS, new ArrayList<>());
 		Collections.sort(result);
 		return result;
 	}
@@ -473,7 +473,7 @@ public class Mastodon implements Connection {
 		else
 			params.add("q=" + StringUtils.encode(search));
 		params.add("type=hashtags");
-		Hashtags result = getTrends(ENDPOINT_SEARCH_TIMELINE, params);
+		Hashtags result = getHashtags(ENDPOINT_SEARCH_TIMELINE, params);
 		Collections.sort(result);
 		return result;
 	}
@@ -484,19 +484,19 @@ public class Mastodon implements Connection {
 		List<String> params = new ArrayList<>();
 		if (cursor != 0L)
 			params.add("max_id=" + cursor);
-		return getTrends(ENDPOINT_HASHTAG_FOLLOWING, params);
+		return getHashtags(ENDPOINT_HASHTAG_FOLLOWING, params);
 	}
 
 
 	@Override
 	public Hashtags showHashtagFeaturing() throws ConnectionException {
-		return getTrends(ENDPOINT_HASHTAG_FEATURE, new ArrayList<>());
+		return getHashtags(ENDPOINT_HASHTAG_FEATURE, new ArrayList<>());
 	}
 
 
 	@Override
 	public Hashtags showHashtagSuggestions() throws ConnectionException {
-		return getTrends(ENDPOINT_HASHTAG_FEATURE + "/suggestions", new ArrayList<>());
+		return getHashtags(ENDPOINT_HASHTAG_FEATURE + "/suggestions", new ArrayList<>());
 	}
 
 
@@ -1155,6 +1155,7 @@ public class Mastodon implements Connection {
 		params.add("display_name=" + StringUtils.encode(update.getName()));
 		params.add("note=" + StringUtils.encode(update.getDescription()));
 		params.add("locked=" + update.privacyEnabled());
+		params.add("source[sensitive]=" + update.isSensitive());
 		if (update.getProfileImageMedia() != null) {
 			streams.add(update.getProfileImageMedia().getStream());
 			keys.add("avatar");
@@ -1461,7 +1462,7 @@ public class Mastodon implements Connection {
 	 * @param params   additional parameters
 	 * @return trend list
 	 */
-	private Hashtags getTrends(String endpoint, List<String> params) throws MastodonException {
+	private Hashtags getHashtags(String endpoint, List<String> params) throws MastodonException {
 		try {
 			params.add("limit=" + settings.getListSize());
 			Response response = get(endpoint, params);
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/async/HashtagLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/async/HashtagLoader.java
index 2b66146a..429c0a4f 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/async/HashtagLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/async/HashtagLoader.java
@@ -43,7 +43,7 @@ public class HashtagLoader extends AsyncExecutor<HashtagLoader.Param, HashtagLoa
 					// fall through
 
 				case Param.POPULAR_ONLINE:
-					hashtags = connection.getTrends();
+					hashtags = connection.getHashtags();
 					db.saveTrends(hashtags);
 					return new Result(Result.POPULAR, hashtags, param.index, null);
 
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/helper/update/UserUpdate.java b/app/src/main/java/org/nuclearfog/twidda/backend/helper/update/UserUpdate.java
index 83e40604..4c9f16ff 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/helper/update/UserUpdate.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/helper/update/UserUpdate.java
@@ -145,7 +145,7 @@ public class UserUpdate implements Closeable {
 	/**
 	 * @return true if user's status should be marked as sensitive by default
 	 */
-	public boolean getContentSensitive() {
+	public boolean isSensitive() {
 		return sensitiveContent;
 	}
 
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileEditor.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileEditor.java
index 8d67ace6..0e92bf19 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileEditor.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileEditor.java
@@ -372,6 +372,10 @@ public class ProfileEditor extends MediaActivity implements OnClickListener, Asy
 	private void setCredentials() {
 		if (credentials != null) {
 			privacy.setChecked(credentials.isLocked());
+			userUpdate.setPrivacy(credentials.isLocked());
+			userUpdate.setLanguageCode(credentials.getLanguage());
+			userUpdate.setStatusVisibility(credentials.getVisibility());
+			userUpdate.setContentSensitive(credentials.isSensitive());
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/SearchActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/SearchActivity.java
index 6507418b..0573bc3c 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/SearchActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/SearchActivity.java
@@ -20,6 +20,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.viewpager2.widget.ViewPager2;
 
 import org.nuclearfog.twidda.R;
+import org.nuclearfog.twidda.backend.api.ConnectionException;
 import org.nuclearfog.twidda.backend.async.AsyncExecutor.AsyncCallback;
 import org.nuclearfog.twidda.backend.async.HashtagAction;
 import org.nuclearfog.twidda.backend.async.HashtagAction.Param;
@@ -96,7 +97,7 @@ public class SearchActivity extends AppCompatActivity implements OnClickListener
 			search = hashtag.getName();
 		} else if (query != null) {
 			search = query;
-			if (search.startsWith("#") && search.matches("\\S+")) {
+			if (search.matches("^#\\S+") && !search.matches("^#\\d+")) {
 				Param param = new Param(Param.LOAD, search);
 				hashtagAction.execute(param, this);
 			}
@@ -271,7 +272,8 @@ public class SearchActivity extends AppCompatActivity implements OnClickListener
 				break;
 
 			case Result.ERROR:
-				ErrorUtils.showErrorMessage(this, result.exception);
+				if (result.exception == null || result.exception.getErrorCode() != ConnectionException.HTTP_FORBIDDEN)
+					ErrorUtils.showErrorMessage(this, result.exception);
 				break;
 		}
 	}
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/dialogs/StatusPreferenceDialog.java b/app/src/main/java/org/nuclearfog/twidda/ui/dialogs/StatusPreferenceDialog.java
index aae054ac..900637bd 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/dialogs/StatusPreferenceDialog.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/dialogs/StatusPreferenceDialog.java
@@ -168,7 +168,7 @@ public class StatusPreferenceDialog extends Dialog implements OnCheckedChangeLis
 			} else if (userUpdate.getStatusVisibility() == Status.VISIBLE_UNLISTED) {
 				visibilitySelector.setSelection(3, false);
 			}
-			sensitiveCheck.setCheckedImmediately(userUpdate.getContentSensitive());
+			sensitiveCheck.setCheckedImmediately(userUpdate.isSensitive());
 			if (!userUpdate.getLanguageCode().isEmpty()) {
 				for (int i = 0; i < languageCodes.length; i++) {
 					if (languageCodes[i].equals(userUpdate.getLanguageCode())) {