1) OneSignal push notification feature implemented for user.

2) Now user can send push notification from FCM or OneSignal.
3) Crashes is fixed
4) And Now We are releasing sdk version 2.2.0.

Author: yogesh-wittyfeed

README.md

@@ -2,10 +2,10 @@
 
 > # Note
 > WittyFeed SDK API is now `OneFeed Android SDK`,
-> New v2.1.15 made live on 07 Sep' 2018
+> New v2.2.0 made live on 21 Sep' 2018
 
 [![Platform](https://img.shields.io/badge/Platform-Android-green.svg)](#)
-[![Source](https://img.shields.io/badge/Source-JitPack-brightgreen.svg)](https://jitpack.io/private#vatsanatech/OneFeed-Android-SDK/2.1.15)
+[![Source](https://img.shields.io/badge/Source-JitPack-brightgreen.svg)](https://jitpack.io/private#vatsanatech/OneFeed-Android-SDK/2.2.0)
 [![License](https://img.shields.io/badge/LICENSE-WittyFeed%20SDK%20License-blue.svg)](https://github.com/vatsanatech/OneFeed-Android-SDK/blob/master/LICENSE)
 
 ## Table Of Contents
@@ -34,7 +34,7 @@ Browse through the example app in this repository to see how the OneFeed SDK can
 
 ### 1.2. Incorporating the SDK
 
-1. [Integrate OneFeed with JitPack](https://jitpack.io/private#vatsanatech/OneFeed-Android-SDK/2.1.15)
+1. [Integrate OneFeed with JitPack](https://jitpack.io/private#vatsanatech/OneFeed-Android-SDK/2.2.0)
 
 2. SignUp at [OneFeed](http://www.onefeed.ai/) and create a new application to integrate with
 
@@ -51,10 +51,10 @@ Browse through the example app in this repository to see how the OneFeed SDK can
 		}
 	}
 ```
-* add OneFeed-Android-SDK:2.1.15 in your app level build.gradle
+* add OneFeed-Android-SDK:2.2.0 in your app level build.gradle
 ```gradle
     dependencies {
-	        compile 'com.github.vatsanatech:OneFeed-Android-SDK:2.1.15'
+	        compile 'com.github.vatsanatech:OneFeed-Android-SDK:2.2.0'
 	}
 ```
 

app/google-services.json

@@ -1,58 +1,27 @@
 {
   "project_info": {
-    "project_number": "374106365444",
-    "firebase_url": "https://witty-android-sdk.firebaseio.com",
-    "project_id": "witty-android-sdk",
-    "storage_bucket": "witty-android-sdk.appspot.com"
+    "project_number": "894695272295",
+    "firebase_url": "https://onefeed-sdk-v1.firebaseio.com",
+    "project_id": "onefeed-sdk-v1",
+    "storage_bucket": "onefeed-sdk-v1.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:374106365444:android:9c891c0c2080995d",
-        "android_client_info": {
-          "package_name": "com.sdk.wittyfeed.debug"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "374106365444-iu4e3uqon026oesm7219o9sids4kvpmh.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDAmVMELCKaB2ld0yRRNhjpkWtL1xTigkg"
-        }
-      ],
-      "services": {
-        "analytics_service": {
-          "status": 1
-        },
-        "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 2
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:374106365444:android:b29e8182efb73ccb",
+        "mobilesdk_app_id": "1:894695272295:android:b29e8182efb73ccb",
         "android_client_info": {
           "package_name": "com.sdk.wittyfeed.demo"
         }
       },
       "oauth_client": [
         {
-          "client_id": "374106365444-iu4e3uqon026oesm7219o9sids4kvpmh.apps.googleusercontent.com",
+          "client_id": "894695272295-3gam46iue8bfkga602emn237dv8r0s7d.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDAmVMELCKaB2ld0yRRNhjpkWtL1xTigkg"
+          "current_key": "AIzaSyCdBSwFDX589j9Z_mfkRmutaEi92XtOzmc"
         }
       ],
       "services": {

app/src/main/AndroidManifest.xml

@@ -67,14 +67,14 @@
         <!-- Disable opening of launcher Activity -->
         <meta-data android:name="com.onesignal.NotificationOpened.DEFAULT" android:value="DISABLE" />
 
-        <service
+        <!--<service
             android:name=".NotificationExtenderExample"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.onesignal.NotificationExtender" />
             </intent-filter>
-        </service>
+        </service>-->
 
     </application>
 

app/src/main/java/com/wittyfeed/sdk/demo/MainActivity.java

@@ -21,6 +21,9 @@
 import com.wittyfeed.sdk.onefeed.Utils.OneFeedBuilder;
 
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.HashMap;
 
 public class MainActivity extends AppCompatActivity {
@@ -40,20 +43,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         activity = this;
-        FCM_TOKEN = FirebaseInstanceId.getInstance().getToken();
         viewPager = findViewById(R.id.viewPager);
 
-        if (FCM_TOKEN == null) {
-            FCM_TOKEN = "";
-        }
-
-
-        String topicName = "OneFeed_" + APP_ID + "_" + Constant.ONE_FEED_VERSION;
-
-        FirebaseMessaging.getInstance().subscribeToTopic(topicName);
-
-        //System.out.println("FCM Token: " + FCM_TOKEN);
-
 
         // ====================
         // SDK WORK STARTS HERE
@@ -134,24 +125,70 @@ public void onError() {
          * below code is ***required*** for Initializing WittyFeed Android SDK API,
          */
         OneFeedMain.setHideBackButtonFromMainFeed(false);
-        OneFeedMain.getInstance().init(getBaseContext(), APP_ID, API_KEY, FCM_TOKEN);
 
-        /*
-         * Below code is ***required*** for consistent unsubscription and token update on sdk version change
-         */
-        if(!(OneFeedMain.getInstance().ofSharedPreference.getSDKVersion().equals(""))){
-            if(!OneFeedMain.getInstance().ofSharedPreference.getSDKVersion().equals(Constant.ONE_FEED_VERSION)){
-                OneFeedMain.getInstance().fcmTokenManager.updateTokenForVersionChange();
-                String oldTopic = "OneFeed_" + APP_ID + "_" + OneFeedMain.getInstance().ofSharedPreference.getSDKVersion();
-                FirebaseMessaging.getInstance().unsubscribeFromTopic(oldTopic);
+        if(Root.notificationProvider.equalsIgnoreCase("F")){
+            FCM_TOKEN = FirebaseInstanceId.getInstance().getToken();
+            if (FCM_TOKEN == null) {
+                FCM_TOKEN = "";
             }
+            Log.e("FCM Token:", FCM_TOKEN);
+
+            String topicName = "OneFeed_" + APP_ID + "_" + Constant.ONE_FEED_VERSION;
+            FirebaseMessaging.getInstance().subscribeToTopic(topicName);
+
+            OneFeedMain.getInstance().init(getBaseContext(), APP_ID, API_KEY, FCM_TOKEN);
+
+            /*
+             * Below code is ***required*** for consistent unsubscription and token update on sdk version change
+             */
+            if (!(OneFeedMain.getInstance().ofSharedPreference.getSDKVersion().equals(""))) {
+                if (!OneFeedMain.getInstance().ofSharedPreference.getSDKVersion().equals(Constant.ONE_FEED_VERSION)) {
+                    OneFeedMain.getInstance().fcmTokenManager.updateTokenForVersionChange();
+                    String oldTopic = "OneFeed_" + APP_ID + "_" + OneFeedMain.getInstance().ofSharedPreference.getSDKVersion();
+                    FirebaseMessaging.getInstance().unsubscribeFromTopic(oldTopic);
+                }
+            }
+            OneFeedMain.getInstance().ofSharedPreference.setSDKVersion(Constant.ONE_FEED_VERSION);
+        }else{
+
+            OneSignal.getTags(new OneSignal.GetTagsHandler() {
+                @Override
+                public void tagsAvailable(JSONObject tags) {
+                    if (tags != null) {
+                        try {
+                            String tag = tags.getString("onefeed");
+                            if (!tag.equalsIgnoreCase("app_id_" + Constant.ONE_FEED_VERSION)) {
+                                OneSignal.sendTag("onefeed", "app_id_" + Constant.ONE_FEED_VERSION);
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }else{
+                        OneSignal.sendTag("onefeed", "app_id_" + Constant.ONE_FEED_VERSION);
+                    }
+                }
+            });
+
+            OneSignal.idsAvailable(new OneSignal.IdsAvailableHandler() {
+                @Override
+                public void idsAvailable(String userId, String registrationId) {
+                    Log.e("debug", "User:" + userId);
+                    OneFeedMain.getInstance().init(getBaseContext(), APP_ID, API_KEY, userId);
+
+
+                    if (registrationId != null)
+                        Log.e("debug", "registrationId:" + registrationId);
+
+                }
+            });
         }
-        OneFeedMain.getInstance().ofSharedPreference.setSDKVersion(Constant.ONE_FEED_VERSION);
+
+
 
         /*
          * Set Intent of the Activity you want to open on Back press from Story opens from Notification
          */
-        OFNotificationManager.getInstance().setHomeScreenIntent(this, new Intent(this.getApplicationContext(),MainActivity.class));
+        OFNotificationManager.getInstance().setHomeScreenIntent(this, new Intent(this.getApplicationContext(), MainActivity.class));
 
 
         // ==================

app/src/main/java/com/wittyfeed/sdk/demo/NotificationExtenderExample.java

@@ -31,12 +31,6 @@ public NotificationCompat.Builder extend(NotificationCompat.Builder builder) {
         };
 
         OSNotificationDisplayedResult displayedResult = displayNotification(overrideSettings);
-        try {
-            Log.d("OneSignalExample", "Notification displayed with id: " +
-                    notification.payload.additionalData.getJSONObject("custom").getJSONObject("a").get("H"));
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
 
         // Return true to stop the notification from displaying
         return true;

app/src/main/java/com/wittyfeed/sdk/demo/Root.java

@@ -1,12 +1,15 @@
 package com.wittyfeed.sdk.demo;
 
 import android.app.Application;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.onesignal.OSNotification;
 import com.onesignal.OneSignal;
+import com.wittyfeed.sdk.onefeed.OFNotificationManager;
+
+import org.w3c.dom.Text;
 
-import org.json.JSONObject;
 
 /**
  * Created by Yogesh Soni.
@@ -16,43 +19,36 @@
  */
 public class Root extends Application {
 
+    public static final String notificationProvider = "E";
+
     @Override
     public void onCreate() {
         super.onCreate();
         // OneSignal Initialization
-        OneSignal.startInit(this)
-                .setNotificationReceivedHandler(new ExampleNotificationReceivedHandler())
-                .inFocusDisplaying(OneSignal.OSInFocusDisplayOption.Notification)
-                .unsubscribeWhenNotificationsAreDisabled(true)
-                .init();
+        if(notificationProvider.equalsIgnoreCase("E")) {
+            OneSignal.startInit(this)
+                    .setNotificationReceivedHandler(new ExampleNotificationReceivedHandler())
+                    .inFocusDisplaying(OneSignal.OSInFocusDisplayOption.Notification)
+                    .unsubscribeWhenNotificationsAreDisabled(true)
+                    .init();
+        }
     }
 
     private class ExampleNotificationReceivedHandler implements OneSignal.NotificationReceivedHandler {
         @Override
         public void notificationReceived(OSNotification notification) {
-            JSONObject data = notification.payload.additionalData;
             String notificationID = notification.payload.notificationID;
-            String title = notification.payload.title;
-            String body = notification.payload.body;
-            String smallIcon = notification.payload.smallIcon;
-            String largeIcon = notification.payload.largeIcon;
-            String bigPicture = notification.payload.bigPicture;
-            String smallIconAccentColor = notification.payload.smallIconAccentColor;
-            String sound = notification.payload.sound;
-            String ledColor = notification.payload.ledColor;
-            int lockScreenVisibility = notification.payload.lockScreenVisibility;
-            String groupKey = notification.payload.groupKey;
-            String groupMessage = notification.payload.groupMessage;
-            String fromProjectNumber = notification.payload.fromProjectNumber;
-            String rawPayload = notification.payload.rawPayload;
-
-            String customKey;
-            Log.i("OneSignalExample", "NotificationID received: " + notificationID);
 
-            if (data != null) {
-                customKey = data.optString("customkey", null);
-                if (customKey != null)
-                    Log.i("OneSignalExample", "customkey set with value: " + customKey);
+            Log.i("OneSignalExample", "NotificationID received: " + notificationID);
+            String agent = notification.payload.additionalData.optString("notiff_agent", null);
+
+            if(!TextUtils.isEmpty(agent) && agent.equalsIgnoreCase("wittyfeed_sdk")) {
+                OFNotificationManager
+                        .getInstance()
+                        .handleOneSignalNotification(Root.this, "",
+                                notification.payload.additionalData, R.mipmap.ic_launcher, "108");
+            }else {
+                // Handle by user
             }
         }
     }