data object added!

Author: iammannan

.idea/compiler.xml

@@ -26,5 +26,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    compile project(path: ':easynotify')
+    implementation project(path: ':easynotify')
 }

.idea/gradle.xml

@@ -18,8 +18,7 @@ public class MainActivity extends AppCompatActivity {
 
     EditText title,body,topic,sound,api_key,click_action;
     Button push;
-    public static final String API_KEY = "AAAAZcxfENs:APA91bFfapdE52NEvfpLVL7eAxuf7CxvoHtYP2_r4cBU79M6Ss_sNpZUx6W8Y2vNpUyi3HLux1TTOcCgKVkLIpmEWomavnaU7rmxfssCvbBcfB_cRAK6Tgdjoy2akEJ00DQwxQv6MDNe";
-
+    public static final String API_KEY = "AAAAd-IeGNU:APA91bF5KAFaNuehf-V6myfaH3OWOg7rLJb9wQdBkb9EGE3fuAvgvgkulhXWcXMg4E-drpB4xFTaofC8xrxI-pwmr913C2cvdo0UVn6XRyaFmUlTeSm0Mki2Mo82MiJcla4-DgigdvGD";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -38,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState) {
         push=findViewById(R.id.push);
 
         api_key.setText(API_KEY);
-        topic.setText("allDevices");
+        topic.setText("ALL");
 
         push.setOnClickListener(new View.OnClickListener() {
             @Override

.idea/misc.xml

@@ -7,8 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.android.tools.build:gradle:7.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

.idea/modules.xml

@@ -1,13 +1,12 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.iammannan'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

.idea/runConfigurations.xml

@@ -27,6 +27,7 @@ public class EasyNotify {
     private String nsound = "default";
     private String sendBy = TOPIC;
     private String API_KEY;
+    private JSONObject nDataObject;
 
     public static String TOPIC = "SEND_BY_TOPIC";
     public static String TOKEN = "SEND_BY_TOKEN";
@@ -63,6 +64,10 @@ public void setSendBy(String sendBy) {
         this.sendBy = sendBy;
     }
 
+    public void setnDataObject(JSONOject object) {
+        this.nDataObject = object;
+    }
+
     private void sendNotification() throws IOException, JSONException {
         OkHttpClient client = new OkHttpClient();
 
@@ -79,19 +84,24 @@ private void sendNotification() throws IOException, JSONException {
 
         dataObject.put("message","newMessage");
 
+        if(nDataObject==null){
+            nDataObject = dataObject;
+        }
+
+
         if(sendBy==TOPIC)
         {
             bodyObject
                     .put("to","/topics/"+ntopic)
                     .put("notification",notificationObject)
-                    .put("data",dataObject);
+                    .put("data",nDataObject);
         }
         if(sendBy==TOKEN)
         {
             bodyObject
                     .put("to",ntoken)
                     .put("notification",notificationObject)
-                    .put("data",dataObject);
+                    .put("data",nDataObject);
         }
 
         RequestBody body = RequestBody.create(mediaType, bodyObject.toString());