Merge pull request #56 from pangeachat/features/notification_hotfix_ios

ios notification fixed, issues with entitlements, there was invlid va…

.gitignore

@@ -40,7 +40,7 @@ prime
 
 # Gitlab runner locally
 /builds/
-
+.fvm/
 # Web related
 docs/tailwind.css
 

.vscode/settings.json

@@ -1,4 +1,11 @@
 {
+    "dart.flutterSdkPath": ".fvm/flutter_sdk",
+    "search.exclude": {
+        "**/.fvm": true
+    },
+    "files.watcherExclude": {
+        "**/.fvm": true
+    },
     "dart.previewLsp": true,
     "editor.codeActionsOnSave": {
         "source.fixAll": "explicit",

ios/Runner.xcodeproj/project.pbxproj

@@ -474,6 +474,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = PJ8L5H7L7H;
 				ENABLE_BITCODE = NO;
@@ -493,6 +495,7 @@
 				MARKETING_VERSION = 0.32.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.talktolearn.chat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -614,6 +617,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = PJ8L5H7L7H;
 				ENABLE_BITCODE = NO;
@@ -633,6 +638,7 @@
 				MARKETING_VERSION = 0.32.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.talktolearn.chat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -648,6 +654,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = PJ8L5H7L7H;
 				ENABLE_BITCODE = NO;
@@ -667,6 +675,7 @@
 				MARKETING_VERSION = 0.32.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.talktolearn.chat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

ios/Runner/Info.plist

@@ -6,6 +6,8 @@
 	<array>
 		<string>im.fluffychat.app</string>
 	</array>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -41,14 +43,17 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>FLTEnableImpeller</key>
+	<false/>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<!-- #Pangea -->
+	<key>NSAppTransportSecurity</key>
-	<key>FLTEnableImpeller</key>
+	<dict>
-	<false/>
+		<key>NSAllowsArbitraryLoads</key>
-	<!-- Pangea# -->
+		<true/>
+	</dict>
 	<key>NSAppleMusicUsageDescription</key>
 	<string>Play audio and voice messages in the app.</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>
@@ -63,12 +68,12 @@
 	<string>Share contacts with your contacts in Pangea Chat.</string>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Pangea Chat uses an app lock for an additional security level</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Share your location with your contacts in Pangea Chat.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Share your location with your contacts in Pangea Chat.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Share your location with your contacts in Pangea Chat.</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>Share your location with your contacts in Pangea Chat.</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Record voice message and share them with your contacts on Pangea Chat.</string>
 	<key>NSMotionUsageDescription</key>
@@ -109,14 +114,5 @@
 	<false/>
 	<key>io.flutter.embedded_views_preview</key>
 	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-  	<key>NSAllowsArbitraryLoads</key>
-  	<true/>
-</dict>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>

ios/Runner/Runner.entitlements

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+	<dict>
-	<key>aps-environment</key>
+		<key>aps-environment</key>
-	<string>development</string>
+		<string>development</string>
-	<key>com.apple.developer.associated-domains</key>
+		<key>com.apple.developer.associated-domains</key>
-	<array>
+		<array>
-		<string>applinks:example.com</string>
+			<string>applinks:example.com</string>
-	</array>
+		</array>
-	<key>com.apple.security.application-groups</key>
+		<key>com.apple.security.application-groups</key>
-	<!-- #Pangea -->
+		<!-- #Pangea -->
-	<!-- <array>
+		<array>
-		<string>group.im.fluffychat.app</string>
+			<string>group.com.talktolearn.chat</string>
-	</array> -->
+		</array>
-	<!-- Pangea# -->
+		<!-- Pangea# -->
-</dict>
+	</dict>
-</plist>
+</plist>

pubspec.yaml

@@ -145,6 +145,7 @@ flutter:
     - assets/
     # #Pangea
     - assets/pangea/
+    - .env
     - assets/pangea/bot_faces/
     # Pangea#
     - assets/sounds/
@@ -210,4 +211,4 @@ dependency_overrides:
     git:
       url: https://github.com/chandrabezzo/wakelock.git
       ref: main
-      path: wakelock_windows/
+      path: wakelock_windows/