Skip to content

Commit 193a86b

Browse files
authored
fix: [3862] Fixed duplicate metadata error in google play (#3903)
#3862
1 parent 4f5b06c commit 193a86b

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/AndroidGradleBuilder.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,13 +1098,18 @@ public boolean build(File sourceZip, final BuildRequest request) throws BuildExc
10981098
String googlePlayObfuscation = "";
10991099
String googleAdUnitId = request.getArg("android.googleAdUnitId", request.getArg("google.adUnitId", null));
11001100
String googlePlayAdViewCode = "";
1101+
String userXapplication = request.getArg("android.xapplication", "");
11011102
if (playServicesAds) {
11021103
minSDK = maxInt("21", minSDK);
11031104
}
11041105
if (googleAdUnitId != null && googleAdUnitId.length() > 0) {
11051106
minSDK = maxInt("9", minSDK);
1106-
googlePlayAdsMetaData = "<meta-data android:name=\"com.google.android.gms.version\" android:value=\"@integer/google_play_services_version\"/>";
1107-
googlePlayAdsActivity = "<activity android:name=\"com.google.android.gms.ads.AdActivity\" android:configChanges=\"keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize\" android:exported=\"false\"/>";
1107+
if (!userXapplication.contains("com.google.android.gms.version")) {
1108+
googlePlayAdsMetaData = "<meta-data android:name=\"com.google.android.gms.version\" android:value=\"@integer/google_play_services_version\"/>";
1109+
}
1110+
if (!userXapplication.contains("com.google.android.gms.ads.AdActivity")) {
1111+
googlePlayAdsActivity = "<activity android:name=\"com.google.android.gms.ads.AdActivity\" android:configChanges=\"keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize\"/>";
1112+
}
11081113
accessNetworkStatePermission = true;
11091114

11101115
String testDevice = request.getArg("android.googleAdUnitTestDevice", "C6783E2486F0931D9D09FABC65094FDF");
@@ -1443,7 +1448,9 @@ public void usesClassMethod(String cls, String method) {
14431448

14441449
if (googleAdUnitId == null && playServicesAds) {
14451450
minSDK = maxInt("9", minSDK);
1446-
googlePlayAdsMetaData = "<meta-data android:name=\"com.google.android.gms.version\" android:value=\"@integer/google_play_services_version\"/>";
1451+
if (!userXapplication.contains("com.google.android.gms.version")) {
1452+
googlePlayAdsMetaData = "<meta-data android:name=\"com.google.android.gms.version\" android:value=\"@integer/google_play_services_version\"/>";
1453+
}
14471454
}
14481455
if (playServicesLocation) {
14491456
debug("Play Services Location Enabled");

0 commit comments

Comments
 (0)