diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env index 30e7fdfb8..88d7d41ea 100644 --- a/.github/workflows/versions.env +++ b/.github/workflows/versions.env @@ -1,2 +1,2 @@ FLUTTER_VERSION=3.13.7 -JAVA_VERSION=17 \ No newline at end of file +JAVA_VERSION=17 diff --git a/CHANGELOG.md b/CHANGELOG.md index 69dd95a8c..36b24f572 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -899,7 +899,7 @@ This release fixes a bug which makes it impossible to send images in unencrypted - fix: Open matrix.to urls - fix: Padding and colors - fix: Sharing invite link -- fix: Unread bubbles on iOS +- fix: Unread bubbles on iOS - fix: Sending images in unencrypted rooms ## v0.38.0 - 2021-08-22 diff --git a/Dockerfile b/Dockerfile index 7a696ce54..6bc5498cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ RUN flutter build web --release --source-maps FROM docker.io/nginx:alpine RUN rm -rf /usr/share/nginx/html -COPY --from=builder /app/build/web /usr/share/nginx/html \ No newline at end of file +COPY --from=builder /app/build/web /usr/share/nginx/html diff --git a/android/app/google-services.json b/android/app/google-services.json index e33988c40..5f7899b9e 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -43,4 +43,4 @@ } ], "configuration_version": "1" -} \ No newline at end of file +} diff --git a/android/app/src/main/res/drawable-night-v21/launch_background.xml b/android/app/src/main/res/drawable-night-v21/launch_background.xml index 3fe6b2e88..3cc4948a1 100644 --- a/android/app/src/main/res/drawable-night-v21/launch_background.xml +++ b/android/app/src/main/res/drawable-night-v21/launch_background.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable-night/launch_background.xml b/android/app/src/main/res/drawable-night/launch_background.xml index 3fe6b2e88..3cc4948a1 100644 --- a/android/app/src/main/res/drawable-night/launch_background.xml +++ b/android/app/src/main/res/drawable-night/launch_background.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml index 3fe6b2e88..3cc4948a1 100644 --- a/android/app/src/main/res/drawable-v21/launch_background.xml +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 3fe6b2e88..3cc4948a1 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 1084c2408..10bc7a5de 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml index 7c806c658..8a7dbd02b 100644 --- a/android/app/src/main/res/values-night/styles.xml +++ b/android/app/src/main/res/values-night/styles.xml @@ -11,9 +11,9 @@ This theme determines the color of the Android Window while your Flutter UI initializes, as well as behind your Flutter UI while its running. - + This Theme is only used starting with V2 of Flutter's Android embedding. --> - \ No newline at end of file + diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml index c5d5899fd..f42ada656 100644 --- a/android/app/src/main/res/values/ic_launcher_background.xml +++ b/android/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ #FFFFFF - \ No newline at end of file + diff --git a/android/fastlane/metadata/android/en-US/changelogs/2324 (1.6.0).txt b/android/fastlane/metadata/android/en-US/changelogs/2324 (1.6.0).txt index b2318505f..6eaf78d9e 100644 --- a/android/fastlane/metadata/android/en-US/changelogs/2324 (1.6.0).txt +++ b/android/fastlane/metadata/android/en-US/changelogs/2324 (1.6.0).txt @@ -65,4 +65,4 @@ the space hierarchy and session dump have been implemented. - chore: Remove permission handler dependency and increase compileSdkVersion (Christian Pauly) - chore: Switch to flutter 3.0.5 (Krille Fear) - chore: Update SDK (Christian Pauly) -- chore: remove snapping sheet (TheOneWithTheBraid) \ No newline at end of file +- chore: remove snapping sheet (TheOneWithTheBraid) diff --git a/android/fastlane/metadata/android/en-US/full_description.txt b/android/fastlane/metadata/android/en-US/full_description.txt index 2824f2cba..723c4227b 100644 --- a/android/fastlane/metadata/android/en-US/full_description.txt +++ b/android/fastlane/metadata/android/en-US/full_description.txt @@ -7,7 +7,7 @@ Nonprofit FluffyChat is donation funded. Cute ♥ -Cute design and many theme settings including a dark mode. +Cute design and many theme settings including a dark mode. One-to-one and groupchats Unlimited groups and direct chats. diff --git a/android/fastlane/metadata/android/en-US/short_description.txt b/android/fastlane/metadata/android/en-US/short_description.txt index 6d45532e9..c58e660bb 100644 --- a/android/fastlane/metadata/android/en-US/short_description.txt +++ b/android/fastlane/metadata/android/en-US/short_description.txt @@ -1 +1 @@ -Chat with your friends with FluffyChat. \ No newline at end of file +Chat with your friends with FluffyChat. diff --git a/android/fastlane/metadata/android/en-US/title.txt b/android/fastlane/metadata/android/en-US/title.txt index df1e0546e..39a69f07f 100644 --- a/android/fastlane/metadata/android/en-US/title.txt +++ b/android/fastlane/metadata/android/en-US/title.txt @@ -1 +1 @@ -FluffyChat \ No newline at end of file +FluffyChat diff --git a/android/fastlane/report.xml b/android/fastlane/report.xml index 96f7a8a63..4a3924d47 100644 --- a/android/fastlane/report.xml +++ b/android/fastlane/report.xml @@ -1,23 +1,23 @@ - - - - + + + + - + - - + + - + - - + + - + - + diff --git a/appimage/AppRun b/appimage/AppRun index 95b7c0568..b0204217c 100755 --- a/appimage/AppRun +++ b/appimage/AppRun @@ -1,4 +1,4 @@ #!/bin/sh cd "$(dirname "$0")" -exec ./fluffychat \ No newline at end of file +exec ./fluffychat diff --git a/appimage/FluffyChat.desktop b/appimage/FluffyChat.desktop index ceee4c91d..d56f8601e 100644 --- a/appimage/FluffyChat.desktop +++ b/appimage/FluffyChat.desktop @@ -6,4 +6,4 @@ Comment=Matrix Client. Chat with your friends Exec=AppRun Icon=fluffychat Terminal=false -Categories=Network;Chat;InstantMessaging;X-Matrix; \ No newline at end of file +Categories=Network;Chat;InstantMessaging;X-Matrix; diff --git a/assets/l10n/intl_bn.arb b/assets/l10n/intl_bn.arb index fedac9000..8d51695ff 100644 --- a/assets/l10n/intl_bn.arb +++ b/assets/l10n/intl_bn.arb @@ -22,4 +22,4 @@ "type": "text", "placeholders": {} } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_bo.arb b/assets/l10n/intl_bo.arb index 9e26dfeeb..0967ef424 100644 --- a/assets/l10n/intl_bo.arb +++ b/assets/l10n/intl_bo.arb @@ -1 +1 @@ -{} \ No newline at end of file +{} diff --git a/assets/l10n/intl_ca.arb b/assets/l10n/intl_ca.arb index 89427e877..0a331c3d3 100644 --- a/assets/l10n/intl_ca.arb +++ b/assets/l10n/intl_ca.arb @@ -2013,4 +2013,4 @@ "type": "text", "placeholders": {} } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_eo.arb b/assets/l10n/intl_eo.arb index 523374e4b..120ba639d 100644 --- a/assets/l10n/intl_eo.arb +++ b/assets/l10n/intl_eo.arb @@ -2033,4 +2033,4 @@ "@homeserver": {}, "sendOnEnter": "Sendi per eniga klavo", "@sendOnEnter": {} -} \ No newline at end of file +} diff --git a/assets/l10n/intl_ga.arb b/assets/l10n/intl_ga.arb index e2a68cbeb..e5ef67f6c 100644 --- a/assets/l10n/intl_ga.arb +++ b/assets/l10n/intl_ga.arb @@ -2098,4 +2098,4 @@ "type": "text", "placeholders": {} } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_he.arb b/assets/l10n/intl_he.arb index 3ebece5d2..b9042bed6 100644 --- a/assets/l10n/intl_he.arb +++ b/assets/l10n/intl_he.arb @@ -1409,4 +1409,4 @@ "type": "text", "placeholders": {} } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_hi.arb b/assets/l10n/intl_hi.arb index 9e26dfeeb..0967ef424 100644 --- a/assets/l10n/intl_hi.arb +++ b/assets/l10n/intl_hi.arb @@ -1 +1 @@ -{} \ No newline at end of file +{} diff --git a/assets/l10n/intl_hu.arb b/assets/l10n/intl_hu.arb index e4f5f83c5..5d15e9471 100644 --- a/assets/l10n/intl_hu.arb +++ b/assets/l10n/intl_hu.arb @@ -2003,4 +2003,4 @@ "type": "text", "placeholders": {} } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_ie.arb b/assets/l10n/intl_ie.arb index 470f5cd25..13f15b517 100644 --- a/assets/l10n/intl_ie.arb +++ b/assets/l10n/intl_ie.arb @@ -1210,4 +1210,4 @@ "min": {} } } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_it.arb b/assets/l10n/intl_it.arb index a058dd068..d46cefc0c 100644 --- a/assets/l10n/intl_it.arb +++ b/assets/l10n/intl_it.arb @@ -1967,4 +1967,4 @@ }, "yourChatBackupHasBeenSetUp": "Il tuo backup delle chat è stato configurato.", "@yourChatBackupHasBeenSetUp": {} -} \ No newline at end of file +} diff --git a/assets/l10n/intl_ko.arb b/assets/l10n/intl_ko.arb index 4fd9fe4cf..2b3f4a2d3 100644 --- a/assets/l10n/intl_ko.arb +++ b/assets/l10n/intl_ko.arb @@ -2233,4 +2233,4 @@ "@dehydrate": {}, "dehydrateWarning": "이 동작은 되돌릴 수 없습니다. 백업 파일을 꼭 안전하게 보관하세요.", "@dehydrateWarning": {} -} \ No newline at end of file +} diff --git a/assets/l10n/intl_lt.arb b/assets/l10n/intl_lt.arb index bec00b0eb..b9c1c9910 100644 --- a/assets/l10n/intl_lt.arb +++ b/assets/l10n/intl_lt.arb @@ -2405,4 +2405,4 @@ }, "hideUnimportantStateEvents": "Slėpti nesvarbius būsenos įvykius", "@hideUnimportantStateEvents": {} -} \ No newline at end of file +} diff --git a/assets/l10n/intl_nb.arb b/assets/l10n/intl_nb.arb index da9120355..d93016533 100644 --- a/assets/l10n/intl_nb.arb +++ b/assets/l10n/intl_nb.arb @@ -1780,4 +1780,4 @@ "type": "text", "placeholders": {} } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_pt.arb b/assets/l10n/intl_pt.arb index 49312de13..402cfac58 100644 --- a/assets/l10n/intl_pt.arb +++ b/assets/l10n/intl_pt.arb @@ -117,4 +117,4 @@ "day": {} } } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_pt_PT.arb b/assets/l10n/intl_pt_PT.arb index cd99918f7..a6f4c9f3b 100644 --- a/assets/l10n/intl_pt_PT.arb +++ b/assets/l10n/intl_pt_PT.arb @@ -1685,4 +1685,4 @@ "@hydrateTor": {}, "dehydrateTorLong": "Para utilizadores do TOR, é recomendado exportar a sessão antes de fechar a janela.", "@dehydrateTorLong": {} -} \ No newline at end of file +} diff --git a/assets/l10n/intl_sl.arb b/assets/l10n/intl_sl.arb index d450ec2e2..aed5879c2 100644 --- a/assets/l10n/intl_sl.arb +++ b/assets/l10n/intl_sl.arb @@ -603,4 +603,4 @@ "type": "text", "placeholders": {} } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_sr.arb b/assets/l10n/intl_sr.arb index a2210c7f5..0024df8da 100644 --- a/assets/l10n/intl_sr.arb +++ b/assets/l10n/intl_sr.arb @@ -1930,4 +1930,4 @@ "type": "text", "placeholders": {} } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_sv.arb b/assets/l10n/intl_sv.arb index afe99a2fc..eb2164ee5 100644 --- a/assets/l10n/intl_sv.arb +++ b/assets/l10n/intl_sv.arb @@ -2486,4 +2486,4 @@ "path": {} } } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_ta.arb b/assets/l10n/intl_ta.arb index 8befa5210..609e1c89c 100644 --- a/assets/l10n/intl_ta.arb +++ b/assets/l10n/intl_ta.arb @@ -17,4 +17,4 @@ "type": "text", "placeholders": {} } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_th.arb b/assets/l10n/intl_th.arb index 9e26dfeeb..0967ef424 100644 --- a/assets/l10n/intl_th.arb +++ b/assets/l10n/intl_th.arb @@ -1 +1 @@ -{} \ No newline at end of file +{} diff --git a/assets/l10n/intl_vi.arb b/assets/l10n/intl_vi.arb index 072271a81..6c3d0a2ee 100644 --- a/assets/l10n/intl_vi.arb +++ b/assets/l10n/intl_vi.arb @@ -449,4 +449,4 @@ "type": "text", "placeholders": {} } -} \ No newline at end of file +} diff --git a/assets/l10n/intl_zh_Hant.arb b/assets/l10n/intl_zh_Hant.arb index 7cadeeb3d..9dbc835a9 100644 --- a/assets/l10n/intl_zh_Hant.arb +++ b/assets/l10n/intl_zh_Hant.arb @@ -1916,4 +1916,4 @@ "@chatHasBeenAddedToThisSpace": {}, "clearArchive": "清除存檔", "@clearArchive": {} -} \ No newline at end of file +} diff --git a/assets/sas-emoji.json b/assets/sas-emoji.json index f0eb702cf..06e1e4b3f 100644 --- a/assets/sas-emoji.json +++ b/assets/sas-emoji.json @@ -2175,4 +2175,4 @@ "zh_Hans": "图钉" } } -] \ No newline at end of file +] diff --git a/config.sample.json b/config.sample.json index ff37ec238..d440d01d8 100644 --- a/config.sample.json +++ b/config.sample.json @@ -7,4 +7,4 @@ "render_html": false, "hide_redacted_events": false, "hide_unknown_events": false -} \ No newline at end of file +} diff --git a/docs/OFL.txt b/docs/OFL.txt index 77b17316c..de3c0b85b 100644 --- a/docs/OFL.txt +++ b/docs/OFL.txt @@ -16,7 +16,7 @@ with others. The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, +fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The diff --git a/docs/index.html b/docs/index.html index edfb771d0..4114cf2e8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -116,4 +116,4 @@

- \ No newline at end of file + diff --git a/docs/tailwind.config.js b/docs/tailwind.config.js index 2991816a3..a9e987c77 100644 --- a/docs/tailwind.config.js +++ b/docs/tailwind.config.js @@ -11,4 +11,3 @@ module.exports = { }, plugins: [], } - \ No newline at end of file diff --git a/fdroid/.gitignore b/fdroid/.gitignore index 5b807a9c7..990769982 100644 --- a/fdroid/.gitignore +++ b/fdroid/.gitignore @@ -1,4 +1,4 @@ repo srclibs tmp -chat.fluffy.fluffychat \ No newline at end of file +chat.fluffy.fluffychat diff --git a/fdroid/metadata/chat.fluffy.fluffychat.yml b/fdroid/metadata/chat.fluffy.fluffychat.yml index 32ffd4a90..8f83ecc26 100644 --- a/fdroid/metadata/chat.fluffy.fluffychat.yml +++ b/fdroid/metadata/chat.fluffy.fluffychat.yml @@ -20,7 +20,7 @@ Description: | FluffyChat is donation funded. Cute ♥ - Cute design and many theme settings including a dark mode. + Cute design and many theme settings including a dark mode. One-to-one and groupchats Unlimited groups and direct chats. diff --git a/integration_test/.gitignore b/integration_test/.gitignore index 3284fe008..ba4f8bb81 100644 --- a/integration_test/.gitignore +++ b/integration_test/.gitignore @@ -3,4 +3,4 @@ dendrite/data/server.* dendrite/data/matrix_key.pem dendrite/data/logs dendrite/data/jetstream -dendrite/data/*.db \ No newline at end of file +dendrite/data/*.db diff --git a/integration_test/dendrite/data/dendrite.yaml b/integration_test/dendrite/data/dendrite.yaml index f1e95fd4b..122727f08 100644 --- a/integration_test/dendrite/data/dendrite.yaml +++ b/integration_test/dendrite/data/dendrite.yaml @@ -226,7 +226,7 @@ federation_api: media_api: database: connection_string: file:media_api.db - + # Storage path for uploaded media. May be relative or absolute. base_path: ./media_store @@ -277,7 +277,7 @@ key_server: room_server: database: connection_string: file:room_server.db - + # Configuration for the User API. user_api: @@ -324,4 +324,3 @@ logging: level: info params: path: ./logs - diff --git a/integration_test/synapse/data/localhost.log.config b/integration_test/synapse/data/localhost.log.config index eeec5edfd..ae1b172bd 100644 --- a/integration_test/synapse/data/localhost.log.config +++ b/integration_test/synapse/data/localhost.log.config @@ -24,4 +24,4 @@ root: handlers: [console] -disable_existing_loggers: false \ No newline at end of file +disable_existing_loggers: false diff --git a/ios/FluffyChat Share/ShareViewController.swift b/ios/FluffyChat Share/ShareViewController.swift index 96d921432..651637ade 100644 --- a/ios/FluffyChat Share/ShareViewController.swift +++ b/ios/FluffyChat Share/ShareViewController.swift @@ -332,4 +332,4 @@ extension Array { subscript (safe index: UInt) -> Element? { return Int(index) < count ? self[Int(index)] : nil } -} \ No newline at end of file +} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md index 89c2725b7..b5b843ad3 100644 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -2,4 +2,4 @@ You can customize the launch screen with your own desired assets by replacing the image files in this directory. -You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard index fdc5a5e56..dd54b26bd 100644 --- a/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -41,4 +41,4 @@ - \ No newline at end of file + diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist index 917ea3b2d..ce888c415 100644 --- a/ios/Runner/GoogleService-Info.plist +++ b/ios/Runner/GoogleService-Info.plist @@ -31,4 +31,4 @@ GOOGLE_APP_ID 1:865731724731:ios:79fd983ce46cb40c64309e - \ No newline at end of file + diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h index 7335fdf90..308a2a560 100644 --- a/ios/Runner/Runner-Bridging-Header.h +++ b/ios/Runner/Runner-Bridging-Header.h @@ -1 +1 @@ -#import "GeneratedPluginRegistrant.h" \ No newline at end of file +#import "GeneratedPluginRegistrant.h" diff --git a/ios/Runner/ar.lproj/LaunchScreen.strings b/ios/Runner/ar.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/ar.lproj/LaunchScreen.strings +++ b/ios/Runner/ar.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/ar.lproj/Main.strings b/ios/Runner/ar.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/ar.lproj/Main.strings +++ b/ios/Runner/ar.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/ca.lproj/LaunchScreen.strings b/ios/Runner/ca.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/ca.lproj/LaunchScreen.strings +++ b/ios/Runner/ca.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/ca.lproj/Main.strings b/ios/Runner/ca.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/ca.lproj/Main.strings +++ b/ios/Runner/ca.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/cs.lproj/LaunchScreen.strings b/ios/Runner/cs.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/cs.lproj/LaunchScreen.strings +++ b/ios/Runner/cs.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/cs.lproj/Main.strings b/ios/Runner/cs.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/cs.lproj/Main.strings +++ b/ios/Runner/cs.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/de.lproj/LaunchScreen.strings b/ios/Runner/de.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/de.lproj/LaunchScreen.strings +++ b/ios/Runner/de.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/de.lproj/Main.strings b/ios/Runner/de.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/de.lproj/Main.strings +++ b/ios/Runner/de.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/eo.lproj/LaunchScreen.strings b/ios/Runner/eo.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/eo.lproj/LaunchScreen.strings +++ b/ios/Runner/eo.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/eo.lproj/Main.strings b/ios/Runner/eo.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/eo.lproj/Main.strings +++ b/ios/Runner/eo.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/es.lproj/LaunchScreen.strings b/ios/Runner/es.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/es.lproj/LaunchScreen.strings +++ b/ios/Runner/es.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/es.lproj/Main.strings b/ios/Runner/es.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/es.lproj/Main.strings +++ b/ios/Runner/es.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/et.lproj/LaunchScreen.strings b/ios/Runner/et.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/et.lproj/LaunchScreen.strings +++ b/ios/Runner/et.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/et.lproj/Main.strings b/ios/Runner/et.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/et.lproj/Main.strings +++ b/ios/Runner/et.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/eu.lproj/LaunchScreen.strings b/ios/Runner/eu.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/eu.lproj/LaunchScreen.strings +++ b/ios/Runner/eu.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/eu.lproj/Main.strings b/ios/Runner/eu.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/eu.lproj/Main.strings +++ b/ios/Runner/eu.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/fr.lproj/LaunchScreen.strings b/ios/Runner/fr.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/fr.lproj/LaunchScreen.strings +++ b/ios/Runner/fr.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/fr.lproj/Main.strings b/ios/Runner/fr.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/fr.lproj/Main.strings +++ b/ios/Runner/fr.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/gl.lproj/LaunchScreen.strings b/ios/Runner/gl.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/gl.lproj/LaunchScreen.strings +++ b/ios/Runner/gl.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/gl.lproj/Main.strings b/ios/Runner/gl.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/gl.lproj/Main.strings +++ b/ios/Runner/gl.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/hr-HR.lproj/LaunchScreen.strings b/ios/Runner/hr-HR.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/hr-HR.lproj/LaunchScreen.strings +++ b/ios/Runner/hr-HR.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/hr-HR.lproj/Main.strings b/ios/Runner/hr-HR.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/hr-HR.lproj/Main.strings +++ b/ios/Runner/hr-HR.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/hu-HU.lproj/LaunchScreen.strings b/ios/Runner/hu-HU.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/hu-HU.lproj/LaunchScreen.strings +++ b/ios/Runner/hu-HU.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/hu-HU.lproj/Main.strings b/ios/Runner/hu-HU.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/hu-HU.lproj/Main.strings +++ b/ios/Runner/hu-HU.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/hu.lproj/LaunchScreen.strings b/ios/Runner/hu.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/hu.lproj/LaunchScreen.strings +++ b/ios/Runner/hu.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/hu.lproj/Main.strings b/ios/Runner/hu.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/hu.lproj/Main.strings +++ b/ios/Runner/hu.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/hy.lproj/LaunchScreen.strings b/ios/Runner/hy.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/hy.lproj/LaunchScreen.strings +++ b/ios/Runner/hy.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/hy.lproj/Main.strings b/ios/Runner/hy.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/hy.lproj/Main.strings +++ b/ios/Runner/hy.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/it.lproj/LaunchScreen.strings b/ios/Runner/it.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/it.lproj/LaunchScreen.strings +++ b/ios/Runner/it.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/it.lproj/Main.strings b/ios/Runner/it.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/it.lproj/Main.strings +++ b/ios/Runner/it.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/ja.lproj/LaunchScreen.strings b/ios/Runner/ja.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/ja.lproj/LaunchScreen.strings +++ b/ios/Runner/ja.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/ja.lproj/Main.strings b/ios/Runner/ja.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/ja.lproj/Main.strings +++ b/ios/Runner/ja.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/nb-NO.lproj/LaunchScreen.strings b/ios/Runner/nb-NO.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/nb-NO.lproj/LaunchScreen.strings +++ b/ios/Runner/nb-NO.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/nb-NO.lproj/Main.strings b/ios/Runner/nb-NO.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/nb-NO.lproj/Main.strings +++ b/ios/Runner/nb-NO.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/pl.lproj/LaunchScreen.strings b/ios/Runner/pl.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/pl.lproj/LaunchScreen.strings +++ b/ios/Runner/pl.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/pl.lproj/Main.strings b/ios/Runner/pl.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/pl.lproj/Main.strings +++ b/ios/Runner/pl.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/pt.lproj/LaunchScreen.strings b/ios/Runner/pt.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/pt.lproj/LaunchScreen.strings +++ b/ios/Runner/pt.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/pt.lproj/Main.strings b/ios/Runner/pt.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/pt.lproj/Main.strings +++ b/ios/Runner/pt.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/ru-RU.lproj/LaunchScreen.strings b/ios/Runner/ru-RU.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/ru-RU.lproj/LaunchScreen.strings +++ b/ios/Runner/ru-RU.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/ru-RU.lproj/Main.strings b/ios/Runner/ru-RU.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/ru-RU.lproj/Main.strings +++ b/ios/Runner/ru-RU.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/sk-SK.lproj/LaunchScreen.strings b/ios/Runner/sk-SK.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/sk-SK.lproj/LaunchScreen.strings +++ b/ios/Runner/sk-SK.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/sk-SK.lproj/Main.strings b/ios/Runner/sk-SK.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/sk-SK.lproj/Main.strings +++ b/ios/Runner/sk-SK.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/sv-SE.lproj/LaunchScreen.strings b/ios/Runner/sv-SE.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/sv-SE.lproj/LaunchScreen.strings +++ b/ios/Runner/sv-SE.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/sv-SE.lproj/Main.strings b/ios/Runner/sv-SE.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/sv-SE.lproj/Main.strings +++ b/ios/Runner/sv-SE.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/tr.lproj/LaunchScreen.strings b/ios/Runner/tr.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/tr.lproj/LaunchScreen.strings +++ b/ios/Runner/tr.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/tr.lproj/Main.strings b/ios/Runner/tr.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/tr.lproj/Main.strings +++ b/ios/Runner/tr.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/uk.lproj/LaunchScreen.strings b/ios/Runner/uk.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/uk.lproj/LaunchScreen.strings +++ b/ios/Runner/uk.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/uk.lproj/Main.strings b/ios/Runner/uk.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/uk.lproj/Main.strings +++ b/ios/Runner/uk.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/vi-VN.lproj/LaunchScreen.strings b/ios/Runner/vi-VN.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/vi-VN.lproj/LaunchScreen.strings +++ b/ios/Runner/vi-VN.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/vi-VN.lproj/Main.strings b/ios/Runner/vi-VN.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/vi-VN.lproj/Main.strings +++ b/ios/Runner/vi-VN.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/zh-Hans.lproj/LaunchScreen.strings b/ios/Runner/zh-Hans.lproj/LaunchScreen.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/zh-Hans.lproj/LaunchScreen.strings +++ b/ios/Runner/zh-Hans.lproj/LaunchScreen.strings @@ -1 +0,0 @@ - diff --git a/ios/Runner/zh-Hans.lproj/Main.strings b/ios/Runner/zh-Hans.lproj/Main.strings index 8b1378917..e69de29bb 100644 --- a/ios/Runner/zh-Hans.lproj/Main.strings +++ b/ios/Runner/zh-Hans.lproj/Main.strings @@ -1 +0,0 @@ - diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml index aa3917be7..0b901c71f 100644 --- a/ios/fastlane/report.xml +++ b/ios/fastlane/report.xml @@ -1,28 +1,28 @@ - - - - + + + + - + - - + + - + - - + + - + - - + + - + - + diff --git a/linux/my_application.cc b/linux/my_application.cc index 269a85872..77ce8b97e 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -30,7 +30,7 @@ static void my_application_activate(GApplication* application) { gboolean use_header_bar = TRUE; // Lines added to the template start // Please re-add these lines after updating the linux build files - // If the user explicitly requests to disable the header bar, switch back to + // If the user explicitly requests to disable the header bar, switch back to // using a traditional title bar const gchar* gtk_csd_env = g_getenv("GTK_CSD"); if (gtk_csd_env != nullptr && g_strcmp0(gtk_csd_env, "1") != 0) diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index eba1335b9..0eaf115df 100644 --- a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1 +1 @@ -{"images":[{"size":"1024x1024","filename":"1024-mac.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]} \ No newline at end of file +{"images":[{"size":"1024x1024","filename":"1024-mac.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]} diff --git a/scripts/build-ios.sh b/scripts/build-ios.sh index 7fd791b5e..a0e31a041 100755 --- a/scripts/build-ios.sh +++ b/scripts/build-ios.sh @@ -6,7 +6,7 @@ FLUFFYCHAT_ORIG_TEAM="4NXF6Z997G" #FLUFFYCHAT_NEW_TEAM="ABCDE12345" # In some cases (ie: running beta XCode releases) some pods haven't updated their minimum version -# but XCode will reject the package for using too old of a minimum version. +# but XCode will reject the package for using too old of a minimum version. # This will fix that, but. Well. Use at your own risk. # export I_PROMISE_IM_REALLY_SMART=1 diff --git a/scripts/build-macos.sh b/scripts/build-macos.sh index 11d3e4a09..3e7b4b3f3 100755 --- a/scripts/build-macos.sh +++ b/scripts/build-macos.sh @@ -6,7 +6,7 @@ FLUFFYCHAT_ORIG_TEAM="4NXF6Z997G" #FLUFFYCHAT_NEW_TEAM="ABCDE12345" # In some cases (ie: running beta XCode releases) some pods haven't updated their minimum version -# but XCode will reject the package for using too old of a minimum version. +# but XCode will reject the package for using too old of a minimum version. # This will fix that, but. Well. Use at your own risk. # export I_PROMISE_IM_REALLY_SMART=1 diff --git a/scripts/build-olm-windows.sh b/scripts/build-olm-windows.sh index 003b98eeb..831e39a3d 100755 --- a/scripts/build-olm-windows.sh +++ b/scripts/build-olm-windows.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -git clone https://gitlab.matrix.org/matrix-org/olm.git -b 3.2.12 +git clone https://gitlab.matrix.org/matrix-org/olm.git -b 3.2.12 cd olm cmake . -Bbuild -DCMAKE_TOOLCHAIN_FILE=Windows64.cmake cmake --build build diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1 index 0c02f80cb..998b5ba10 100644 --- a/scripts/build-windows.ps1 +++ b/scripts/build-windows.ps1 @@ -4,4 +4,3 @@ flutter clean flutter pub get flutter build windows --release -v - diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch index ab4ec8a6a..be4d0698f 100644 --- a/scripts/enable-android-google-services.patch +++ b/scripts/enable-android-google-services.patch @@ -14,7 +14,7 @@ index 001fbd72..339b35af 100644 } } @@ -78,8 +82,11 @@ flutter { - + dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 @@ -24,7 +24,7 @@ index 001fbd72..339b35af 100644 + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' implementation 'androidx.multidex:multidex:2.0.1' } - + -//apply plugin: 'com.google.gms.google-services' +apply plugin: 'com.google.gms.google-services' diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro @@ -82,9 +82,9 @@ index d9930f55..510e9845 100644 @@ -1,4 +1,4 @@ -/*package chat.fluffy.fluffychat +package chat.fluffy.fluffychat - + import com.famedly.fcm_shared_isolate.FcmSharedIsolateService - + @@ -33,4 +33,3 @@ class FcmPushService : FcmSharedIsolateService() { } } @@ -97,14 +97,14 @@ index 1afc4606..894d1571 100644 +++ b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt @@ -7,13 +7,11 @@ import android.content.Context import androidx.multidex.MultiDex - + class MainActivity : FlutterActivity() { - override fun attachBaseContext(base: Context) { super.attachBaseContext(base) MultiDex.install(this) } - + - override fun provideFlutterEngine(context: Context): FlutterEngine? { return provideEngine(this) @@ -121,7 +121,7 @@ index 85aa8647..3b7e09e7 100644 + classpath 'com.google.gms:google-services:4.3.8' } } - + diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index cd79b0ab..c2db0f1e 100644 --- a/lib/utils/background_push.dart @@ -129,21 +129,21 @@ index cd79b0ab..c2db0f1e 100644 @@ -39,7 +39,7 @@ import '../config/setting_keys.dart'; import 'famedlysdk_store.dart'; import 'platform_infos.dart'; - + -//import 'package:fcm_shared_isolate/fcm_shared_isolate.dart'; +import 'package:fcm_shared_isolate/fcm_shared_isolate.dart'; - + class NoTokenException implements Exception { String get cause => 'Cannot get firebase token'; @@ -65,7 +65,7 @@ class BackgroundPush { - + final pendingTests = >{}; - + - final dynamic firebase = null; //FcmSharedIsolate(); + final dynamic firebase = FcmSharedIsolate(); - + DateTime? lastReceivedPush; - + diff --git a/pubspec.yaml b/pubspec.yaml index 6999d0b8..b2c9144f 100644 --- a/pubspec.yaml diff --git a/scripts/prepare-macos.sh b/scripts/prepare-macos.sh index 95f2a9cff..fd0a82139 100755 --- a/scripts/prepare-macos.sh +++ b/scripts/prepare-macos.sh @@ -5,4 +5,3 @@ if ! type "flutter" > /dev/null; then fi brew install libolm - diff --git a/scripts/release-ios-testflight.sh b/scripts/release-ios-testflight.sh index a30d3e5a4..297c1370c 100755 --- a/scripts/release-ios-testflight.sh +++ b/scripts/release-ios-testflight.sh @@ -12,4 +12,4 @@ flutter build ios --release cd ios bundle update fastlane bundle exec fastlane beta -cd .. \ No newline at end of file +cd .. diff --git a/scripts/update-dependencies.sh b/scripts/update-dependencies.sh index 5f783fc55..04868ae63 100755 --- a/scripts/update-dependencies.sh +++ b/scripts/update-dependencies.sh @@ -3,4 +3,4 @@ flutter pub upgrade --major-versions flutter pub get dart fix --apply flutter format lib test -flutter pub run import_sorter:main --no-comments \ No newline at end of file +flutter pub run import_sorter:main --no-comments diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 45399c3a2..62f0e1ca9 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -108,4 +108,4 @@ apps: XDG_DATA_HOME: $SNAP_USER_DATA XDG_DATA_DIRS: $SNAP/usr/share GDK_GL: gles - LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$SNAP/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET" \ No newline at end of file + LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$SNAP/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET" diff --git a/web/index.html b/web/index.html index 7ebfd6128..dbfa105fe 100644 --- a/web/index.html +++ b/web/index.html @@ -70,4 +70,4 @@ - \ No newline at end of file + diff --git a/web/manifest.json b/web/manifest.json index e4f6c31cf..e843cb3d4 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -20,4 +20,4 @@ "type": "image/png" } ] -} \ No newline at end of file +} diff --git a/winuwp/project_version b/winuwp/project_version index c22708346..573541ac9 100644 --- a/winuwp/project_version +++ b/winuwp/project_version @@ -1 +1 @@ -0 \ No newline at end of file +0