Skip to content

Commit 870f0ad

Browse files
NevazhnovuNevazhnovu
authored
Merge pull request #17 from SourcePointUSA/DIA-2884-fix-android8
[DIA-2884] Fixed enum error for Android 8.0
2 parents 88aaf66 + c908240 commit 870f0ad

File tree

95 files changed

+126
-19
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+126
-19
lines changed

‎Assets/ConsentManagementProvider/Scripts/enum/Android/CAMPAIGN_ENV_STRING_KEY.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace ConsentMessagePlugin.Android
33
internal static class CAMPAIGN_ENV_STRING_KEY
44
{
55
internal const string
6-
STAGE = "stage",
7-
PUBLIC = "prod";
6+
STAGE = "STAGE",
7+
PUBLIC = "PUBLIC";
88
}
99
}

‎Assets/ConsentManagementProvider/Scripts/enum/Android/MESSAGE_LANGUAGE_STRING_KEY.cs

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ internal const string
2525
LITHUANIAN="LT",
2626
NORWEGIAN="NO",
2727
POLISH="PL",
28-
PORTUGEESE="PT",
28+
PORTUGUESE="PT",
2929
ROMANIAN="RO",
3030
RUSSIAN="RU",
3131
SERBIAN_CYRILLIC="SR-CYRL",
@@ -36,4 +36,41 @@ internal const string
3636
SWEDISH="SV",
3737
TURKISH="TR";
3838
}
39+
40+
internal static class MESSAGE_LANGUAGE_FULL_STRING_KEY
41+
{
42+
internal const string
43+
BULGARIAN="BULGARIAN",
44+
CATALAN="CATALAN",
45+
CHINESE="CHINESE",
46+
CROATIAN="CROATIAN",
47+
CZECH="CZECH",
48+
DANISH="DANISH",
49+
DUTCH="DUTCH",
50+
ENGLISH="ENGLISH",
51+
ESTONIAN="ESTONIAN",
52+
FINNISH="FINNISH",
53+
FRENCH="FRENCH",
54+
GAELIC="GAELIC",
55+
GERMAN="GERMAN",
56+
GREEK="GREEK",
57+
HUNGARIAN="HUNGARIAN",
58+
ICELANDIC="ICELANDIC",
59+
ITALIAN="ITALIAN",
60+
JAPANESE="JAPANESE",
61+
LATVIAN="LATVIAN",
62+
LITHUANIAN="LITHUANIAN",
63+
NORWEGIAN="NORWEGIAN",
64+
POLISH="POLISH",
65+
PORTUGUESE="PORTUGUESE",
66+
ROMANIAN="ROMANIAN",
67+
RUSSIAN="RUSSIAN",
68+
SERBIAN_CYRILLIC="SERBIAN_CYRILLIC",
69+
SERBIAN_LATIN="SERBIAN_LATIN",
70+
SLOVAKIAN="SLOVAKIAN",
71+
SLOVENIAN="SLOVENIAN",
72+
SPANISH="SPANISH",
73+
SWEDISH="SWEDISH",
74+
TURKISH="TURKISH";
75+
}
3976
}

‎Assets/ConsentManagementProvider/Scripts/enum/CSharp2JavaStringEnumMapper.cs

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ internal static class CSharp2JavaStringEnumMapper
88
static Dictionary<PRIVACY_MANAGER_TAB, string> privacyManagerTabToJavaEnumKey;
99
static Dictionary<CAMPAIGN_ENV, string> campaignEnvToJavaEnumKey;
1010
static Dictionary<MESSAGE_LANGUAGE, string> messageLanguageToJavaKey;
11+
static Dictionary<MESSAGE_LANGUAGE, string> messageFullLanguageToJavaKey;
1112

1213
static CSharp2JavaStringEnumMapper()
1314
{
@@ -20,6 +21,11 @@ public static string GetMessageLanguageKey(MESSAGE_LANGUAGE lang)
2021
return messageLanguageToJavaKey[lang];
2122
}
2223

24+
public static string GetMessageFullLanguageKey(MESSAGE_LANGUAGE lang)
25+
{
26+
return messageFullLanguageToJavaKey[lang];
27+
}
28+
2329
public static string GetCampaignEnvKey(CAMPAIGN_ENV environment)
2430
{
2531
return campaignEnvToJavaEnumKey[environment];
@@ -37,6 +43,7 @@ private static void InitializeMapping()
3743
InitializePrivacyManagerTabMapping();
3844
InitializeCampaignEnvMapping();
3945
InitializeMessageLanguageMapping();
46+
InitializeMessageFullLanguageMapping();
4047
}
4148

4249
private static void InitializeMessageLanguageMapping()
@@ -63,7 +70,7 @@ private static void InitializeMessageLanguageMapping()
6370
messageLanguageToJavaKey.Add(MESSAGE_LANGUAGE.LITHUANIAN, MESSAGE_LANGUAGE_STRING_KEY.LITHUANIAN);
6471
messageLanguageToJavaKey.Add(MESSAGE_LANGUAGE.NORWEGIAN, MESSAGE_LANGUAGE_STRING_KEY.NORWEGIAN);
6572
messageLanguageToJavaKey.Add(MESSAGE_LANGUAGE.POLISH, MESSAGE_LANGUAGE_STRING_KEY.POLISH);
66-
messageLanguageToJavaKey.Add(MESSAGE_LANGUAGE.PORTUGEESE, MESSAGE_LANGUAGE_STRING_KEY.PORTUGEESE);
73+
messageLanguageToJavaKey.Add(MESSAGE_LANGUAGE.PORTUGUESE, MESSAGE_LANGUAGE_STRING_KEY.PORTUGUESE);
6774
messageLanguageToJavaKey.Add(MESSAGE_LANGUAGE.ROMANIAN, MESSAGE_LANGUAGE_STRING_KEY.ROMANIAN);
6875
messageLanguageToJavaKey.Add(MESSAGE_LANGUAGE.RUSSIAN, MESSAGE_LANGUAGE_STRING_KEY.RUSSIAN);
6976
messageLanguageToJavaKey.Add(MESSAGE_LANGUAGE.SERBIAN_CYRILLIC, MESSAGE_LANGUAGE_STRING_KEY.SERBIAN_CYRILLIC);
@@ -76,6 +83,43 @@ private static void InitializeMessageLanguageMapping()
7683
messageLanguageToJavaKey.Add(MESSAGE_LANGUAGE.CATALAN, MESSAGE_LANGUAGE_STRING_KEY.CATALAN);
7784
}
7885

86+
private static void InitializeMessageFullLanguageMapping()
87+
{
88+
messageFullLanguageToJavaKey = new Dictionary<MESSAGE_LANGUAGE, string>();
89+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.BULGARIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.BULGARIAN);
90+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.CHINESE, MESSAGE_LANGUAGE_FULL_STRING_KEY.CHINESE);
91+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.CROATIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.CROATIAN);
92+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.CZECH, MESSAGE_LANGUAGE_FULL_STRING_KEY.CZECH);
93+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.DANISH, MESSAGE_LANGUAGE_FULL_STRING_KEY.DANISH);
94+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.DUTCH, MESSAGE_LANGUAGE_FULL_STRING_KEY.DUTCH);
95+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.ENGLISH, MESSAGE_LANGUAGE_FULL_STRING_KEY.ENGLISH);
96+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.ESTONIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.ESTONIAN);
97+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.FINNISH, MESSAGE_LANGUAGE_FULL_STRING_KEY.FINNISH);
98+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.FRENCH, MESSAGE_LANGUAGE_FULL_STRING_KEY.FRENCH);
99+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.GAELIC, MESSAGE_LANGUAGE_FULL_STRING_KEY.GAELIC);
100+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.GERMAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.GERMAN);
101+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.GREEK, MESSAGE_LANGUAGE_FULL_STRING_KEY.GREEK);
102+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.HUNGARIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.HUNGARIAN);
103+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.ICELANDIC, MESSAGE_LANGUAGE_FULL_STRING_KEY.ICELANDIC);
104+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.ITALIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.ITALIAN);
105+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.JAPANESE, MESSAGE_LANGUAGE_FULL_STRING_KEY.JAPANESE);
106+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.LATVIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.LATVIAN);
107+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.LITHUANIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.LITHUANIAN);
108+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.NORWEGIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.NORWEGIAN);
109+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.POLISH, MESSAGE_LANGUAGE_FULL_STRING_KEY.POLISH);
110+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.PORTUGUESE, MESSAGE_LANGUAGE_FULL_STRING_KEY.PORTUGUESE);
111+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.ROMANIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.ROMANIAN);
112+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.RUSSIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.RUSSIAN);
113+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.SERBIAN_CYRILLIC, MESSAGE_LANGUAGE_FULL_STRING_KEY.SERBIAN_CYRILLIC);
114+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.SERBIAN_LATIN, MESSAGE_LANGUAGE_FULL_STRING_KEY.SERBIAN_LATIN);
115+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.SLOVAKIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.SLOVAKIAN);
116+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.SLOVENIAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.SLOVENIAN);
117+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.SPANISH, MESSAGE_LANGUAGE_FULL_STRING_KEY.SPANISH);
118+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.SWEDISH, MESSAGE_LANGUAGE_FULL_STRING_KEY.SWEDISH);
119+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.TURKISH, MESSAGE_LANGUAGE_FULL_STRING_KEY.TURKISH);
120+
messageFullLanguageToJavaKey.Add(MESSAGE_LANGUAGE.CATALAN, MESSAGE_LANGUAGE_FULL_STRING_KEY.CATALAN);
121+
}
122+
79123
private static void InitializeCampaignEnvMapping()
80124
{
81125
campaignEnvToJavaEnumKey = new Dictionary<CAMPAIGN_ENV, string>();

‎Assets/ConsentManagementProvider/Scripts/enum/MESSAGE_LANGUAGE.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public enum MESSAGE_LANGUAGE
2828
LITHUANIAN = 20,
2929
NORWEGIAN = 21,
3030
POLISH = 22,
31-
PORTUGEESE = 23,
31+
PORTUGUESE = 23,
3232
ROMANIAN = 24,
3333
RUSSIAN = 25,
3434
SERBIAN_CYRILLIC = 26,

‎Assets/ConsentManagementProvider/Scripts/wrapper/Android/AndroidJavaConstruct.cs

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ internal static AndroidJavaObject GetActivity()
2929
return activity;
3030
}
3131

32-
internal AndroidJavaObject ConsrtuctLib(AndroidJavaObject spConfig, AndroidJavaObject activity, SpClientProxy spClient)
32+
internal AndroidJavaObject ConstructLib(AndroidJavaObject spConfig, AndroidJavaObject activity, SpClientProxy spClient)
3333
{
3434
AndroidJavaObject lib = pluginFactoryClass.CallStatic<AndroidJavaObject>("makeConsentLib", spConfig, activity, spClient);
3535
CmpDebugUtil.Log("consentLib is OK");
@@ -38,10 +38,14 @@ internal AndroidJavaObject ConsrtuctLib(AndroidJavaObject spConfig, AndroidJavaO
3838

3939
internal AndroidJavaObject ConstructPrivacyManagerTab(PRIVACY_MANAGER_TAB tab)
4040
{
41-
AndroidJavaObject privacyManagerTabK = new AndroidJavaObject("com.sourcepoint.cmplibrary.model.PMTab", CSharp2JavaStringEnumMapper.GetPrivacyManagerTabKey(tab), (int)tab);
42-
privacyManagerTabK.Set("key", CSharp2JavaStringEnumMapper.GetPrivacyManagerTabKey(tab));
41+
string enumName = CSharp2JavaStringEnumMapper.GetPrivacyManagerTabKey(tab);
42+
43+
AndroidJavaClass pmTabClass = new AndroidJavaClass("com.sourcepoint.cmplibrary.model.PMTab");
44+
AndroidJavaObject privacyManagerTab = pmTabClass.GetStatic<AndroidJavaObject>(enumName.ToUpper());
45+
privacyManagerTab.Set("key", CSharp2JavaStringEnumMapper.GetPrivacyManagerTabKey(tab));
46+
4347
CmpDebugUtil.Log("PMTab is OK");
44-
return privacyManagerTabK;
48+
return privacyManagerTab;
4549
}
4650

4751
internal AndroidJavaObject ConstructCampaign(AndroidJavaObject campaignType, AndroidJavaObject targetingParams, CAMPAIGN_TYPE campaignTypeForLog)
@@ -73,8 +77,12 @@ internal AndroidJavaObject ConstructCampaignType(CAMPAIGN_TYPE campaignType)
7377

7478
internal AndroidJavaObject ConstructMessageLanguage(MESSAGE_LANGUAGE lang)
7579
{
76-
AndroidJavaObject msgLang = new AndroidJavaObject("com.sourcepoint.cmplibrary.model.MessageLanguage", CSharp2JavaStringEnumMapper.GetMessageLanguageKey(lang), (int)lang);
80+
string enumName = CSharp2JavaStringEnumMapper.GetMessageLanguageKey(lang);
81+
82+
AndroidJavaClass messageLanguageClass = new AndroidJavaClass("com.sourcepoint.cmplibrary.model.MessageLanguage");
83+
AndroidJavaObject msgLang = messageLanguageClass.GetStatic<AndroidJavaObject>(CSharp2JavaStringEnumMapper.GetMessageFullLanguageKey(lang));
7784
msgLang.Set("value", CSharp2JavaStringEnumMapper.GetMessageLanguageKey(lang));
85+
7886
CmpDebugUtil.Log("MessageLanguage is OK");
7987
return msgLang;
8088
}
@@ -120,15 +128,16 @@ internal AndroidJavaObject ConstructTargetingParam(string key, string value)
120128

121129
private AndroidJavaObject ConstructCampaignEnv(CAMPAIGN_ENV environment)
122130
{
123-
AndroidJavaObject campaignEnv = new AndroidJavaObject("com.sourcepoint.cmplibrary.data.network.util.CampaignsEnv", CSharp2JavaStringEnumMapper.GetCampaignEnvKey(environment), (int)environment);
124-
campaignEnv.Set("env", CSharp2JavaStringEnumMapper.GetCampaignEnvKey(environment));
131+
string enumName = CSharp2JavaStringEnumMapper.GetCampaignEnvKey(environment);
132+
133+
AndroidJavaClass campaignsEnvClass = new AndroidJavaClass("com.sourcepoint.cmplibrary.data.network.util.CampaignsEnv");
134+
AndroidJavaObject campaignEnv = campaignsEnvClass.GetStatic<AndroidJavaObject>(CSharp2JavaStringEnumMapper.GetCampaignEnvKey(environment));
135+
125136
CmpDebugUtil.Log("campaignEnv is OK");
126137
return campaignEnv;
127138
}
128139

129-
internal void Dispose()
130-
{
140+
internal void Dispose() =>
131141
this.pluginFactoryClass = null;
132-
}
133142
}
134143
}

‎Assets/ConsentManagementProvider/Scripts/wrapper/Android/ConsentWrapperAndroid.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void InitializeLib(List<SpCampaign> spCampaigns, int accountId, int prope
7474
language: msgLang,
7575
campaignsEnvironment: campaignsEnvironment,
7676
spCampaigns: campaigns);
77-
consentLib = constructor.ConsrtuctLib(spConfig: spConfig,
77+
consentLib = constructor.ConstructLib(spConfig: spConfig,
7878
activity: this.activity,
7979
spClient: this.spClient);
8080
}

‎Assets/Free UI Click Sound Effects Pack.meta renamed to ‎Assets/ExampleApp/Free UI Click Sound Effects Pack.meta

File renamed without changes.

‎Assets/Free UI Click Sound Effects Pack/AUDIO.meta renamed to ‎Assets/ExampleApp/Free UI Click Sound Effects Pack/AUDIO.meta

File renamed without changes.

‎Assets/Free UI Click Sound Effects Pack/AUDIO/Wooden.meta renamed to ‎Assets/ExampleApp/Free UI Click Sound Effects Pack/AUDIO/Wooden.meta

File renamed without changes.

‎Assets/Free UI Click Sound Effects Pack/AUDIO/Wooden/ButtonClick.wav renamed to ‎Assets/ExampleApp/Free UI Click Sound Effects Pack/AUDIO/Wooden/ButtonClick.wav

File renamed without changes.

0 commit comments

Comments
 (0)