Support opening mastodon.online and mastodon.social links

mastodon/src/main/AndroidManifest.xml

@@ -37,6 +37,18 @@
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
+			<intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<data android:scheme="https" android:host="mastodon.social" android:pathPrefix="/@"/>
+			</intent-filter>
+			<intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<data android:scheme="https" android:host="mastodon.online" android:pathPrefix="/@"/>
+			</intent-filter>
 		</activity>
 		<activity android:name=".OAuthActivity" android:exported="true" android:configChanges="orientation|screenSize" android:launchMode="singleTask">
 			<intent-filter>

mastodon/src/main/java/org/joinmastodon/android/MainActivity.java

@@ -4,13 +4,15 @@ import android.Manifest;
 import android.app.Application;
 import android.app.Fragment;
 import android.content.Intent;
-import android.content.pm.PackageInstaller;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.widget.Toast;
 
 import org.joinmastodon.android.api.ObjectValidationException;
+import org.joinmastodon.android.api.requests.search.GetSearchResults;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
@@ -20,6 +22,7 @@ import org.joinmastodon.android.fragments.SplashFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
 import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.parceler.Parcels;
@@ -28,6 +31,9 @@ import java.lang.reflect.InvocationTargetException;
 
 import androidx.annotation.Nullable;
 import me.grishka.appkit.FragmentStackActivity;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 
 public class MainActivity extends FragmentStackActivity{
 	@Override
@@ -64,6 +70,8 @@ public class MainActivity extends FragmentStackActivity{
 					showFragmentForNotification(notification, session.getID());
 				}else if(intent.getBooleanExtra("compose", false)){
 					showCompose();
+				}else if(Intent.ACTION_VIEW.equals(intent.getAction())){
+					handleURL(intent.getData());
 				}else{
 					maybeRequestNotificationsPermission();
 				}
@@ -105,11 +113,50 @@ public class MainActivity extends FragmentStackActivity{
 			}
 		}else if(intent.getBooleanExtra("compose", false)){
 			showCompose();
+		}else if(Intent.ACTION_VIEW.equals(intent.getAction())){
+			handleURL(intent.getData());
 		}/*else if(intent.hasExtra(PackageInstaller.EXTRA_STATUS) && GithubSelfUpdater.needSelfUpdating()){
 			GithubSelfUpdater.getInstance().handleIntentFromInstaller(intent, this);
 		}*/
 	}
 
+	private void handleURL(Uri uri){
+		if(uri==null)
+			return;
+		if(!"https".equals(uri.getScheme()) && !"http".equals(uri.getScheme()))
+			return;
+		if(!uri.getPath().startsWith("/@"))
+			return;
+		AccountSession session=AccountSessionManager.getInstance().getLastActiveAccount();
+		if(session==null || !session.activated)
+			return;
+
+		new GetSearchResults(uri.toString(), null, true)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(SearchResults result){
+						Bundle args=new Bundle();
+						args.putString("account", session.getID());
+						if(result.statuses!=null && !result.statuses.isEmpty()){
+							args.putParcelable("status", Parcels.wrap(result.statuses.get(0)));
+							Nav.go(MainActivity.this, ThreadFragment.class, args);
+						}else if(result.accounts!=null && !result.accounts.isEmpty()){
+							args.putParcelable("profileAccount", Parcels.wrap(result.accounts.get(0)));
+							Nav.go(MainActivity.this, ProfileFragment.class, args);
+						}else{
+							Toast.makeText(MainActivity.this, R.string.link_not_supported, Toast.LENGTH_SHORT).show();
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(MainActivity.this);
+					}
+				})
+				.wrapProgress(this, R.string.opening_link, true)
+				.exec(session.getID());
+	}
+
 	private void showFragmentForNotification(Notification notification, String accountID){
 		Fragment fragment;
 		Bundle args=new Bundle();

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java

@@ -37,7 +37,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 

mastodon/src/main/res/values/strings.xml

@@ -451,4 +451,6 @@
 	<string name="welcome_paragraph1">Mastodon is a decentralized social network, meaning no single company controls it. It’s made up of many independently-run servers, all connected together.</string>
 	<string name="what_are_servers">What are servers?</string>
 	<string name="welcome_paragraph2"><![CDATA[Every Mastodon account is hosted on a server — each with its own values, rules, & admins. No matter which one you pick, you can follow and interact with people on any server.]]></string>
+	<string name="opening_link">Opening link…</string>
+	<string name="link_not_supported">This link is not supported in the app</string>
 </resources>