Merge pull request #487 from FineFindus/fix/uri-crash

fix: check if uri is hierarchical
LucasGGamerM · Aug 1, 2024 · 9c7ae96 · 9c7ae96
2 parents 43afbb7 + 4447370
commit 9c7ae96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...n/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java b/...n/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
@@ -94,7 +94,7 @@ public void onCreate(Bundle savedInstanceState){
 				copyCrashLogItem=new ListItem<>(getString(R.string.sk_settings_copy_crash_log), lastModified, 0, this::onCopyCrashLog)
 		));
 
-		if(GithubSelfUpdater.needSelfUpdating()){
+		if(GithubSelfUpdater.needSelfUpdating() && !BuildConfig.BUILD_TYPE.equals("nightly") ){
 			items.add(enablePreReleasesItem=new CheckableListItem<>(R.string.sk_updater_enable_pre_releases, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.enablePreReleases, i->toggleCheckableItem(enablePreReleasesItem)));
 		}
 

diff --git a/mastodon/src/main/java/org/joinmastodon/android/utils/Tracking.java b/mastodon/src/main/java/org/joinmastodon/android/utils/Tracking.java
@@ -64,7 +64,7 @@ public class Tracking{
 	@NonNull
 	public static String removeTrackingParameters(@NonNull String url){
 		Uri uri=Uri.parse(url);
-		if(uri==null)
+		if(uri==null || !uri.isHierarchical())
 			return url;
 		Uri.Builder uriBuilder=uri.buildUpon().clearQuery();