diff --git a/firka/ios/FirkaWatch Watch App/FirkaWatch Watch App.entitlements b/firka/ios/FirkaWatch Watch App/FirkaWatch Watch App.entitlements index eb847b5..bf7c6f4 100644 --- a/firka/ios/FirkaWatch Watch App/FirkaWatch Watch App.entitlements +++ b/firka/ios/FirkaWatch Watch App/FirkaWatch Watch App.entitlements @@ -3,7 +3,7 @@ com.apple.developer.ubiquity-kvstore-identifier - $(TeamIdentifierPrefix)app.firka.firkaa + $(TeamIdentifierPrefix)app.firka.firka com.apple.security.application-groups group.app.firka.firka diff --git a/firka/ios/FirkaWatch Watch App/Localization/WatchL10n.swift b/firka/ios/FirkaWatch Watch App/Localization/WatchL10n.swift index 5d7be8f..ffd136a 100644 --- a/firka/ios/FirkaWatch Watch App/Localization/WatchL10n.swift +++ b/firka/ios/FirkaWatch Watch App/Localization/WatchL10n.swift @@ -31,7 +31,7 @@ class WatchL10n { private let languageKey = "watch_language" private let syncWithiPhoneKey = "watch_sync_language_with_iphone" private let lastAppliedSharedLanguageVersionKey = "watch_last_applied_shared_language_version" - private static let appGroupID = "group.app.firka.firkaa" + private static let appGroupID = "group.app.firka.firka" private var appGroupDefaults: UserDefaults? { UserDefaults(suiteName: Self.appGroupID) } diff --git a/firka/ios/FirkaWatch Watch App/Services/DataStore.swift b/firka/ios/FirkaWatch Watch App/Services/DataStore.swift index f0ffe21..5ab8f70 100644 --- a/firka/ios/FirkaWatch Watch App/Services/DataStore.swift +++ b/firka/ios/FirkaWatch Watch App/Services/DataStore.swift @@ -30,7 +30,7 @@ class DataStore { (error == "token_expired" || error == "no_token") && recoveryAttempted && !isRecoveringToken } - private let appGroupID = "group.app.firka.firkaa" + private let appGroupID = "group.app.firka.firka" private let cacheFileName = "watch_data.json" private let lastHandledSessionStateVersionKey = "firka.watch.last_handled_session_state_version" private let lastHandledSessionActiveStudentIdNormKey = "firka.watch.last_handled_session_active_student_id_norm" diff --git a/firka/ios/FirkaWatchComplications/FirkaComplications.swift b/firka/ios/FirkaWatchComplications/FirkaComplications.swift index efcec27..1eca6f7 100644 --- a/firka/ios/FirkaWatchComplications/FirkaComplications.swift +++ b/firka/ios/FirkaWatchComplications/FirkaComplications.swift @@ -5,7 +5,7 @@ import SwiftUI // MARK: - Complication Localization Helper private struct ComplicationL10n { - private static let appGroupID = "group.app.firka.firkaa" + private static let appGroupID = "group.app.firka.firka" enum Language: String { case hungarian = "hu" @@ -63,7 +63,7 @@ private struct ComplicationL10n { // MARK: - Watch Cache Loader private struct WatchCacheLoader { - private static let appGroupID = "group.app.firka.firkaa" + private static let appGroupID = "group.app.firka.firka" private static let cacheFileName = "watch_data.json" static func loadWidgetData() -> WidgetData? { diff --git a/firka/ios/FirkaWatchComplicationsExtension.entitlements b/firka/ios/FirkaWatchComplicationsExtension.entitlements index 48842b5..ec3585b 100644 --- a/firka/ios/FirkaWatchComplicationsExtension.entitlements +++ b/firka/ios/FirkaWatchComplicationsExtension.entitlements @@ -3,7 +3,7 @@ com.apple.developer.ubiquity-kvstore-identifier - $(TeamIdentifierPrefix)app.firka.firkaa + $(TeamIdentifierPrefix)app.firka.firka com.apple.security.application-groups group.app.firka.firka diff --git a/firka/ios/HomeWidgetsExtension/Controls/AppControls.swift b/firka/ios/HomeWidgetsExtension/Controls/AppControls.swift index d42de9e..7aa1acd 100644 --- a/firka/ios/HomeWidgetsExtension/Controls/AppControls.swift +++ b/firka/ios/HomeWidgetsExtension/Controls/AppControls.swift @@ -2,7 +2,7 @@ import WidgetKit import SwiftUI import AppIntents -private let appGroup = "group.app.firka.firkaa" +private let appGroup = "group.app.firka.firka" // MARK: - Navigation Intents (iOS 16+, used by Controls and Shortcuts) @@ -46,7 +46,7 @@ struct OpenTimetableIntent: AppIntent { @available(iOS 18.0, *) struct HomeControl: ControlWidget { - static let kind = "app.firka.firkaa.control.home" + static let kind = "app.firka.firka.control.home" var body: some ControlWidgetConfiguration { StaticControlConfiguration(kind: Self.kind) { @@ -63,7 +63,7 @@ struct HomeControl: ControlWidget { @available(iOS 18.0, *) struct GradesControl: ControlWidget { - static let kind = "app.firka.firkaa.control.grades" + static let kind = "app.firka.firka.control.grades" var body: some ControlWidgetConfiguration { StaticControlConfiguration(kind: Self.kind) { @@ -80,7 +80,7 @@ struct GradesControl: ControlWidget { @available(iOS 18.0, *) struct TimetableControl: ControlWidget { - static let kind = "app.firka.firkaa.control.timetable" + static let kind = "app.firka.firka.control.timetable" var body: some ControlWidgetConfiguration { StaticControlConfiguration(kind: Self.kind) { diff --git a/firka/ios/Runner.xcodeproj/project.pbxproj b/firka/ios/Runner.xcodeproj/project.pbxproj index 62f1e1a..ce108c4 100644 --- a/firka/ios/Runner.xcodeproj/project.pbxproj +++ b/firka/ios/Runner.xcodeproj/project.pbxproj @@ -1587,7 +1587,7 @@ INFOPLIST_KEY_CFBundleDisplayName = FirkaWatch; INFOPLIST_KEY_NSSupportsLiveActivities = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firkaa; + INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firka; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1640,7 +1640,7 @@ INFOPLIST_KEY_CFBundleDisplayName = FirkaWatch; INFOPLIST_KEY_NSSupportsLiveActivities = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firkaa; + INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firka; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1690,7 +1690,7 @@ INFOPLIST_KEY_CFBundleDisplayName = FirkaWatch; INFOPLIST_KEY_NSSupportsLiveActivities = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firkaa; + INFOPLIST_KEY_WKCompanionAppBundleIdentifier = app.firka.firka; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/firka/ios/Runner/AppDelegate.swift b/firka/ios/Runner/AppDelegate.swift index 64d6f1f..bafb8af 100644 --- a/firka/ios/Runner/AppDelegate.swift +++ b/firka/ios/Runner/AppDelegate.swift @@ -30,8 +30,8 @@ import BackgroundTasks widgetDeepLinkChannel = FlutterMethodChannel(name: "firka.app/widget_deep_link", binaryMessenger: controller.binaryMessenger) widgetDeepLinkChannel?.setMethodCallHandler { [weak self] (call: FlutterMethodCall, result: @escaping FlutterResult) in if call.method == "getPendingDeepLink" { - if let controlNav = UserDefaults(suiteName: "group.app.firka.firkaa")?.string(forKey: "controlNavigation") { - UserDefaults(suiteName: "group.app.firka.firkaa")?.removeObject(forKey: "controlNavigation") + if let controlNav = UserDefaults(suiteName: "group.app.firka.firka")?.string(forKey: "controlNavigation") { + UserDefaults(suiteName: "group.app.firka.firka")?.removeObject(forKey: "controlNavigation") result(controlNav) } else if let link = self?.pendingWidgetDeepLink { self?.pendingWidgetDeepLink = nil diff --git a/firka/ios/Runner/HomeWidgetMethodChannel.swift b/firka/ios/Runner/HomeWidgetMethodChannel.swift index bb21cb5..5bfddcb 100644 --- a/firka/ios/Runner/HomeWidgetMethodChannel.swift +++ b/firka/ios/Runner/HomeWidgetMethodChannel.swift @@ -11,7 +11,7 @@ class HomeWidgetMethodChannel { switch call.method { case "getAppGroupDirectory": if let containerURL = FileManager.default.containerURL( - forSecurityApplicationGroupIdentifier: "group.app.firka.firkaa" + forSecurityApplicationGroupIdentifier: "group.app.firka.firka" ) { result(containerURL.path) } else { diff --git a/firka/ios/Runner/Info.plist b/firka/ios/Runner/Info.plist index 3ae09b0..06d09b7 100644 --- a/firka/ios/Runner/Info.plist +++ b/firka/ios/Runner/Info.plist @@ -38,7 +38,7 @@ CFBundleURLName - app.firka.firkaa + app.firka.firka CFBundleURLSchemes firka diff --git a/firka/ios/Runner/Runner.entitlements b/firka/ios/Runner/Runner.entitlements index bc28259..6c5dfba 100644 --- a/firka/ios/Runner/Runner.entitlements +++ b/firka/ios/Runner/Runner.entitlements @@ -5,7 +5,7 @@ aps-environment development com.apple.developer.ubiquity-kvstore-identifier - $(TeamIdentifierPrefix)app.firka.firkaa + $(TeamIdentifierPrefix)app.firka.firka com.apple.developer.usernotifications.time-sensitive com.apple.security.application-groups diff --git a/firka/ios/Shared/API/TokenManager.swift b/firka/ios/Shared/API/TokenManager.swift index 90f9d4f..ed9b33f 100644 --- a/firka/ios/Shared/API/TokenManager.swift +++ b/firka/ios/Shared/API/TokenManager.swift @@ -32,7 +32,7 @@ enum TokenError: Error { class TokenManager { static let shared = TokenManager() - private let appGroupID = "group.app.firka.firkaa" + private let appGroupID = "group.app.firka.firka" private let tokenFileName = "watch_token.json" private static let keychainService = "app.firka.watch.token" diff --git a/firka/ios/Shared/Models/WidgetData.swift b/firka/ios/Shared/Models/WidgetData.swift index 3ff9d52..c0ec6f1 100644 --- a/firka/ios/Shared/Models/WidgetData.swift +++ b/firka/ios/Shared/Models/WidgetData.swift @@ -12,7 +12,7 @@ struct WidgetData: Codable { static func load() -> WidgetData? { guard let containerURL = FileManager.default.containerURL( - forSecurityApplicationGroupIdentifier: "group.app.firka.firkaa" + forSecurityApplicationGroupIdentifier: "group.app.firka.firka" ) else { lastError = "No App Group container" return nil