From 9b2f50d726aec300ab9152e43ccc8b78a61460b1 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Sun, 10 Apr 2022 19:55:25 +0300
Subject: [PATCH] Fix crashes

---
 mastodon/build.gradle                                         | 2 +-
 .../src/main/java/org/joinmastodon/android/MastodonApp.java   | 4 +++-
 .../org/joinmastodon/android/fragments/ComposeFragment.java   | 2 +-
 .../android/ui/ComposeAutocompleteViewController.java         | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 2b30ac877..aa5095858 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -10,7 +10,7 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 31
-		versionCode 22
+		versionCode 23
 		versionName "0.1"
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/MastodonApp.java b/mastodon/src/main/java/org/joinmastodon/android/MastodonApp.java
index 7e84fb095..84333cbe9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/MastodonApp.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MastodonApp.java
@@ -10,6 +10,7 @@ import java.lang.reflect.InvocationTargetException;
 
 import me.grishka.appkit.imageloader.ImageCache;
 import me.grishka.appkit.utils.NetworkUtils;
+import me.grishka.appkit.utils.V;
 
 public class MastodonApp extends Application{
 
@@ -19,12 +20,13 @@ public class MastodonApp extends Application{
 	@Override
 	public void onCreate(){
 		super.onCreate();
+		context=getApplicationContext();
+		V.setApplicationContext(context);
 		ImageCache.Parameters params=new ImageCache.Parameters();
 		params.diskCacheSize=100*1024*1024;
 		params.maxMemoryCacheSize=Integer.MAX_VALUE;
 		ImageCache.setParams(params);
 		NetworkUtils.setUserAgent("MastodonAndroid/"+BuildConfig.VERSION_NAME);
-		context=getApplicationContext();
 
 		PushSubscriptionManager.tryRegisterFCM();
 		GlobalUserPreferences.load();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 7d8bf5cc8..acc4b55cd 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -109,7 +109,7 @@ public class ComposeFragment extends ToolbarFragment implements OnBackPressedLis
 	private static final Pattern MENTION_PATTERN=Pattern.compile("(^|[^\\/\\w])@(([a-z0-9_]+)@[a-z0-9\\.\\-]+[a-z0-9]+)", Pattern.CASE_INSENSITIVE);
 
 	// from https://github.com/mastodon/mastodon-ios/blob/main/Mastodon/Helper/MastodonRegex.swift
-	private static final Pattern AUTO_COMPLETE_PATTERN=Pattern.compile("(?<!\\w)(?:@([a-zA-Z0-9_]+)(@[a-zA-Z0-9_.-]+)?|#([^\\s.]+))|(^\\B:|\\s:)([a-zA-Z0-9_]+)");
+	private static final Pattern AUTO_COMPLETE_PATTERN=Pattern.compile("(?<!\\w)(?:@([a-zA-Z0-9_]+)(@[a-zA-Z0-9_.-]+)?|#([^\\s.]+)|:([a-zA-Z0-9_]+))");
 	private static final Pattern HIGHLIGHT_PATTERN=Pattern.compile("(?<!\\w)(?:@([a-zA-Z0-9_]+)(@[a-zA-Z0-9_.-]+)?|#([^\\s.]+))");
 
 	private static final String VALID_URL_PATTERN_STRING =
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java
index 368672bc2..2154b2fb1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/ComposeAutocompleteViewController.java
@@ -375,6 +375,8 @@ public class ComposeAutocompleteViewController{
 
 		@Override
 		public ImageLoaderRequest getImageRequest(int position, int image){
+			if(position>=emojis.size())
+				return null;
 			return emojis.get(position).request;
 		}
 	}