Skip to content

Commit 30180dc

Browse files
committed
Remove language files, the logic is not needed anymore
* We don't need a Language Context, App Defined Language or Device Defined Language * The properties model should handle language
1 parent e986cc2 commit 30180dc

File tree

6 files changed

+0
-194
lines changed

6 files changed

+0
-194
lines changed

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@
6464
3C11518E289AF83600565C41 /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
6565
3C11518F289AF83600565C41 /* OneSignalOSCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6666
3C115197289AF86C00565C41 /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
67-
3C1F3179297F5E920040F4DA /* LanguageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C1F3178297F5E920040F4DA /* LanguageProvider.swift */; };
68-
3C1F317B297F601D0040F4DA /* LanguageProviderDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C1F317A297F601D0040F4DA /* LanguageProviderDevice.swift */; };
69-
3C1F317D297F60340040F4DA /* LanguageProviderAppDefined.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C1F317C297F60340040F4DA /* LanguageProviderAppDefined.swift */; };
70-
3C1F317F297F60690040F4DA /* LanguageContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C1F317E297F60690040F4DA /* LanguageContext.swift */; };
7167
3C2C7DC4288E007E0020F9AE /* UserModelSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2C7DC3288E007E0020F9AE /* UserModelSwiftTests.swift */; };
7268
3C2C7DC6288E00AA0020F9AE /* UserModelObjcTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2C7DC5288E00AA0020F9AE /* UserModelObjcTests.m */; };
7369
3C2C7DC8288F3C020020F9AE /* OSSubscriptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2C7DC7288F3C020020F9AE /* OSSubscriptionModel.swift */; };
@@ -673,10 +669,6 @@
673669
3C115188289ADEA300565C41 /* OSModelStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSModelStore.swift; sourceTree = "<group>"; };
674670
3C11518A289ADEEB00565C41 /* OSEventProducer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSEventProducer.swift; sourceTree = "<group>"; };
675671
3C11518C289AF5E800565C41 /* OSModelChangedHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSModelChangedHandler.swift; sourceTree = "<group>"; };
676-
3C1F3178297F5E920040F4DA /* LanguageProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageProvider.swift; sourceTree = "<group>"; };
677-
3C1F317A297F601D0040F4DA /* LanguageProviderDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageProviderDevice.swift; sourceTree = "<group>"; };
678-
3C1F317C297F60340040F4DA /* LanguageProviderAppDefined.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageProviderAppDefined.swift; sourceTree = "<group>"; };
679-
3C1F317E297F60690040F4DA /* LanguageContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageContext.swift; sourceTree = "<group>"; };
680672
3C2C7DC2288E007E0020F9AE /* UnitTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UnitTests-Bridging-Header.h"; sourceTree = "<group>"; };
681673
3C2C7DC3288E007E0020F9AE /* UserModelSwiftTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserModelSwiftTests.swift; sourceTree = "<group>"; };
682674
3C2C7DC5288E00AA0020F9AE /* UserModelObjcTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserModelObjcTests.m; sourceTree = "<group>"; };
@@ -1261,17 +1253,6 @@
12611253
path = Source;
12621254
sourceTree = "<group>";
12631255
};
1264-
3C1F3177297F5DA00040F4DA /* Language */ = {
1265-
isa = PBXGroup;
1266-
children = (
1267-
3C1F3178297F5E920040F4DA /* LanguageProvider.swift */,
1268-
3C1F317A297F601D0040F4DA /* LanguageProviderDevice.swift */,
1269-
3C1F317C297F60340040F4DA /* LanguageProviderAppDefined.swift */,
1270-
3C1F317E297F60690040F4DA /* LanguageContext.swift */,
1271-
);
1272-
path = Language;
1273-
sourceTree = "<group>";
1274-
};
12751256
3E2400391D4FFC31008BDE70 /* OneSignalFramework */ = {
12761257
isa = PBXGroup;
12771258
children = (
@@ -1564,7 +1545,6 @@
15641545
DE69E1A8282ED8360090BB3D /* Source */ = {
15651546
isa = PBXGroup;
15661547
children = (
1567-
3C1F3177297F5DA00040F4DA /* Language */,
15681548
DE69E19D282ED8060090BB3D /* OneSignalUser.h */,
15691549
3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */,
15701550
DE69E1AA282ED8790090BB3D /* OneSignalUserManagerImpl.swift */,
@@ -2770,17 +2750,13 @@
27702750
DE69E1AC282ED87A0090BB3D /* OneSignalUserManagerImpl.swift in Sources */,
27712751
3CF862A028A1964F00776CA4 /* OSPropertiesModel.swift in Sources */,
27722752
3C8E6E0128AC0BA10031E48A /* OSIdentityOperationExecutor.swift in Sources */,
2773-
3C1F317D297F60340040F4DA /* LanguageProviderAppDefined.swift in Sources */,
2774-
3C1F317B297F601D0040F4DA /* LanguageProviderDevice.swift in Sources */,
27752753
3CF862A228A197D200776CA4 /* OSPropertiesModelStoreListener.swift in Sources */,
27762754
3C0EF49E28A1DBCB00E5434B /* OSUserInternalImpl.swift in Sources */,
27772755
3C8E6DFF28AB09AE0031E48A /* OSPropertyOperationExecutor.swift in Sources */,
27782756
3C2C7DC8288F3C020020F9AE /* OSSubscriptionModel.swift in Sources */,
27792757
3CF8629E28A183F900776CA4 /* OSIdentityModel.swift in Sources */,
27802758
3CE795FB28DBDCE700736BD4 /* OSSubscriptionOperationExecutor.swift in Sources */,
2781-
3C1F3179297F5E920040F4DA /* LanguageProvider.swift in Sources */,
27822759
3CE9227A289FA88B001B1062 /* OSIdentityModelStoreListener.swift in Sources */,
2783-
3C1F317F297F60690040F4DA /* LanguageContext.swift in Sources */,
27842760
DE69E19F282ED8060090BB3D /* OneSignalUser.docc in Sources */,
27852761
3CA6CE0A28E4F19B00CA0585 /* OSUserRequests.swift in Sources */,
27862762
);

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Language/LanguageContext.swift

Lines changed: 0 additions & 47 deletions
This file was deleted.

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Language/LanguageProvider.swift

Lines changed: 0 additions & 32 deletions
This file was deleted.

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Language/LanguageProviderAppDefined.swift

Lines changed: 0 additions & 41 deletions
This file was deleted.

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Language/LanguageProviderDevice.swift

Lines changed: 0 additions & 42 deletions
This file was deleted.

iOS_SDK/OneSignalSDK/Source/OneSignal.m

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@
7676

7777
#import "OneSignalLifecycleObserver.h"
7878

79-
#import "LanguageProviderAppDefined.h"
80-
#import "LanguageContext.h"
81-
8279
#pragma clang diagnostic push
8380
#pragma clang diagnostic ignored "-Wundeclared-selector"
8481

@@ -124,8 +121,6 @@ + (DelayedConsentInitializationParameters *)delayedInitParameters {
124121
// Set when the app is launched
125122
static NSDate *sessionLaunchTime;
126123

127-
static LanguageContext* languageContext;
128-
129124
// static property def to add developer's OSPermissionStateChanges observers to.
130125
static ObservablePermissionStateChangesType* _permissionStateChangesObserver;
131126
+ (ObservablePermissionStateChangesType*)permissionStateChangesObserver {
@@ -574,9 +569,6 @@ + (void)init {
574569
}
575570

576571
// Now really initializing the SDK!
577-
578-
// TODO: Language move to user?
579-
languageContext = [LanguageContext new];
580572

581573
[self initInAppLaunchURLSettings:appSettings];
582574

0 commit comments

Comments
 (0)