Merge pull request #11 from AdevintaSpain/integration

Integrate upstream changes

Author: ivngrz

.gitignore

@@ -120,7 +120,6 @@ $RECYCLE.BIN/
 # Icon must end with two \r
 Icon
 
-
 # Thumbnails
 ._*
 
@@ -148,4 +147,8 @@ Temporary Items
 build/
 
 # Ignore Gradle GUI config
-gradle-app.setting
+gradle-app.setting
+
+# VSCode
+.classpath
+.project

CHANGELOG.md

@@ -1,3 +1,38 @@
+## 6.0.0
+
+##### Breaking
+- Updated to [Braze Android SDK 9.0.0](https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md#900).
+
+## 5.0.0
+
+##### Fixed
+- Fixes an issue where purchases would be logged for any `track` payload with `products` included. After this fix, a `track` payload must either contain `revenue` or have the event name `Order Completed` to result in a logged purchase to Braze.
+- Fixes an issue where `anonymousId` and `userId` could be set as custom attributes when calling `identify()`.
+
+## 4.0.0
+
+##### Breaking
+- Log separate purchases for each `product` in the `products` array in a `track` call.
+  - In the past we always used the event name as the Braze product ID.
+  - Now if a track call has the event name `Order Completed` or key `revenue` included in `properties` and has a `products` array, we will log each object in the array as a separate purchase using `productId` as the Braze product ID. `price` and `quantity` will be read from the individual array if available and all non-Braze recognized fields from the high level `properties` and each individual array will be combined and sent as event properties.
+  - If there is no `products` array we will continue using the event name as the Braze product ID if the key `revenue` is included in `properties`.
+
+## 3.0.0
+
+##### Breaking
+- Updated to [Braze Android SDK 6.0.0](https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md#600).
+
+##### Changed
+- The `campaign` property value is now casted to `ValueMap` instead of its `Properties` subclass.
+  - See https://github.com/Appboy/appboy-segment-android/pull/19. Thanks @ciaranmul!
+- The `appboy-sample` sample app is now located within this repo instead of a separate standalone repo.
+- The SDK code has been moved into a directory called `appboy-segment-integration`.
+
+## 2.5.2
+
+##### Fixed
+- Fixed potential for null pointer exception in the `identify()` method resulting from a null value for `Appboy.getCurrentUser()`.
+
 ## 2.5.1
 
 ##### Added

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Braze, Inc.
+Copyright (c) 2020 Braze, Inc.
 All rights reserved.
 
 * The use of source code or binaries contained within Braze's sample apps, documentation, stub APIs and other related utilities is permitted only to enable testing and quality assurance of integrations with the Braze platform by current customers of Braze.

appboy-sample/app/build.gradle

@@ -0,0 +1,47 @@
+apply plugin: 'com.android.application'
+
+android {
+  compileSdkVersion 29
+  buildToolsVersion "29.0.0"
+
+  defaultConfig {
+    applicationId "com.appboy.segment.appboysample"
+    minSdkVersion 16
+    targetSdkVersion 29
+    versionCode 1
+    versionName "1.0.0"
+  }
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+  buildTypes {
+    release {
+      minifyEnabled false
+      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+    }
+  }
+}
+
+// Grabs the first line of the changelog to get the current version. Expects the line to start with Markdown syntax
+// (ex: ## major.minor.build)
+def changelogFile = new File("../public/CHANGELOG.md")
+if (changelogFile.exists()) {
+  changelogFile.withReader {
+    version = it.readLine().substring(3)
+  }
+  logger.lifecycle("Setting version to last recorded version in `../appboy-segment-integration/CHANGELOG.md`: " + version)
+} else {
+  version = "+"
+  logger.lifecycle("Setting version to highest version found in local maven cache: " + version)
+}
+
+dependencies {
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
+  implementation 'com.android.support:appcompat-v7:28.0.0'
+  implementation 'com.android.support:design:28.0.0'
+  implementation('com.segment.analytics.android:analytics:4.3.1') {
+    transitive = true
+  }
+  implementation "com.appboy:appboy-segment-integration:${version}"
+}

appboy-sample/app/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/brianwheeler/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

appboy-sample/app/src/main/AndroidManifest.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.appboy.segment.appboysample" >
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        android:name=".AppboySegmentApplication">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.appboy.ui.AppboyWebViewActivity" />
+    </application>
+</manifest>

appboy-sample/app/src/main/java/com/appboy/segment/appboysample/AppboySegmentApplication.java

@@ -0,0 +1,33 @@
+package com.appboy.segment.appboysample;
+
+import android.app.Application;
+import android.util.Log;
+
+import com.appboy.Constants;
+import com.appboy.support.AppboyLogger;
+import com.segment.analytics.Analytics;
+import com.segment.analytics.android.integrations.appboy.AppboyIntegration;
+
+public class AppboySegmentApplication extends Application {
+  private static final String TAG = String.format("%s.%s", Constants.APPBOY_LOG_TAG_PREFIX, AppboySegmentApplication.class.getName());
+  private static final String WRITE_KEY = @"YOUR_WRITE_KEY";
+  private static final String APPBOY_KEY = "Appboy";
+  public static boolean sAppboySegmentEnabled = false;
+
+  @Override public void onCreate() {
+    super.onCreate();
+    AppboyLogger.setLogLevel(Log.VERBOSE);
+    Analytics.Builder builder = new Analytics.Builder(this, WRITE_KEY);
+    builder.use(AppboyIntegration.FACTORY);
+    builder.logLevel(Analytics.LogLevel.VERBOSE);
+    Analytics.setSingletonInstance(builder.build());
+
+    Analytics.with(this).onIntegrationReady(APPBOY_KEY, new Analytics.Callback() {
+      @Override
+      public void onReady(Object instance) {
+        Log.i(TAG, "analytics.onIntegrationReady() called");
+        sAppboySegmentEnabled = true;
+      }
+    });
+  }
+}

appboy-sample/app/src/main/java/com/appboy/segment/appboysample/MainActivity.java

@@ -0,0 +1,94 @@
+package com.appboy.segment.appboysample;
+
+import android.content.Context;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.os.Bundle;
+import android.util.Log;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Toast;
+
+import com.appboy.Constants;
+import com.appboy.support.AppboyLogger;
+import com.appboy.ui.AppboyFeedFragment;
+
+public class MainActivity extends AppCompatActivity {
+  private static final String TAG = String.format("%s.%s", Constants.APPBOY_LOG_TAG_PREFIX, MainActivity.class.getName());
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    AppboyLogger.setLogLevel(Log.VERBOSE);
+    setContentView(R.layout.activity_main);
+    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+    setSupportActionBar(toolbar);
+
+    final FragmentManager fragmentManager = getSupportFragmentManager();
+    Fragment currentFragment = fragmentManager.findFragmentById(R.id.root);
+
+    if (currentFragment == null) {
+      fragmentManager.beginTransaction().add(R.id.root, new MainFragment()).commit();
+    }
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    // Inflate the menu; this adds items to the action bar if it is present.
+    getMenuInflater().inflate(R.menu.menu_main, menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    if (!AppboySegmentApplication.sAppboySegmentEnabled) {
+      Toast.makeText(this, "Appboy integration disabled. Doing nothing.", Toast.LENGTH_LONG).show();
+      return super.onOptionsItemSelected(item);
+    }
+    // Handle action bar item clicks here. The action bar will
+    // automatically handle clicks on the Home/Up button, so long
+    // as you specify a parent activity in AndroidManifest.xml.
+    int id = item.getItemId();
+    if (id == R.id.newsfeed) {
+      replaceCurrentFragment(new AppboyFeedFragment());
+      return true;
+    }
+    return super.onOptionsItemSelected(item);
+  }
+
+  private void replaceCurrentFragment(Fragment newFragment) {
+    FragmentManager fragmentManager = getSupportFragmentManager();
+    Fragment currentFragment = fragmentManager.findFragmentById(R.id.root);
+
+    if (currentFragment != null && currentFragment.getClass().equals(newFragment.getClass())) {
+      Log.i(TAG, String.format("Fragment of type %s is already the active fragment. Ignoring request to replace " +
+          "current fragment.", currentFragment.getClass()));
+      return;
+    }
+
+    hideSoftKeyboard();
+    FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+    fragmentTransaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out,
+        android.R.anim.fade_in, android.R.anim.fade_out);
+    fragmentTransaction.replace(R.id.root, newFragment, newFragment.getClass().toString());
+    if (currentFragment != null) {
+      fragmentTransaction.addToBackStack(newFragment.getClass().toString());
+    } else {
+      fragmentTransaction.addToBackStack(null);
+    }
+    fragmentTransaction.commit();
+  }
+
+  private void hideSoftKeyboard() {
+    if (getCurrentFocus() != null) {
+      InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+      inputMethodManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(),
+          InputMethodManager.RESULT_UNCHANGED_SHOWN);
+    }
+  }
+}