From 9029fcaf16d2a4bd7339d3f3fe361a6e9073a573 Mon Sep 17 00:00:00 2001 From: nonelse Date: Wed, 31 Jan 2018 17:54:42 +0100 Subject: [PATCH 1/6] Central function format string US culture --- .../java/com/adjust/sdk/ActivityPackage.java | 10 +++---- .../java/com/adjust/sdk/ActivityState.java | 6 ++-- .../com/adjust/sdk/AdjustAttribution.java | 2 +- .../java/com/adjust/sdk/AdjustConfig.java | 4 +-- .../com/adjust/sdk/AdjustEventFailure.java | 2 +- .../com/adjust/sdk/AdjustEventSuccess.java | 2 +- .../com/adjust/sdk/AdjustSessionFailure.java | 2 +- .../com/adjust/sdk/AdjustSessionSuccess.java | 2 +- .../main/java/com/adjust/sdk/DeviceInfo.java | 2 +- .../src/main/java/com/adjust/sdk/Logger.java | 28 +++++++++---------- .../java/com/adjust/sdk/PackageBuilder.java | 6 ++-- .../java/com/adjust/sdk/RequestHandler.java | 4 +-- .../java/com/adjust/sdk/ResponseData.java | 2 +- .../java/com/adjust/sdk/SdkClickHandler.java | 2 +- .../src/main/java/com/adjust/sdk/Util.java | 12 +++++--- .../java/com/adjust/sdk/UtilNetworking.java | 12 ++++---- .../com/adjust/sdk/plugin/AdjustCriteo.java | 4 +-- .../com/adjust/sdk/plugin/AdjustTrademob.java | 4 +-- 18 files changed, 54 insertions(+), 52 deletions(-) diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityPackage.java b/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityPackage.java index e0a9eb2a1..8a0000473 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityPackage.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityPackage.java @@ -143,13 +143,13 @@ public ActivityPackage(ActivityKind activityKind) { } public String toString() { - return String.format(Locale.US, "%s%s", activityKind.toString(), suffix); + return Util.formatString("%s%s", activityKind.toString(), suffix); } public String getExtendedString() { StringBuilder builder = new StringBuilder(); - builder.append(String.format(Locale.US, "Path: %s\n", path)); - builder.append(String.format(Locale.US, "ClientSdk: %s\n", clientSdk)); + builder.append(Util.formatString("Path: %s\n", path)); + builder.append(Util.formatString("ClientSdk: %s\n", clientSdk)); if (parameters != null) { builder.append("Parameters:"); @@ -160,14 +160,14 @@ public String getExtendedString() { if (stringsToExclude.contains(key)) { continue; } - builder.append(String.format(Locale.US, "\n\t%-16s %s", key, entry.getValue())); + builder.append(Util.formatString("\n\t%-16s %s", key, entry.getValue())); } } return builder.toString(); } protected String getFailureMessage() { - return String.format(Locale.US, "Failed to track %s%s", activityKind.toString(), suffix); + return Util.formatString("Failed to track %s%s", activityKind.toString(), suffix); } private void writeObject(ObjectOutputStream stream) throws IOException { diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityState.java b/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityState.java index 92b61495c..d80d1a4da 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityState.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityState.java @@ -121,8 +121,7 @@ protected boolean findOrderId(String orderId) { @Override public String toString() { - return String.format(Locale.US, - "ec:%d sc:%d ssc:%d sl:%.1f ts:%.1f la:%s uuid:%s", + return Util.formatString("ec:%d sc:%d ssc:%d sl:%.1f ts:%.1f la:%s uuid:%s", eventCount, sessionCount, subsessionCount, sessionLength / 1000.0, timeSpent / 1000.0, stamp(lastActivity), uuid); @@ -214,8 +213,7 @@ private void writeObject(ObjectOutputStream stream) throws IOException { private static String stamp(long dateMillis) { Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(dateMillis); - return String.format(Locale.US, - "%02d:%02d:%02d", + return Util.formatString("%02d:%02d:%02d", calendar.HOUR_OF_DAY, calendar.MINUTE, calendar.SECOND); diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustAttribution.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustAttribution.java index ccb09b1cc..03e93244b 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustAttribution.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustAttribution.java @@ -87,7 +87,7 @@ public int hashCode() { @Override public String toString() { - return String.format(Locale.US, "tt:%s tn:%s net:%s cam:%s adg:%s cre:%s cl:%s adid:%s", + return Util.formatString("tt:%s tn:%s net:%s cam:%s adg:%s cre:%s cl:%s adid:%s", trackerToken, trackerName, network, campaign, adgroup, creative, clickLabel, adid); } diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustConfig.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustConfig.java index 79d595405..9de97494f 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustConfig.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustConfig.java @@ -135,8 +135,8 @@ public void setUserAgent(String userAgent) { } public void setAppSecret(long secretId, long info1, long info2, long info3, long info4) { - this.secretId = String.format("%d", secretId); - this.appSecret = String.format("%d%d%d%d", info1, info2, info3, info4); + this.secretId = Util.formatString("%d", secretId); + this.appSecret = Util.formatString("%d%d%d%d", info1, info2, info3, info4); } public void setReadMobileEquipmentIdentity(boolean readMobileEquipmentIdentity) { diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEventFailure.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEventFailure.java index 195635398..eeebc9e84 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEventFailure.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEventFailure.java @@ -17,7 +17,7 @@ public class AdjustEventFailure { @Override public String toString() { - return String.format(Locale.US, "Event Failure msg:%s time:%s adid:%s event:%s retry:%b json:%s", + return Util.formatString("Event Failure msg:%s time:%s adid:%s event:%s retry:%b json:%s", message, timestamp, adid, eventToken, willRetry, jsonResponse); } } diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEventSuccess.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEventSuccess.java index 50091b071..6febb2109 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEventSuccess.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEventSuccess.java @@ -16,7 +16,7 @@ public class AdjustEventSuccess { @Override public String toString() { - return String.format(Locale.US, "Event Success msg:%s time:%s adid:%s event:%s json:%s", + return Util.formatString("Event Success msg:%s time:%s adid:%s event:%s json:%s", message, timestamp, adid, eventToken, jsonResponse); } } diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustSessionFailure.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustSessionFailure.java index 308197ec6..9ef4978bc 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustSessionFailure.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustSessionFailure.java @@ -16,7 +16,7 @@ public class AdjustSessionFailure { @Override public String toString() { - return String.format(Locale.US, "Session Failure msg:%s time:%s adid:%s retry:%b json:%s", + return Util.formatString("Session Failure msg:%s time:%s adid:%s retry:%b json:%s", message, timestamp, adid, willRetry, jsonResponse); } } diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustSessionSuccess.java b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustSessionSuccess.java index bb2ff9bb9..9c4dac459 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustSessionSuccess.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/AdjustSessionSuccess.java @@ -15,7 +15,7 @@ public class AdjustSessionSuccess { @Override public String toString() { - return String.format(Locale.US, "Session Success msg:%s time:%s adid:%s json:%s", + return Util.formatString("Session Success msg:%s time:%s adid:%s json:%s", message, timestamp, adid, jsonResponse); } } diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/DeviceInfo.java b/Adjust/adjust/src/main/java/com/adjust/sdk/DeviceInfo.java index 2abb3523a..7d7db2dad 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/DeviceInfo.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/DeviceInfo.java @@ -249,7 +249,7 @@ private String getClientSdk(String sdkPrefix) { if (sdkPrefix == null) { return Constants.CLIENT_SDK; } else { - return String.format(Locale.US, "%s@%s", sdkPrefix, Constants.CLIENT_SDK); + return Util.formatString("%s@%s", sdkPrefix, Constants.CLIENT_SDK); } } diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/Logger.java b/Adjust/adjust/src/main/java/com/adjust/sdk/Logger.java index 95e441a73..30ee98b67 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/Logger.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/Logger.java @@ -56,9 +56,9 @@ public void verbose(String message, Object... parameters) { } if (logLevel.androidLogLevel <= Log.VERBOSE) { try { - Log.v(LOGTAG, String.format(Locale.US, message, parameters)); + Log.v(LOGTAG, Util.formatString(message, parameters)); } catch (Exception e) { - Log.e(LOGTAG, String.format(Locale.US, formatErrorMessage, message, Arrays.toString(parameters))); + Log.e(LOGTAG, Util.formatString(formatErrorMessage, message, Arrays.toString(parameters))); } } } @@ -70,9 +70,9 @@ public void debug(String message, Object... parameters) { } if (logLevel.androidLogLevel <= Log.DEBUG) { try { - Log.d(LOGTAG, String.format(Locale.US, message, parameters)); + Log.d(LOGTAG, Util.formatString(message, parameters)); } catch (Exception e) { - Log.e(LOGTAG, String.format(Locale.US, formatErrorMessage, message, Arrays.toString(parameters))); + Log.e(LOGTAG, Util.formatString(formatErrorMessage, message, Arrays.toString(parameters))); } } } @@ -84,9 +84,9 @@ public void info(String message, Object... parameters) { } if (logLevel.androidLogLevel <= Log.INFO) { try { - Log.i(LOGTAG, String.format(Locale.US, message, parameters)); + Log.i(LOGTAG, Util.formatString(message, parameters)); } catch (Exception e) { - Log.e(LOGTAG, String.format(Locale.US, formatErrorMessage, message, Arrays.toString(parameters))); + Log.e(LOGTAG, Util.formatString(formatErrorMessage, message, Arrays.toString(parameters))); } } } @@ -98,9 +98,9 @@ public void warn(String message, Object... parameters) { } if (logLevel.androidLogLevel <= Log.WARN) { try { - Log.w(LOGTAG, String.format(Locale.US, message, parameters)); + Log.w(LOGTAG, Util.formatString(message, parameters)); } catch (Exception e) { - Log.e(LOGTAG, String.format(Locale.US, formatErrorMessage, message, Arrays.toString(parameters))); + Log.e(LOGTAG, Util.formatString(formatErrorMessage, message, Arrays.toString(parameters))); } } } @@ -109,9 +109,9 @@ public void warn(String message, Object... parameters) { public void warnInProduction(String message, Object... parameters) { if (logLevel.androidLogLevel <= Log.WARN) { try { - Log.w(LOGTAG, String.format(Locale.US, message, parameters)); + Log.w(LOGTAG, Util.formatString(message, parameters)); } catch (Exception e) { - Log.e(LOGTAG, String.format(Locale.US, formatErrorMessage, message, Arrays.toString(parameters))); + Log.e(LOGTAG, Util.formatString(formatErrorMessage, message, Arrays.toString(parameters))); } } } @@ -124,9 +124,9 @@ public void error(String message, Object... parameters) { } if (logLevel.androidLogLevel <= Log.ERROR) { try { - Log.e(LOGTAG, String.format(Locale.US, message, parameters)); + Log.e(LOGTAG, Util.formatString(message, parameters)); } catch (Exception e) { - Log.e(LOGTAG, String.format(Locale.US, formatErrorMessage, message, Arrays.toString(parameters))); + Log.e(LOGTAG, Util.formatString(formatErrorMessage, message, Arrays.toString(parameters))); } } } @@ -138,9 +138,9 @@ public void Assert(String message, Object... parameters) { } if(logLevel.androidLogLevel <= Log.ASSERT) { try { - Log.println(Log.ASSERT, LOGTAG, String.format(Locale.US, message, parameters)); + Log.println(Log.ASSERT, LOGTAG, Util.formatString(message, parameters)); } catch (Exception e) { - Log.e(LOGTAG, String.format(Locale.US, formatErrorMessage, message, Arrays.toString(parameters))); + Log.e(LOGTAG, Util.formatString(formatErrorMessage, message, Arrays.toString(parameters))); } } } diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/PackageBuilder.java b/Adjust/adjust/src/main/java/com/adjust/sdk/PackageBuilder.java index 4a7db2e27..b791bc899 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/PackageBuilder.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/PackageBuilder.java @@ -328,9 +328,9 @@ private void fillPluginKeys(Map parameters) { private String getEventSuffix(AdjustEvent event) { if (event.revenue == null) { - return String.format(Locale.US, "'%s'", event.eventToken); + return Util.formatString("'%s'", event.eventToken); } else { - return String.format(Locale.US, "(%.5f %s, '%s')", event.revenue, event.currency, event.eventToken); + return Util.formatString("(%.5f %s, '%s')", event.revenue, event.currency, event.eventToken); } } @@ -415,7 +415,7 @@ public static void addBoolean(Map parameters, String key, Boolea public static void addDouble(Map parameters, String key, Double value) { if (value == null) return; - String doubleString = String.format(Locale.US, "%.5f", value); + String doubleString = Util.formatString("%.5f", value); PackageBuilder.addString(parameters, key, doubleString); } diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/RequestHandler.java b/Adjust/adjust/src/main/java/com/adjust/sdk/RequestHandler.java index 85420f72c..9c596b088 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/RequestHandler.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/RequestHandler.java @@ -90,7 +90,7 @@ private void sendI(ActivityPackage activityPackage, int queueSize) { private void closePackageI(ActivityPackage activityPackage, String message, Throwable throwable) { final String packageMessage = activityPackage.getFailureMessage(); final String reasonString = Util.getReasonString(message, throwable); - String finalMessage = String.format("%s. (%s) Will retry later", packageMessage, reasonString); + String finalMessage = Util.formatString("%s. (%s) Will retry later", packageMessage, reasonString); logger.error(finalMessage); ResponseData responseData = ResponseData.buildResponseData(activityPackage); @@ -108,7 +108,7 @@ private void closePackageI(ActivityPackage activityPackage, String message, Thro private void sendNextPackageI(ActivityPackage activityPackage, String message, Throwable throwable) { final String failureMessage = activityPackage.getFailureMessage(); final String reasonString = Util.getReasonString(message, throwable); - String finalMessage = String.format("%s. (%s)", failureMessage, reasonString); + String finalMessage = Util.formatString("%s. (%s)", failureMessage, reasonString); logger.error(finalMessage); ResponseData responseData = ResponseData.buildResponseData(activityPackage); diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/ResponseData.java b/Adjust/adjust/src/main/java/com/adjust/sdk/ResponseData.java index 70da5f867..cddb019cb 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/ResponseData.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/ResponseData.java @@ -47,7 +47,7 @@ public static ResponseData buildResponseData(ActivityPackage activityPackage) { @Override public String toString() { - return String.format(Locale.US, "message:%s timestamp:%s json:%s", + return Util.formatString("message:%s timestamp:%s json:%s", message, timestamp, jsonResponse); } } \ No newline at end of file diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/SdkClickHandler.java b/Adjust/adjust/src/main/java/com/adjust/sdk/SdkClickHandler.java index c9d6c1f5d..de8537d21 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/SdkClickHandler.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/SdkClickHandler.java @@ -377,7 +377,7 @@ private void logErrorMessageI(final ActivityPackage sdkClickPackage, final Throwable throwable) { final String packageMessage = sdkClickPackage.getFailureMessage(); final String reasonString = Util.getReasonString(message, throwable); - final String finalMessage = String.format("%s. (%s)", packageMessage, reasonString); + final String finalMessage = Util.formatString("%s. (%s)", packageMessage, reasonString); logger.error(finalMessage); } diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/Util.java b/Adjust/adjust/src/main/java/com/adjust/sdk/Util.java index 4abe71247..11ec2c442 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/Util.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/Util.java @@ -77,7 +77,7 @@ public static String quote(String string) { return string; } - return String.format(Locale.US, "'%s'", string); + return Util.formatString("'%s'", string); } public static String getPlayAdId(Context context) { @@ -448,7 +448,7 @@ public static String hash(final String text, final String method) { public static String convertToHex(final byte[] bytes) { final BigInteger bigInt = new BigInteger(1, bytes); final String formatString = "%0" + (bytes.length << 1) + "x"; - return String.format(Locale.US, formatString, bigInt); + return Util.formatString(formatString, bigInt); } public static String[] getSupportedAbis() { @@ -461,9 +461,9 @@ public static String getCpuAbi() { public static String getReasonString(String message, Throwable throwable) { if (throwable != null) { - return String.format(Locale.US, "%s: %s", message, throwable); + return Util.formatString("%s: %s", message, throwable); } else { - return String.format(Locale.US, "%s", message); + return Util.formatString("%s", message); } } @@ -623,4 +623,8 @@ public static String getMnc(Context context) { return null; } } + + public static String formatString(String string, Object... args) { + return String.format(Locale.US, string, args); + } } \ No newline at end of file diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/UtilNetworking.java b/Adjust/adjust/src/main/java/com/adjust/sdk/UtilNetworking.java index e28939a3c..83367d171 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/UtilNetworking.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/UtilNetworking.java @@ -148,7 +148,7 @@ private static ResponseData readHttpResponse(HttpsURLConnection connection, Acti try { jsonResponse = new JSONObject(stringResponse); } catch (JSONException e) { - String message = String.format("Failed to parse json response. (%s)", e.getMessage()); + String message = Util.formatString("Failed to parse json response. (%s)", e.getMessage()); logger.error(message); responseData.message = message; } @@ -267,12 +267,12 @@ private static String buildAuthorizationHeader(Map parameters, String signature = Util.sha256(signatureDetails.get("clear_signature")); String fields = signatureDetails.get("fields"); - String secretIdHeader = String.format("secret_id=\"%s\"", secretId); - String signatureHeader = String.format("signature=\"%s\"", signature); - String algorithmHeader = String.format("algorithm=\"%s\"", algorithm); - String fieldsHeader = String.format("headers=\"%s\"", fields); + String secretIdHeader = Util.formatString("secret_id=\"%s\"", secretId); + String signatureHeader = Util.formatString("signature=\"%s\"", signature); + String algorithmHeader = Util.formatString("algorithm=\"%s\"", algorithm); + String fieldsHeader = Util.formatString("headers=\"%s\"", fields); - String authorizationHeader = String.format("Signature %s,%s,%s,%s", secretIdHeader, signatureHeader, algorithmHeader, fieldsHeader); + String authorizationHeader = Util.formatString("Signature %s,%s,%s,%s", secretIdHeader, signatureHeader, algorithmHeader, fieldsHeader); getLogger().verbose("authorizationHeader: %s", authorizationHeader); return authorizationHeader; diff --git a/Adjust/plugin/Criteo/com/adjust/sdk/plugin/AdjustCriteo.java b/Adjust/plugin/Criteo/com/adjust/sdk/plugin/AdjustCriteo.java index 024cd678f..0bdc29354 100644 --- a/Adjust/plugin/Criteo/com/adjust/sdk/plugin/AdjustCriteo.java +++ b/Adjust/plugin/Criteo/com/adjust/sdk/plugin/AdjustCriteo.java @@ -180,7 +180,7 @@ private static String createCriteoVLFromProducts(List productIds) { } for (int i = 0; i < productIdsSize; ) { String productID = productIds.get(i); - String productString = String.format(Locale.US, "\"%s\"", productID); + String productString = Util.formatString("\"%s\"", productID); criteoVLValue.append(productString); i++; @@ -210,7 +210,7 @@ private static String createCriteoVBFromProducts(List products) { int productsSize = products.size(); for (int i = 0; i < productsSize; ) { CriteoProduct criteoProduct = products.get(i); - String productString = String.format(Locale.US, "{\"i\":\"%s\",\"pr\":%f,\"q\":%d}", + String productString = Util.formatString("{\"i\":\"%s\",\"pr\":%f,\"q\":%d}", criteoProduct.productID, criteoProduct.price, criteoProduct.quantity); diff --git a/Adjust/plugin/Trademob/com/adjust/sdk/plugin/AdjustTrademob.java b/Adjust/plugin/Trademob/com/adjust/sdk/plugin/AdjustTrademob.java index 24e7bf0d1..ac6117e4a 100644 --- a/Adjust/plugin/Trademob/com/adjust/sdk/plugin/AdjustTrademob.java +++ b/Adjust/plugin/Trademob/com/adjust/sdk/plugin/AdjustTrademob.java @@ -56,7 +56,7 @@ private static String stringifyItemIds(List itemIds) { while (i < itemsSize) { String itemId = itemIds.get(i); - String itemString = String.format(Locale.US, "\"%s\"", itemId); + String itemString = Util.formatString("\"%s\"", itemId); tmViewList.append(itemString); i++; @@ -84,7 +84,7 @@ private static String stringifyItems(List items) { for (int i = 0; i < itemsSize; ) { TrademobItem item = items.get(i); - String itemString = String.format(Locale.US, "{\"id\":\"%s\",\"price\":%f,\"quantity\":%d}", + String itemString = Util.formatString("{\"id\":\"%s\",\"price\":%f,\"quantity\":%d}", item.itemId, item.price, item.quantity); From 93baf445d6587264d7cd1bc0a0ff9a15c52d52e3 Mon Sep 17 00:00:00 2001 From: nonelse Date: Wed, 31 Jan 2018 18:12:11 +0100 Subject: [PATCH 2/6] Rename argument --- Adjust/adjust/src/main/java/com/adjust/sdk/Util.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/Util.java b/Adjust/adjust/src/main/java/com/adjust/sdk/Util.java index 11ec2c442..6b9da0ddf 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/Util.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/Util.java @@ -624,7 +624,7 @@ public static String getMnc(Context context) { } } - public static String formatString(String string, Object... args) { - return String.format(Locale.US, string, args); + public static String formatString(String format, Object... args) { + return String.format(Locale.US, format, args); } } \ No newline at end of file From 5dfc98403782ea466e8336c9f6f39a4d1396d58a Mon Sep 17 00:00:00 2001 From: nonelse Date: Wed, 31 Jan 2018 18:42:40 +0100 Subject: [PATCH 3/6] New version 4.12.1 --- Adjust/adjust/build.gradle | 2 +- Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java | 2 +- Adjust/example/build.gradle | 2 +- Adjust/pom.xml | 2 +- Adjust/pom_criteo.xml | 2 +- Adjust/pom_sociomantic.xml | 2 +- Adjust/pom_trademob.xml | 2 +- .../java/com/adjust/sdk/TestActivityPackage.java | 2 +- README.md | 6 +++--- VERSION | 2 +- doc/english/criteo_plugin.md | 2 +- doc/english/migrate.md | 2 +- doc/english/sociomantic_plugin.md | 2 +- doc/english/trademob_plugin.md | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Adjust/adjust/build.gradle b/Adjust/adjust/build.gradle index cfc9e9a06..df3c67eb4 100644 --- a/Adjust/adjust/build.gradle +++ b/Adjust/adjust/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' def getVersionName() { - return "4.12.0" + return "4.12.1" } android { diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java b/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java index be11a4cbf..4c9c2ba3c 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java @@ -29,7 +29,7 @@ public interface Constants { String BASE_URL = "https://app.adjust.com"; String SCHEME = "https"; String AUTHORITY = "app.adjust.com"; - String CLIENT_SDK = "android4.12.0"; + String CLIENT_SDK = "android4.12.1"; String LOGTAG = "Adjust"; String REFTAG = "reftag"; String INSTALL_REFERRER = "install_referrer"; diff --git a/Adjust/example/build.gradle b/Adjust/example/build.gradle index eb8764232..02062f5a0 100644 --- a/Adjust/example/build.gradle +++ b/Adjust/example/build.gradle @@ -27,7 +27,7 @@ dependencies { // running mvn package //compile fileTree(dir: '../target', include: ['*.jar']) // using maven repository - //compile 'com.adjust.sdk:adjust-android:4.12.0' + //compile 'com.adjust.sdk:adjust-android:4.12.1' debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4' releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4' diff --git a/Adjust/pom.xml b/Adjust/pom.xml index 9355f76da..a053727d0 100644 --- a/Adjust/pom.xml +++ b/Adjust/pom.xml @@ -5,7 +5,7 @@ 4.0.0 adjust-android com.adjust.sdk - 4.12.0 + 4.12.1 jar Adjust Android SDK https://github.com/adjust/android_sdk diff --git a/Adjust/pom_criteo.xml b/Adjust/pom_criteo.xml index 2997314b4..12e20c400 100644 --- a/Adjust/pom_criteo.xml +++ b/Adjust/pom_criteo.xml @@ -5,7 +5,7 @@ 4.0.0 adjust-android-criteo com.adjust.sdk - 4.12.0 + 4.12.1 jar Adjust Android SDK https://github.com/adjust/android_sdk diff --git a/Adjust/pom_sociomantic.xml b/Adjust/pom_sociomantic.xml index 3c12538ca..b7f5aa0ca 100644 --- a/Adjust/pom_sociomantic.xml +++ b/Adjust/pom_sociomantic.xml @@ -5,7 +5,7 @@ 4.0.0 adjust-android-sociomantic com.adjust.sdk - 4.12.0 + 4.12.1 jar Adjust Android SDK https://github.com/adjust/android_sdk diff --git a/Adjust/pom_trademob.xml b/Adjust/pom_trademob.xml index a8696be21..0eed38445 100644 --- a/Adjust/pom_trademob.xml +++ b/Adjust/pom_trademob.xml @@ -5,7 +5,7 @@ 4.0.0 adjust-android-trademob com.adjust.sdk - 4.12.0 + 4.12.1 jar Adjust Android SDK https://github.com/adjust/android_sdk diff --git a/Adjust/test/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java b/Adjust/test/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java index 852b795c7..4d5d18300 100644 --- a/Adjust/test/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java +++ b/Adjust/test/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java @@ -53,7 +53,7 @@ public TestActivityPackage(ActivityPackage activityPackage) { // default values appToken = "123456789012"; environment = "sandbox"; - clientSdk = "android4.12.0"; + clientSdk = "android4.12.1"; suffix = ""; attribution = new AdjustAttribution(); playServices = true; diff --git a/README.md b/README.md index c732ff240..176231718 100644 --- a/README.md +++ b/README.md @@ -72,14 +72,14 @@ These are the minimal steps required to integrate the Adjust SDK into your Andro If you are using Maven, add the following to your `build.gradle` file: ``` -compile 'com.adjust.sdk:adjust-android:4.12.0' +compile 'com.adjust.sdk:adjust-android:4.12.1' compile 'com.android.installreferrer:installreferrer:1.0' ``` **Note**: If you are using `Gradle 3.0.0 or above`, make sure to use the `implementation` keyword instead of `compile` as follows: ``` -implementation 'com.adjust.sdk:adjust-android:4.12.0' +implementation 'com.adjust.sdk:adjust-android:4.12.1' implementation 'com.android.installreferrer:installreferrer:1.0' ``` @@ -184,7 +184,7 @@ Also, make sure that you have paid attention to the [Proguard settings](#sdk-pro -keep public class com.android.installreferrer.** { *; } ``` -This feature is supported if you are using **Adjust SDK v4.12.0 or above**. +This feature is supported if you are using **Adjust SDK v4.12.1 or above**. #### Google Play Store intent diff --git a/VERSION b/VERSION index 815588ef1..53cf85e17 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.12.0 +4.12.1 diff --git a/doc/english/criteo_plugin.md b/doc/english/criteo_plugin.md index 5a2d2c732..28154faab 100644 --- a/doc/english/criteo_plugin.md +++ b/doc/english/criteo_plugin.md @@ -3,7 +3,7 @@ Add the dependency of the adjust sdk with the Criteo plugin: ``` -compile 'com.adjust.sdk:adjust-android-criteo:4.12.0' +compile 'com.adjust.sdk:adjust-android-criteo:4.12.1' ``` Or integrate adjust with Criteo events by following these steps: diff --git a/doc/english/migrate.md b/doc/english/migrate.md index 80c764291..758514918 100644 --- a/doc/english/migrate.md +++ b/doc/english/migrate.md @@ -1,4 +1,4 @@ -## Migrate your adjust SDK for Android to 4.12.0 from 3.6.2 +## Migrate your adjust SDK for Android to 4.12.1 from 3.6.2 ### The Application class diff --git a/doc/english/sociomantic_plugin.md b/doc/english/sociomantic_plugin.md index 451f712c6..2c2c16fa1 100644 --- a/doc/english/sociomantic_plugin.md +++ b/doc/english/sociomantic_plugin.md @@ -3,7 +3,7 @@ Add the dependency of the adjust sdk with the Sociomantic plugin: ``` -compile 'com.adjust.sdk:adjust-android-sociomantic:4.12.0' +compile 'com.adjust.sdk:adjust-android-sociomantic:4.12.1' ``` Or integrate adjust with Sociomantic events by following these steps: diff --git a/doc/english/trademob_plugin.md b/doc/english/trademob_plugin.md index 11a65acad..3a9c0900a 100644 --- a/doc/english/trademob_plugin.md +++ b/doc/english/trademob_plugin.md @@ -3,7 +3,7 @@ Add the dependency of the adjust sdk with the Trademob plugin: ``` -compile 'com.adjust.sdk:adjust-android-trademob:4.12.0' +compile 'com.adjust.sdk:adjust-android-trademob:4.12.1' ``` Or integrate adjust with Trademob events by following these steps: From 93d517399116a52d81752b4044b6588f82edba1a Mon Sep 17 00:00:00 2001 From: Pedro Filipe Date: Wed, 31 Jan 2018 18:44:45 +0100 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7799674f2..2b6d6e19e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### Version 4.12.1 (31st January 2018) +#### Fixed +- Correctly format strings with US locale + +--- + ### Version 4.12.0 (13th December 2017) #### Added - Added support for new Google referrer API (https://developer.android.com/google/play/installreferrer/library.html). From bfd10224c9af53b604b5ecb3b8f29443b5d903f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uglje=C5=A1a=20Erceg?= Date: Wed, 31 Jan 2018 19:06:34 +0100 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b6d6e19e..32a2f7eaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### Version 4.12.1 (31st January 2018) #### Fixed -- Correctly format strings with US locale +- Formatting all strings with US locale. --- From 5b354c19cb990daf912fb22ffe69ae551aa623e0 Mon Sep 17 00:00:00 2001 From: nonelse Date: Wed, 31 Jan 2018 19:06:58 +0100 Subject: [PATCH 6/6] Change string format in plugins --- Adjust/plugin/Criteo/com/adjust/sdk/plugin/AdjustCriteo.java | 4 ++-- .../plugin/Trademob/com/adjust/sdk/plugin/AdjustTrademob.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Adjust/plugin/Criteo/com/adjust/sdk/plugin/AdjustCriteo.java b/Adjust/plugin/Criteo/com/adjust/sdk/plugin/AdjustCriteo.java index 0bdc29354..024cd678f 100644 --- a/Adjust/plugin/Criteo/com/adjust/sdk/plugin/AdjustCriteo.java +++ b/Adjust/plugin/Criteo/com/adjust/sdk/plugin/AdjustCriteo.java @@ -180,7 +180,7 @@ private static String createCriteoVLFromProducts(List productIds) { } for (int i = 0; i < productIdsSize; ) { String productID = productIds.get(i); - String productString = Util.formatString("\"%s\"", productID); + String productString = String.format(Locale.US, "\"%s\"", productID); criteoVLValue.append(productString); i++; @@ -210,7 +210,7 @@ private static String createCriteoVBFromProducts(List products) { int productsSize = products.size(); for (int i = 0; i < productsSize; ) { CriteoProduct criteoProduct = products.get(i); - String productString = Util.formatString("{\"i\":\"%s\",\"pr\":%f,\"q\":%d}", + String productString = String.format(Locale.US, "{\"i\":\"%s\",\"pr\":%f,\"q\":%d}", criteoProduct.productID, criteoProduct.price, criteoProduct.quantity); diff --git a/Adjust/plugin/Trademob/com/adjust/sdk/plugin/AdjustTrademob.java b/Adjust/plugin/Trademob/com/adjust/sdk/plugin/AdjustTrademob.java index ac6117e4a..24e7bf0d1 100644 --- a/Adjust/plugin/Trademob/com/adjust/sdk/plugin/AdjustTrademob.java +++ b/Adjust/plugin/Trademob/com/adjust/sdk/plugin/AdjustTrademob.java @@ -56,7 +56,7 @@ private static String stringifyItemIds(List itemIds) { while (i < itemsSize) { String itemId = itemIds.get(i); - String itemString = Util.formatString("\"%s\"", itemId); + String itemString = String.format(Locale.US, "\"%s\"", itemId); tmViewList.append(itemString); i++; @@ -84,7 +84,7 @@ private static String stringifyItems(List items) { for (int i = 0; i < itemsSize; ) { TrademobItem item = items.get(i); - String itemString = Util.formatString("{\"id\":\"%s\",\"price\":%f,\"quantity\":%d}", + String itemString = String.format(Locale.US, "{\"id\":\"%s\",\"price\":%f,\"quantity\":%d}", item.itemId, item.price, item.quantity);