Merge pull request #108 from adjust/nicolas-brugneaux-sociomantic-master

Nicolas brugneaux sociomantic master

Author: nonelse

Adjust/adjust/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 9
         targetSdkVersion 21
         versionCode 1
-        versionName "4.0.2"
+        versionName "4.0.3"
     }
 }
 

Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java

@@ -345,7 +345,7 @@ private void initInternal() {
 
         deviceInfo = new DeviceInfo(adjustConfig.context, adjustConfig.sdkPrefix);
 
-        if (adjustConfig.environment == AdjustConfig.ENVIRONMENT_PRODUCTION) {
+        if (AdjustConfig.ENVIRONMENT_PRODUCTION.equals(adjustConfig.environment)) {
             logger.setLogLevel(LogLevel.ASSERT);
         } else {
             logger.setLogLevel(adjustConfig.logLevel);

Adjust/adjust/src/main/java/com/adjust/sdk/AdjustEvent.java

@@ -85,7 +85,7 @@ private boolean checkRevenue(Double revenue, String currency) {
                 logger.error("Currency must be set with revenue");
                 return false;
             }
-            if (currency == "") {
+            if (currency.equals("")) {
                 logger.error("Currency is empty");
                 return false;
             }
@@ -102,7 +102,7 @@ private boolean isValidParameter(String attribute, String attributeType, String
             logger.error("%s parameter %s is missing", parameterName, attributeType);
             return false;
         }
-        if (attribute == "") {
+        if (attribute.equals("")) {
             logger.error("%s parameter %s is empty", parameterName, attributeType);
             return false;
         }

Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java

@@ -27,7 +27,7 @@ public interface Constants {
     String BASE_URL = "https://app.adjust.com";
     String SCHEME = "https";
     String AUTHORITY = "app.adjust.com";
-    String CLIENT_SDK = "android4.0.2";
+    String CLIENT_SDK = "android4.0.3";
     String LOGTAG = "Adjust";
 
     String ACTIVITY_STATE_FILENAME = "AdjustIoActivityState";

Adjust/adjust/src/main/java/com/adjust/sdk/DeviceInfo.java

@@ -184,7 +184,7 @@ private String getScreenDensity(DisplayMetrics displayMetrics) {
         int low = (DisplayMetrics.DENSITY_MEDIUM + DisplayMetrics.DENSITY_LOW) / 2;
         int high = (DisplayMetrics.DENSITY_MEDIUM + DisplayMetrics.DENSITY_HIGH) / 2;
 
-        if (0 == density) {
+        if (density == 0) {
             return null;
         } else if (density < low) {
             return LOW;
@@ -272,7 +272,7 @@ private String getFacebookAttributionId(final Context context) {
             final String[] projection = {columnName};
             final Cursor cursor = contentResolver.query(uri, projection, null, null, null);
 
-            if (null == cursor) {
+            if (cursor == null) {
                 return null;
             }
             if (!cursor.moveToFirst()) {

Adjust/adjust/src/main/java/com/adjust/sdk/PackageHandler.java

@@ -139,7 +139,7 @@ public void handleMessage(Message message) {
             super.handleMessage(message);
 
             PackageHandler packageHandler = packageHandlerReference.get();
-            if (null == packageHandler) {
+            if (packageHandler == null) {
                 return;
             }
 

Adjust/adjust/src/main/java/com/adjust/sdk/RequestHandler.java

@@ -93,7 +93,7 @@ public void handleMessage(Message message) {
             super.handleMessage(message);
 
             RequestHandler requestHandler = requestHandlerReference.get();
-            if (null == requestHandler) {
+            if (requestHandler == null) {
                 return;
             }
 

Adjust/adjust/src/main/java/com/adjust/sdk/Util.java

@@ -70,7 +70,7 @@ public static String quote(String string) {
     }
 
     public static String dateFormat(long date) {
-        if (null == dateFormat) {
+        if (dateFormat == null) {
             dateFormat = new SimpleDateFormat(DATE_FORMAT, Locale.US);
         }
         return dateFormat.format(date);

Adjust/example/build.gradle

@@ -22,11 +22,11 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:21.0.3'
-    compile 'com.google.android.gms:play-services-ads:6.5.87'
+    compile 'com.google.android.gms:play-services:7.0.0'
     // imported module
     compile project(":adjust")
     // running mvn package
     //compile fileTree(dir: '../target', include: ['*.jar'])
     // using maven repository
-    //compile 'com.adjust.sdk:adjust-android:4.0.2'
+    //compile 'com.adjust.sdk:adjust-android:4.0.3'
 }

Adjust/example/src/main/AndroidManifest.xml

@@ -11,8 +11,6 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:name=".GlobalApplication">
-        <meta-data android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
         <receiver
             android:name="com.adjust.sdk.AdjustReferrerReceiver"
             android:exported="true">