diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
old mode 100644
new mode 100755
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
index 50f9204c..c8613388 100755
--- a/README.md
+++ b/README.md
@@ -76,9 +76,6 @@ To run our open source app with CometChat Pro v1, follow these steps:
       
   - To send location message Add your google API Key in `google_maps_api.xml`     
 
-
-
-
 ## Run the Sample App
 
 
diff --git a/ScreenShots/gif_1.gif b/ScreenShots/gif_1.gif
old mode 100644
new mode 100755
diff --git a/ScreenShots/gif_2.gif b/ScreenShots/gif_2.gif
old mode 100644
new mode 100755
diff --git a/ScreenShots/gif_3.gif b/ScreenShots/gif_3.gif
old mode 100644
new mode 100755
diff --git a/ScreenShots/gif_4.gif b/ScreenShots/gif_4.gif
old mode 100644
new mode 100755
diff --git a/ScreenShots/guide.png b/ScreenShots/guide.png
old mode 100644
new mode 100755
diff --git a/ScreenShots/help.png b/ScreenShots/help.png
old mode 100644
new mode 100755
diff --git a/app/build.gradle b/app/build.gradle
index 935d11e9..924af42c 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 
-
+apply plugin: 'com.google.gms.google-services'
 android {
     compileSdkVersion 28
     defaultConfig {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a5314716..07de43bb 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,11 +18,7 @@
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:allowBackup,android:appComponentFactory">
         <activity android:name=".Activity.MessageInfoActivity"></activity>
-        <!-- <provider -->
-        <!-- android:name="com.google.firebase.provider.FirebaseInitProvider" -->
-        <!-- android:authorities="${applicationId}.firebaseinitprovider" -->
-        <!-- tools:node="remove" -->
-        <!-- /> -->
+
         <activity android:name=".Activity.BlockedUserListActivity" />
         <activity
             android:name=".Activity.CometChatActivity"
@@ -67,6 +63,15 @@
         <activity android:name=".Activity.CallActivity" />
         <activity android:name=".Activity.SelectUserActivity"
             android:parentActivityName=".Activity.GroupDetailActivity"/>
+
+        <service
+            android:name=".Helper.MyFirebaseMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
     </application>
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-feature
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Activity/BlockedUserListActivity.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Activity/BlockedUserListActivity.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Activity/MessageInfoActivity.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Activity/MessageInfoActivity.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Activity/SelectUserActivity.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Activity/SelectUserActivity.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Adapter/MessageReceiptsAdapter.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Adapter/MessageReceiptsAdapter.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/CometApplication.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/CometApplication.java
index befc822a..b8144890 100755
--- a/app/src/main/java/com/inscripts/cometchatpulse/demo/CometApplication.java
+++ b/app/src/main/java/com/inscripts/cometchatpulse/demo/CometApplication.java
@@ -47,8 +47,6 @@ public void onError(CometChatException e) {
 
         });
 
-
-
         createNotificationChannel();
     }
     private void createNotificationChannel() {
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Contracts/BlockedUserListActivityContract.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Contracts/BlockedUserListActivityContract.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Contracts/MessageInfoActivityContract.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Contracts/MessageInfoActivityContract.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Contracts/SelectUserActivityContract.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Contracts/SelectUserActivityContract.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Helper/CallNotificationAction.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Helper/CallNotificationAction.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Helper/MyFirebaseMessagingService.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Helper/MyFirebaseMessagingService.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Helper/PreferenceHelper.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Helper/PreferenceHelper.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Presenters/BlockedUserListActivityPresenter.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Presenters/BlockedUserListActivityPresenter.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Presenters/MessageInfoActivityPresenter.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Presenters/MessageInfoActivityPresenter.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/inscripts/cometchatpulse/demo/Presenters/SelectUserActivityPresenter.java b/app/src/main/java/com/inscripts/cometchatpulse/demo/Presenters/SelectUserActivityPresenter.java
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_edit_black_24dp.xml b/app/src/main/res/drawable/ic_edit_black_24dp.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_info_outline.xml b/app/src/main/res/drawable/ic_info_outline.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_person_add_black_24dp.xml b/app/src/main/res/drawable/ic_person_add_black_24dp.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_search_black_24dp.xml b/app/src/main/res/drawable/ic_search_black_24dp.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/acitivity_messageinfo.xml b/app/src/main/res/layout/acitivity_messageinfo.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/activity_blockeduser_list.xml b/app/src/main/res/layout/activity_blockeduser_list.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/activity_select_user.xml b/app/src/main/res/layout/activity_select_user.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/custom_notification.xml b/app/src/main/res/layout/custom_notification.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/receipts_view.xml b/app/src/main/res/layout/receipts_view.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/menu/add_member.xml b/app/src/main/res/menu/add_member.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/menu/blockedlist_menu.xml b/app/src/main/res/menu/blockedlist_menu.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/menu/menu_group_list.xml b/app/src/main/res/menu/menu_group_list.xml
old mode 100644
new mode 100755