diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bc0b3a7..deed6bf 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -33,6 +33,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ios/NotificationService/NotificationService.swift b/ios/NotificationService/NotificationService.swift
index f8e68be..5ec1185 100644
--- a/ios/NotificationService/NotificationService.swift
+++ b/ios/NotificationService/NotificationService.swift
@@ -109,10 +109,10 @@ func getPushNotificationData(pushData: String) -> (
} else if pushUser != nil {
return (
pushUser!.displayName,
- getPushNotificationText(pushNotification: pushNotification, true).0, pushUser!.userID
+ getPushNotificationText(pushNotification: pushNotification, userKnown: true).0, pushUser!.userID
)
} else {
- let content = getPushNotificationText(pushNotification: pushNotification, false)
+ let content = getPushNotificationText(pushNotification: pushNotification, userKnown: false)
return (
content.1, content.0, 1
)
@@ -205,7 +205,7 @@ func readFromKeychain(key: String) -> String? {
return nil
}
-func getPushNotificationText(pushNotification: PushNotification, userKnown: bool) -> (String, String) {
+func getPushNotificationText(pushNotification: PushNotification, userKnown: Bool) -> (String, String) {
let systemLanguage = Locale.current.language.languageCode?.identifier ?? "en" // Get the current system language
var pushNotificationText: [PushKind: String] = [:]
@@ -274,7 +274,7 @@ func getPushNotificationText(pushNotification: PushNotification, userKnown: bool
var content = pushNotificationText[pushNotification.kind] ?? ""
if (content == "") {
title = noTranslationFoundTitle
- body = noTranslationFoundBody
+ content = noTranslationFoundBody
}
if pushNotification.hasAdditionalContent {
diff --git a/ios/ShareExtension/Info.plist b/ios/ShareExtension/Info.plist
index 3e8521b..5edbc20 100644
--- a/ios/ShareExtension/Info.plist
+++ b/ios/ShareExtension/Info.plist
@@ -22,6 +22,8 @@
NSExtensionActivationRule
+ NSExtensionActivationSupportsWebURLWithMaxCount
+ 1
NSExtensionActivationSupportsWebURLWithMaxCount
1
NSExtensionActivationSupportsImageWithMaxCount
diff --git a/lib/src/localization/translations b/lib/src/localization/translations
index 20f3c2f..9d04e9e 160000
--- a/lib/src/localization/translations
+++ b/lib/src/localization/translations
@@ -1 +1 @@
-Subproject commit 20f3c2f0a49e4c9be452ecbc84d98054c92974e1
+Subproject commit 9d04e9e1d0cdba8f1be4b0cbba341706c3cffac9
diff --git a/lib/src/views/camera/camera_preview_components/camera_preview_controller_view.dart b/lib/src/views/camera/camera_preview_components/camera_preview_controller_view.dart
index 870a06b..c7dbfa1 100644
--- a/lib/src/views/camera/camera_preview_components/camera_preview_controller_view.dart
+++ b/lib/src/views/camera/camera_preview_components/camera_preview_controller_view.dart
@@ -4,7 +4,6 @@ import 'dart:io';
import 'package:camera/camera.dart';
import 'package:clock/clock.dart';
import 'package:device_info_plus/device_info_plus.dart';
-import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_android_volume_keydown/flutter_android_volume_keydown.dart';
@@ -353,12 +352,7 @@ class _CameraPreviewViewState extends State {
sendToGroup: widget.sendToGroup,
mediaFileService: mediaFileService,
mainCameraController: mc,
- // previewLink: mc.sharedLinkForPreview,
- previewLink: kDebugMode
- ? Uri.parse(
- 'https://mastodon.social/@islieb/115883317936171927',
- )
- : mc.sharedLinkForPreview,
+ previewLink: mc.sharedLinkForPreview,
),
transitionsBuilder: (context, animation, secondaryAnimation, child) {
return child;