diff --git a/app b/app index a127e14a..2e3e1a12 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit a127e14a0f6828d2d5d165d05f75afc315700138 +Subproject commit 2e3e1a125027f92ff5a41dd82c7bafded0c4eb43 diff --git a/src/main/java/io/lbry/browser/LbrynetMessagingService.java b/src/main/java/io/lbry/browser/LbrynetMessagingService.java index f3d32319..80424dc9 100644 --- a/src/main/java/io/lbry/browser/LbrynetMessagingService.java +++ b/src/main/java/io/lbry/browser/LbrynetMessagingService.java @@ -9,10 +9,12 @@ import android.content.SharedPreferences; import android.media.RingtoneManager; import android.net.Uri; import android.os.Build; +import android.os.Bundle; import android.support.v4.app.NotificationCompat; import android.support.v4.content.ContextCompat; import android.util.Log; +import com.google.firebase.analytics.FirebaseAnalytics; import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; @@ -36,9 +38,14 @@ public class LbrynetMessagingService extends FirebaseMessagingService { private static final String TYPE_CREATOR = "creator"; + private FirebaseAnalytics firebaseAnalytics; + @Override public void onMessageReceived(RemoteMessage remoteMessage) { Log.d(TAG, "From: " + remoteMessage.getFrom()); + if (firebaseAnalytics == null) { + firebaseAnalytics = FirebaseAnalytics.getInstance(this); + } Map payload = remoteMessage.getData(); if (payload != null) { @@ -46,9 +53,16 @@ public class LbrynetMessagingService extends FirebaseMessagingService { String url = payload.get("target"); String title = payload.get("title"); String body = payload.get("body"); + String name = payload.get("name"); // notification name if (type != null && getEnabledTypes().indexOf(type) > -1 && body != null && body.trim().length() > 0) { - Log.d(TAG, "Message Notification Body: " + body); - sendNotification(title, body, type, url); + // only log the receive event for valid notifications received + if (firebaseAnalytics != null) { + Bundle bundle = new Bundle(); + bundle.putString("name", name); + firebaseAnalytics.logEvent("lbry_notification_receive", bundle); + } + + sendNotification(title, body, type, url, name); } } } @@ -80,7 +94,7 @@ public class LbrynetMessagingService extends FirebaseMessagingService { * * @param messageBody FCM message body received. */ - private void sendNotification(String title, String messageBody, String type, String url) { + private void sendNotification(String title, String messageBody, String type, String url, String name) { //Intent intent = new Intent(this, MainActivity.class); //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); if (url == null) { @@ -93,6 +107,7 @@ public class LbrynetMessagingService extends FirebaseMessagingService { } Intent launchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + launchIntent.putExtra("notification_name", name); launchIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, launchIntent, PendingIntent.FLAG_ONE_SHOT); diff --git a/src/main/java/io/lbry/browser/MainActivity.java b/src/main/java/io/lbry/browser/MainActivity.java index f4eee2a2..52f03728 100644 --- a/src/main/java/io/lbry/browser/MainActivity.java +++ b/src/main/java/io/lbry/browser/MainActivity.java @@ -42,6 +42,7 @@ import com.facebook.react.modules.core.PermissionAwareActivity; import com.facebook.react.modules.core.PermissionListener; import com.facebook.react.shell.MainReactPackage; import com.facebook.react.ReactRootView; +import com.google.firebase.analytics.FirebaseAnalytics; import com.reactnativecommunity.asyncstorage.AsyncStoragePackage; import com.rnfs.RNFSPackage; import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView; @@ -91,6 +92,8 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand private BroadcastReceiver downloadEventReceiver; + private FirebaseAnalytics firebaseAnalytics; + private ReactRootView mReactRootView; private ReactInstanceManager mReactInstanceManager; @@ -149,6 +152,8 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand ServiceHelper.start(this, "", LbrynetService.class, "lbrynetservice"); } + checkNotificationOpenIntent(getIntent()); + mReactRootView = new RNGestureHandlerEnabledRootView(this); mReactInstanceManager = ReactInstanceManager.builder() .setApplication(getApplication()) @@ -174,6 +179,25 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand setContentView(mReactRootView); } + private void checkNotificationOpenIntent(Intent intent) { + if (intent != null) { + String notificationName = intent.getStringExtra("notification_name"); + if (notificationName != null) { + logNotificationOpen(notificationName); + } + } + } + + private void logNotificationOpen(String name) { + if (firebaseAnalytics == null) { + firebaseAnalytics = FirebaseAnalytics.getInstance(this); + } + + Bundle bundle = new Bundle(); + bundle.putString("name", name); + firebaseAnalytics.logEvent("lbry_notification_open", bundle); + } + private void registerDownloadEventReceiver() { IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction(DownloadManager.ACTION_DOWNLOAD_EVENT); @@ -534,6 +558,8 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this); notificationManager.cancel(sourceNotificationId); } + + checkNotificationOpenIntent(intent); } super.onNewIntent(intent);