Merge pull request #2685 from BlueBubblesApp/development

v1.13.0 stable
BlueBubblesApp · Feb 24, 2024 · d0257c9 · d0257c9
2 parents 5c0c2d7 + 9ebc639
commit d0257c9
Show file tree

Hide file tree

Showing 291 changed files with 5,293 additions and 6,668 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -33,7 +33,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     namespace "com.bluebubbles.messaging"
-    compileSdkVersion 33
+    compileSdk 34
 
     lintOptions {
         checkReleaseBuilds false
@@ -46,7 +46,7 @@ android {
 
     defaultConfig {
         applicationId "com.bluebubbles.messaging"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 33
         versionCode 20002000 + flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -70,7 +70,7 @@ android {
         }
     }
 
-    flavorDimensions "app"
+    flavorDimensions = ["app"]
 
     productFlavors {
         joel {
@@ -135,7 +135,7 @@ flutter {
     source '../..'
 }
 
-// for cloud firestore okio error
+// For Cloud Firestore okio error
 configurations.all {
     resolutionStrategy {
         force 'com.squareup.okhttp:okhttp:2.7.5'
@@ -144,40 +144,31 @@ configurations.all {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.5.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    implementation 'com.google.firebase:firebase-analytics:21.3.0'
+    // Android native functions
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.core:core:1.10.1"
-    implementation 'androidx.core:core-google-shortcuts:1.1.0'
+    implementation "androidx.core:core-ktx:1.12.0"
     implementation "androidx.sharetarget:sharetarget:1.2.0"
-
-    //for location sending
-    implementation "com.google.android.gms:play-services-location:21.0.1"
-
-    // for album art color
-    implementation 'androidx.palette:palette:1.0.0'
-
-    // Add the SDK for Firebase Cloud Messaging
-    implementation 'com.google.firebase:firebase-messaging:23.2.1'
-    implementation 'com.google.firebase:firebase-analytics:21.3.0'
-    implementation 'com.google.firebase:firebase-database:20.2.2'
-    implementation 'com.google.firebase:firebase-messaging-directboot:23.2.1'
+    implementation 'androidx.browser:browser:1.7.0'
+    implementation 'androidx.activity:activity-ktx:1.8.2'
+    implementation "androidx.work:work-runtime:2.9.0"
+
+    // Firebase items
+    implementation 'com.google.firebase:firebase-messaging:23.4.0'
+    implementation 'com.google.firebase:firebase-database:20.3.0'
+    implementation 'com.google.firebase:firebase-messaging-directboot:23.4.0'
     implementation 'com.google.firebase:firebase-iid:21.1.0'
-    implementation 'com.google.firebase:firebase-firestore:24.7.0'
+    implementation 'com.google.firebase:firebase-firestore:24.10.1'
 
-    //for json string to map
-    implementation 'com.google.code.gson:gson:2.9.0'
+    // Kotlin Coroutines (async)
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3"
 
-    implementation 'com.google.mlkit:smart-reply:17.0.2'
-    implementation 'com.google.mlkit:entity-extraction:16.0.0-beta4'
-
-    // for workmanager
-    implementation "androidx.work:work-runtime:2.7.1"
+    // Socket IO
+    implementation ('io.socket:socket.io-client:2.0.0') {
+        exclude group: 'org.json', module: 'json'
+    }
 
-    // Why won't it fucking compile
-    implementation 'com.google.guava:guava:27.0.1-android'
+    // JSON parsing
+    implementation 'com.google.code.gson:gson:2.10.1'
 }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.bluebubbles.messaging">
-    <uses-sdk android:minSdkVersion="21"
-        android:targetSdkVersion="33" />
     <!--
      io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -31,6 +29,7 @@
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
 
     <!-- Location -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -50,26 +49,41 @@
 
     <!-- Permission added by external package - remove it here -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" tools:node="remove" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" />
 
     <application
         tools:replace="android:label"
         android:allowBackup="false"
-        android:name=".Application"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name_en"
         android:appCategory="social"
         android:requestLegacyExternalStorage="true"
         android:debuggable="false"
-        android:usesCleartextTraffic="true">
-        <receiver android:name=".services.ReplyReceiver" />
+        android:usesCleartextTraffic="true"
+        android:extractNativeLibs="true">
+
+        <receiver android:name=".services.intents.InternalIntentReceiver" />
+
         <receiver
-            android:name=".services.ExternalIntentReceiver"
+            android:name=".services.intents.ExternalIntentReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.bluebubbles.external.GET_SERVER_URL" />
             </intent-filter>
         </receiver>
 
+        <receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ActionBroadcastReceiver" />
+        <receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
+        <receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
+            </intent-filter>
+        </receiver>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="@string/file_provider"
@@ -81,7 +95,7 @@
         </provider>
 
         <service
-            android:name=".services.FirebaseMessagingService"
+            android:name=".services.firebase.BlueBubblesFirebaseMessagingService"
             android:directBootAware="true"
             android:exported="false"
             android:stopWithTask="false">
@@ -92,12 +106,7 @@
             </intent-filter>
         </service>
 
-        <service
-            android:name=".services.FlutterFirebaseMessagingBackgroundService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="false"/>
-
-        <service android:name=".services.CustomNotificationListenerService"
+        <service android:name=".services.notifications.NotificationListener"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
             android:exported="false">
             <intent-filter>

diff --git a/android/app/src/main/java/com/bluebubbles/messaging/Application.java b/android/app/src/main/java/com/bluebubbles/messaging/Application.java
diff --git a/android/app/src/main/java/com/bluebubbles/messaging/BubbleActivity.java b/android/app/src/main/java/com/bluebubbles/messaging/BubbleActivity.java