Merge branch 'develop'

Author: tagavari

app/build.gradle

@@ -8,7 +8,7 @@ plugins {
 
 	id "com.mikepenz.aboutlibraries.plugin"
 
-	id "com.google.secrets_gradle_plugin" version "0.5"
+	id "com.google.android.libraries.mapsplatform.secrets-gradle-plugin"
 }
 
 secrets {
@@ -52,8 +52,8 @@ android {
 		applicationId "me.tagavari.airmessage"
 		minSdkVersion 23
 		targetSdkVersion 31
-		versionName "3.3.5"
-		versionCode 129
+		versionName "3.3.6"
+		versionCode 130
 
 		resConfigs "en", "fr", "ja"
 
@@ -127,19 +127,19 @@ dependencies {
 	androidTestImplementation "androidx.test:rules:1.4.0"
 
 	//Android extensions
-	implementation "androidx.core:core-ktx:1.6.0"
-	implementation "androidx.activity:activity-ktx:1.3.1"
+	implementation "androidx.core:core-ktx:1.7.0"
+	implementation "androidx.activity:activity-ktx:1.4.0"
 	implementation "androidx.fragment:fragment-ktx:1.3.6"
 	implementation "androidx.preference:preference-ktx:1.1.1"
-	implementation "androidx.browser:browser:1.3.0"
+	implementation "androidx.browser:browser:1.4.0"
 	implementation "androidx.exifinterface:exifinterface:1.3.3"
 	implementation "androidx.security:security-crypto:1.0.0"
 
 	//Material components
 	implementation "com.google.android.material:material:1.4.0"
 
 	//Android architecture components
-	def lifecycle_version = "2.3.1"
+	def lifecycle_version = "2.4.0"
 
 	// ViewModel
 	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
@@ -148,13 +148,18 @@ dependencies {
 	// Lifecycles only (without ViewModel or LiveData)
 	implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
 
+	//WorkManager
+	def work_version = "2.7.0"
+	implementation "androidx.work:work-runtime-ktx:$work_version"
+	implementation "androidx.work:work-rxjava3:$work_version"
+
 	//ReactiveX
 	implementation "io.reactivex.rxjava3:rxandroid:3.0.0"
-	implementation "io.reactivex.rxjava3:rxjava:3.1.1"
+	implementation "io.reactivex.rxjava3:rxjava:3.1.2"
 	implementation "io.reactivex.rxjava3:rxkotlin:3.0.1"
 
 	//Layouts and views
-	implementation "androidx.constraintlayout:constraintlayout:2.1.0"
+	implementation "androidx.constraintlayout:constraintlayout:2.1.1"
 	implementation "androidx.viewpager2:viewpager2:1.0.0"
 	implementation "com.google.android.flexbox:flexbox:3.0.0"
 
@@ -165,7 +170,7 @@ dependencies {
 	implementation "com.google.mlkit:smart-reply:16.2.0"
 
 	//Firebase
-	implementation platform("com.google.firebase:firebase-bom:28.4.0")
+	implementation platform("com.google.firebase:firebase-bom:29.0.0")
 
 	implementation "com.google.firebase:firebase-core"
 	implementation "com.google.firebase:firebase-messaging-ktx"
@@ -174,7 +179,7 @@ dependencies {
 	implementation "com.google.firebase:firebase-crashlytics-ktx"
 
 	//GMS
-	implementation "com.google.android.gms:play-services-maps:17.0.1"
+	implementation "com.google.android.gms:play-services-maps:18.0.0"
 	implementation "com.google.android.gms:play-services-location:18.0.0"
 	implementation "com.google.android.gms:play-services-auth:19.2.0"
 
@@ -183,7 +188,7 @@ dependencies {
 	implementation "com.mikepenz:aboutlibraries:$aboutlibs_version"
 
 	//Tools
-	implementation "com.googlecode.ez-vcard:ez-vcard:0.11.2"
+	implementation "com.googlecode.ez-vcard:ez-vcard:0.11.3"
 
 	//Backend
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
@@ -192,15 +197,15 @@ dependencies {
 	implementation "com.github.bumptech.glide:glide:4.12.0"
 	implementation "jp.wasabeef:glide-transformations:4.3.0"
 
-	implementation "com.google.android.exoplayer:exoplayer-core:2.15.0"
-	implementation "com.google.android.exoplayer:exoplayer-ui:2.15.0"
+	implementation "com.google.android.exoplayer:exoplayer-core:2.16.0"
+	implementation "com.google.android.exoplayer:exoplayer-ui:2.16.0"
 
-	implementation "org.jsoup:jsoup:1.14.2"
+	implementation "org.jsoup:jsoup:1.14.3"
 
 	implementation project(":android-smsmms")
 
 	implementation "org.java-websocket:Java-WebSocket:1.5.2"
-	implementation "com.otaliastudios:transcoder:0.10.3"
+	implementation "com.otaliastudios:transcoder:0.10.4"
 }
 
 repositories {

app/src/main/AndroidManifest.xml

@@ -103,7 +103,7 @@
 			android:theme="@style/DayNight.NoActionBar.Protected"
 			android:windowSoftInputMode="adjustResize|stateVisible">
 			<meta-data android:name="WindowManagerPreference:SuppressWindowControlNavigationButton" android:value="true" />
-	</activity>
+		</activity>
 
 		<!-- Preferences -->
 		<activity

app/src/main/java/me/tagavari/airmessage/MainApplication.java

@@ -9,9 +9,24 @@
 import android.os.Handler;
 import android.os.Process;
 import android.provider.ContactsContract;
+
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.PreferenceManager;
+import androidx.work.ExistingWorkPolicy;
+import androidx.work.OneTimeWorkRequest;
+import androidx.work.OutOfQuotaPolicy;
+import androidx.work.WorkManager;
+
+import com.google.android.gms.maps.MapsInitializer;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.ref.WeakReference;
+import java.security.Security;
+
 import me.tagavari.airmessage.activity.CrashReport;
 import me.tagavari.airmessage.activity.Preferences;
 import me.tagavari.airmessage.data.DatabaseManager;
@@ -22,13 +37,7 @@
 import me.tagavari.airmessage.helper.ThemeHelper;
 import me.tagavari.airmessage.redux.ReduxReceiverNotification;
 import me.tagavari.airmessage.redux.ReduxReceiverShortcut;
-import me.tagavari.airmessage.service.SystemMessageImportService;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.ref.WeakReference;
-import java.security.Security;
+import me.tagavari.airmessage.worker.SystemMessageCleanupWorker;
 
 public class MainApplication extends Application {
 	//Creating the reference values
@@ -113,24 +122,30 @@ public void onCreate() {
 			new ReduxReceiverShortcut(this).initialize();
 		}
 		new ReduxReceiverNotification(this).initialize();
-		
+
 		//Checking if text message integration is not permitted
 		if(!Preferences.isTextMessageIntegrationActive(this)) {
+			boolean cleanUpMessages = false;
 			//Checking if the toggle is enabled (creating an invalid state)
 			if(Preferences.getPreferenceTextMessageIntegration(this)) {
 				//Disabling text message integration
 				Preferences.setPreferenceTextMessageIntegration(this, false);
 
 				//Clearing the database of text messages
-				Intent serviceIntent = new Intent(this, SystemMessageImportService.class).setAction(SystemMessageImportService.selfIntentActionDelete);
-				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) startForegroundService(serviceIntent);
-				else startService(serviceIntent);
+				cleanUpMessages = true;
 			}
 			//Clearing the database of text messages if there are still text messages in the database (in the case that the application is killed before it can clear all its messages)
 			else if(SharedPreferencesManager.getTextMessageConversationsInstalled(this)) {
-				Intent serviceIntent = new Intent(this, SystemMessageImportService.class).setAction(SystemMessageImportService.selfIntentActionDelete);
-				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) startForegroundService(serviceIntent);
-				else startService(serviceIntent);
+				cleanUpMessages = true;
+			}
+
+			if(cleanUpMessages) {
+				OneTimeWorkRequest workRequest = new OneTimeWorkRequest.Builder(SystemMessageCleanupWorker.class)
+						.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+						.build();
+
+				//If this work is already enqueued (likely from our broadcast listener), replace it with our expedited request
+				WorkManager.getInstance(this).enqueueUniqueWork(SystemMessageCleanupWorker.workName, ExistingWorkPolicy.REPLACE, workRequest);
 			}
 		}
 
@@ -140,6 +155,9 @@ else if(SharedPreferencesManager.getTextMessageConversationsInstalled(this)) {
 			Security.removeProvider("BC");
 			int insertionIndex = Security.insertProviderAt(new BouncyCastleProvider(), 1);
 		}
+
+		//Initializing Google Maps
+		MapsInitializer.initialize(getApplicationContext(), MapsInitializer.Renderer.LATEST, null);
 	}
 
 	public static MainApplication getInstance() {

app/src/main/java/me/tagavari/airmessage/activity/MediaViewer.java

@@ -12,7 +12,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowInsetsController;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -27,6 +26,7 @@
 import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
+
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
@@ -35,15 +35,15 @@
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.signature.ObjectKey;
 import com.github.chrisbanes.photoview.PhotoView;
+import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.ui.PlayerView;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
-import com.google.android.exoplayer2.util.Util;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 import me.tagavari.airmessage.R;
 import me.tagavari.airmessage.constants.MIMEConstants;
 import me.tagavari.airmessage.helper.AttachmentStorageHelper;
@@ -52,10 +52,6 @@
 import me.tagavari.airmessage.messaging.AttachmentInfo;
 import me.tagavari.airmessage.view.RoundedFrameLayout;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 public class MediaViewer extends AppCompatActivity {
 	//Creating the constants
 	public static final String intentParamIndex = "index";
@@ -314,7 +310,7 @@ private class RecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 		private Player currentPlayer = null;
 		private final List<AttachmentInfo> itemList;
-		private final List<SimpleExoPlayer> playerList = new ArrayList<>();
+		private final List<ExoPlayer> playerList = new ArrayList<>();
 		private final List<PlayerView> playerViewList = new ArrayList<>();
 
 		RecyclerAdapter(List<AttachmentInfo> itemList) {
@@ -328,7 +324,7 @@ public void pausePlayer() {
 		}
 
 		public void release() {
-			for(SimpleExoPlayer player : playerList) player.release();
+			for(ExoPlayer player : playerList) player.release();
 		}
 
 		public void hideLocalUI() {
@@ -432,13 +428,13 @@ public boolean onResourceReady(Drawable resource, Object model, Target<Drawable>
 		}
 
 		class VideoViewHolder extends RecyclerView.ViewHolder {
-			final SimpleExoPlayer player;
+			final ExoPlayer player;
 
 			VideoViewHolder(@NonNull View itemView) {
 				super(itemView);
 
 				//Creating the player instance
-				player = new SimpleExoPlayer.Builder(MediaViewer.this).build();
+				player = new ExoPlayer.Builder(MediaViewer.this).build();
 
 				//Adding the player to the list
 				playerList.add(player);
@@ -480,9 +476,7 @@ public void onPlayWhenReadyChanged(boolean playWhenReady, int reason) {
 			}
 
 			void playVideo(File file, boolean autoPlay) {
-				DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(MediaViewer.this, Util.getUserAgent(MediaViewer.this, getResources().getString(R.string.app_name)));
-				MediaSource videoSource = new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(MediaItem.fromUri(Uri.fromFile(file)));
-				player.setMediaSource(videoSource);
+				player.setMediaItem(MediaItem.fromUri(Uri.fromFile(file)));
 				player.prepare();
 				player.setPlayWhenReady(autoPlay);
 			}

app/src/main/java/me/tagavari/airmessage/connection/update/RAConversation.java

@@ -5,11 +5,17 @@
 import android.content.Intent;
 import android.os.Build;
 import android.provider.Telephony;
+
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
+import androidx.work.ExistingWorkPolicy;
+import androidx.work.OneTimeWorkRequest;
+import androidx.work.WorkManager;
+
 import me.tagavari.airmessage.activity.Preferences;
 import me.tagavari.airmessage.data.SharedPreferencesManager;
 import me.tagavari.airmessage.service.SystemMessageImportService;
+import me.tagavari.airmessage.worker.SystemMessageCleanupWorker;
 
 @RequiresApi(api = Build.VERSION_CODES.N)
 public class DefaultMessagingAppChangedReceiver extends BroadcastReceiver {
@@ -38,9 +44,10 @@ public void onReceive(Context context, Intent intent) {
 			if(conversationsInstalled) {
 				//Disabling text message integration
 				Preferences.setPreferenceTextMessageIntegration(context, false);
-				
+
 				//Clearing the database of text messages
-				ContextCompat.startForegroundService(context, new Intent(context, SystemMessageImportService.class).setAction(SystemMessageImportService.selfIntentActionDelete));
+				OneTimeWorkRequest workRequest = OneTimeWorkRequest.from(SystemMessageCleanupWorker.class);
+				WorkManager.getInstance(context).enqueueUniqueWork(SystemMessageCleanupWorker.workName, ExistingWorkPolicy.KEEP, workRequest);
 			}
 		}
 	}

app/src/main/java/me/tagavari/airmessage/connection/update/RAConversationRename.java

@@ -206,7 +206,7 @@ private void startConnectionService(RemoteMessage remoteMessage) {
 		 * Android 12 also introduced restrictions as to when a foreground service can be launched from the background,
 		 * so we should check if we are allowed to launch one before doing so.
 		 */
-		if(ConnectionService.getInstance() == null && Build.VERSION.SDK_INT < Build.VERSION_CODES.S || remoteMessage.getPriority() == RemoteMessage.PRIORITY_HIGH) {
+		if(ConnectionService.getInstance() == null && (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || remoteMessage.getPriority() == RemoteMessage.PRIORITY_HIGH)) {
 			ConnectionServiceLaunchHelper.launchTemporary(this);
 		}
 	}