fix: Non FCM Android builds crash on start

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled.
 
 version:
-  revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+  revision: 85684f9300908116a78138ea4c6036c35c9a1236
   channel: stable
 
 project_type: app
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
     - platform: android
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
     - platform: ios
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
     - platform: linux
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
     - platform: macos
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
     - platform: web
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
     - platform: windows
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
 
   # User provided section
 

android/.gitignore

@@ -5,3 +5,9 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
+**/*.keystore
+**/*.jks

android/app/src/debug/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="chat.fluffy.fluffychat">
-    <!-- Flutter needs it to communicate with the running application
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

android/app/src/profile/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="chat.fluffy.fluffychat">
-    <!-- Flutter needs it to communicate with the running application
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

android/build.gradle

@@ -2,11 +2,11 @@ buildscript {
     ext.kotlin_version = '1.6.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         //classpath 'com.google.gms:google-services:4.3.8'
     }
@@ -15,7 +15,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

android/gradle.properties

@@ -1,5 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8.fullMode=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

android/settings.gradle

@@ -1,15 +1,11 @@
 include ':app'
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+def properties = new Properties()
 
-def plugins = new Properties()
+assert localPropertiesFile.exists()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
+localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
-}
 
-plugins.each { name, path ->
+def flutterSdkPath = properties.getProperty("flutter.sdk")
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
+assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-    include ":$name"
+apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
-    project(":$name").projectDir = pluginDirectory
-}

android/settings_aar.gradle

@@ -1 +0,0 @@
-include ':app'

pubspec.lock

@@ -1884,7 +1884,7 @@ packages:
       name: video_compress
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
   video_player:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -82,7 +82,7 @@ dependencies:
   unifiedpush: ^4.0.0
   universal_html: ^2.0.8
   url_launcher: ^6.0.20
-  video_compress: ^3.1.0
+  video_compress: ^3.1.1
   video_player: ^2.2.18
   vrouter: ^1.2.0+21
   wakelock: ^0.6.1+1

scripts/enable-android-google-services.patch

@@ -124,7 +124,7 @@ index 85aa8647..3b7e09e7 100644
 +++ b/android/build.gradle
 @@ -8,7 +8,7 @@ buildscript {
      dependencies {
-         classpath 'com.android.tools.build:gradle:4.2.1'
+         classpath 'com.android.tools.build:gradle:7.1.2'
          classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 -        //classpath 'com.google.gms:google-services:4.3.8'
 +        classpath 'com.google.gms:google-services:4.3.8'