From f081899a952abd8887ad59a1282edc562f976869 Mon Sep 17 00:00:00 2001
From: Abdullah Radwan <abbodmar@gmail.com>
Date: Sat, 12 Oct 2019 10:11:52 +0200
Subject: [PATCH 1/2] Locale improved and Arabic support

---
 .../groupchannel/GroupChannelListAdapter.java |  2 +-
 .../GroupChannelListFragment.java             | 23 +++--
 .../groupchannel/GroupChatFragment.java       | 31 +++---
 .../groupchannel/MemberListActivity.java      |  2 +-
 .../sample/main/BaseApplication.java          |  2 +-
 .../sample/main/LoginActivity.java            |  4 +-
 .../sample/main/SettingsActivity.java         | 16 +--
 .../layout/activity_blocked_members_list.xml  |  4 +-
 .../layout/activity_create_group_channel.xml  |  4 +-
 .../res/layout/activity_invite_member.xml     |  2 +-
 .../app/src/main/res/layout/activity_main.xml |  4 +-
 .../main/res/layout/activity_member_info.xml  |  4 +-
 .../src/main/res/layout/activity_settings.xml | 20 ++--
 .../main/res/layout/fragment_group_chat.xml   |  6 +-
 .../res/layout/fragment_select_distinct.xml   |  2 +-
 .../res/layout/list_item_group_chat_admin.xml |  2 +-
 .../layout/list_item_group_chat_user_me.xml   |  2 +-
 .../list_item_group_chat_user_other.xml       |  2 +-
 .../src/main/res/layout/list_item_user.xml    |  2 +-
 .../app/src/main/res/menu/context_delete.xml  |  2 +-
 .../res/menu/menu_create_group_channel.xml    |  2 +-
 .../app/src/main/res/menu/menu_group_chat.xml |  4 +-
 .../app/src/main/res/menu/menu_main.xml       |  2 +-
 .../app/src/main/res/menu/nav_view.xml        |  4 +-
 .../app/src/main/res/values-ar/strings.xml    | 97 +++++++++++++++++++
 .../app/src/main/res/values/strings.xml       | 54 ++++++++++-
 26 files changed, 227 insertions(+), 72 deletions(-)
 create mode 100644 syncmanager/app/src/main/res/values-ar/strings.xml

diff --git a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChannelListAdapter.java b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChannelListAdapter.java
index 9022447d..22b4ac5b 100644
--- a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChannelListAdapter.java
+++ b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChannelListAdapter.java
@@ -280,7 +280,7 @@ void bind(final Context context, int position, final GroupChannel channel,
             // If someone in the channel is typing, display the typing indicator.
             if (channel.isTyping()) {
                 typingIndicatorContainer.setVisibility(View.VISIBLE);
-                lastMessageText.setText(("Someone is typing"));
+                lastMessageText.setText(R.string.typing_indicator);
             } else {
                 // Display typing indicator only when someone is typing
                 typingIndicatorContainer.setVisibility(View.GONE);
diff --git a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChannelListFragment.java b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChannelListFragment.java
index 2ff11879..c219abab 100644
--- a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChannelListFragment.java
+++ b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChannelListFragment.java
@@ -238,25 +238,27 @@ private void showChannelOptionsDialog(final GroupChannel channel) {
         final boolean pushCurrentlyEnabled = channel.isPushEnabled();
 
         options = pushCurrentlyEnabled
-                ? new String[]{"Leave channel", "Turn push notifications OFF"}
-                : new String[]{"Leave channel", "Turn push notifications ON"};
+                ? new String[]{getResources().getString(R.string.leave_channel),
+                getResources().getString(R.string.set_notification_off)}
+                : new String[]{getResources().getString(R.string.leave_channel),
+                getResources().getString(R.string.set_notification_on)};
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle("Channel options")
+        builder.setTitle(R.string.channel_options)
                 .setItems(options, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (which == 0) {
                             // Show a dialog to confirm that the user wants to leave the channel.
                             new AlertDialog.Builder(getActivity())
-                                    .setTitle("Leave channel " + channel.getName() + "?")
-                                    .setPositiveButton("Leave", new DialogInterface.OnClickListener() {
+                                    .setTitle(String.format(getResources().getString(R.string.leave_channel_question) + " ", channel.getName()))
+                                    .setPositiveButton(R.string.all_leave, new DialogInterface.OnClickListener() {
                                         @Override
                                         public void onClick(DialogInterface dialog, int which) {
                                             leaveChannel(channel);
                                         }
                                     })
-                                    .setNegativeButton("Cancel", null)
+                                    .setNegativeButton(R.string.cancel, null)
                                     .create().show();
                         } else if (which == 1) {
                             setChannelPushPreferences(channel, !pushCurrentlyEnabled);
@@ -278,14 +280,15 @@ private void setChannelPushPreferences(final GroupChannel channel, final boolean
             public void onResult(SendBirdException e) {
                 if (e != null) {
                     e.printStackTrace();
-                    Toast.makeText(getActivity(), "Error: " + e.getMessage(), Toast.LENGTH_SHORT)
+                    Toast.makeText(getActivity(), getResources().getString(R.string.error)+ " " +
+                            e.getMessage(), Toast.LENGTH_SHORT)
                             .show();
                     return;
                 }
 
-                String toast = on
-                        ? "Push notifications have been turned ON"
-                        : "Push notifications have been turned OFF";
+                int toast = on
+                        ? R.string.notification_on
+                        : R.string.notification_off;
 
                 Toast.makeText(getActivity(), toast, Toast.LENGTH_SHORT)
                         .show();
diff --git a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChatFragment.java b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChatFragment.java
index 2ee0234e..a4b12eb5 100644
--- a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChatFragment.java
+++ b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/GroupChatFragment.java
@@ -466,9 +466,10 @@ private void showMessageOptionsDialog(final BaseMessage message, final int posit
         String[] options;
 
         if (message.getMessageId() == 0) {
-            options = new String[] { "Delete message" };
+            options = new String[] { getResources().getString(R.string.delete_message) };
         } else {
-            options = new String[] { "Edit message", "Delete message" };
+            options = new String[] { getResources().getString(R.string.edit_message),
+                    getResources().getString(R.string.delete_message) };
         }
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@@ -558,7 +559,7 @@ public void run() {
                                     fetchInitialMessages();
                                 }
                             } else {
-                                Toast.makeText(getContext(), "Failed to get channel.", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(getContext(), R.string.get_channel_failed, Toast.LENGTH_SHORT).show();
                                 new Handler().postDelayed(new Runnable() {
                                     @Override
                                     public void run() {
@@ -663,7 +664,7 @@ public void onSent(UserMessage userMessage, SendBirdException e) {
                         }
                     }
                 })
-                .setNegativeButton(R.string.delete_message, new DialogInterface.OnClickListener() {
+                .setNegativeButton(R.string.delete, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (which == DialogInterface.BUTTON_NEGATIVE) {
@@ -690,11 +691,12 @@ private void displayTyping(List<Member> typingUsers) {
             String string;
 
             if (typingUsers.size() == 1) {
-                string = typingUsers.get(0).getNickname() + " is typing";
+                string = typingUsers.get(0).getNickname() + " " + getResources().getString(R.string.typing);
             } else if (typingUsers.size() == 2) {
-                string = typingUsers.get(0).getNickname() + " " + typingUsers.get(1).getNickname() + " is typing";
+                string = typingUsers.get(0).getNickname() + " " + typingUsers.get(1).getNickname() + " "
+                        + getResources().getString(R.string.typing);
             } else {
-                string = "Multiple users are typing";
+                string = getResources().getString(R.string.multiple_typing);
             }
             mCurrentEventText.setText(string);
         } else {
@@ -737,9 +739,9 @@ private void requestStoragePermissions() {
             // Provide an additional rationale to the user if the permission was not granted
             // and the user would benefit from additional context for the use of the permission.
             // For example if the user has previously denied the permission.
-            Snackbar.make(mRootLayout, "Storage access permissions are required to upload/download files.",
+            Snackbar.make(mRootLayout, R.string.storage_access,
                     Snackbar.LENGTH_LONG)
-                    .setAction("Okay", new View.OnClickListener() {
+                    .setAction(R.string.okay, new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
                             requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
@@ -778,7 +780,7 @@ private void showDownloadConfirmDialog(final FileMessage message) {
             requestStoragePermissions();
         } else {
             new AlertDialog.Builder(getActivity())
-                    .setMessage("Download file?")
+                    .setMessage(R.string.download_file)
                     .setPositiveButton(R.string.download, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
@@ -797,6 +799,7 @@ private void updateActionBarTitle() {
 
         if(mChannel != null) {
             title = TextUtils.getGroupChannelTitle(mChannel);
+            if(title.equals("No Members")) title = getResources().getString(R.string.no_members);
         }
 
         // Set action bar title to name of channel
@@ -827,7 +830,7 @@ public void onSent(UserMessage userMessage, SendBirdException e) {
                             Log.e(LOG_TAG, e.toString());
                             Toast.makeText(
                                     getActivity(),
-                                    "Send failed with error " + e.getCode() + ": " + e.getMessage(), Toast.LENGTH_SHORT)
+                                    getResources().getString(R.string.send_failed) + e.getCode() + ": " + e.getMessage(), Toast.LENGTH_SHORT)
                                     .show();
                         }
 
@@ -871,7 +874,7 @@ public void onSent(UserMessage userMessage, SendBirdException e) {
                 if (e != null) {
                     // Error!
                     Log.e(LOG_TAG, e.toString());
-                    Toast.makeText(getActivity(),"Send failed with error " + e.getCode() + ": " + e.getMessage(), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getActivity(),getResources().getString(R.string.send_failed) + e.getCode() + ": " + e.getMessage(), Toast.LENGTH_SHORT).show();
                     return;
                 }
             }
@@ -918,7 +921,7 @@ private void sendFileWithThumbnail(Uri uri) {
         Hashtable<String, Object> info = FileUtils.getFileInfo(getActivity(), uri);
 
         if (info == null) {
-            Toast.makeText(getActivity(), "Extracting file information failed.", Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(), R.string.extracting_info_failed, Toast.LENGTH_LONG).show();
             return;
         }
 
@@ -929,7 +932,7 @@ private void sendFileWithThumbnail(Uri uri) {
         final int size = (Integer) info.get("size");
 
         if (path.equals("")) {
-            Toast.makeText(getActivity(), "File must be located in local storage.", Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(), R.string.local_storage, Toast.LENGTH_LONG).show();
         } else {
             BaseChannel.SendFileMessageWithProgressHandler progressHandler = new BaseChannel.SendFileMessageWithProgressHandler() {
                 @Override
diff --git a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/MemberListActivity.java b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/MemberListActivity.java
index 57a5154c..6b4d76ec 100644
--- a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/MemberListActivity.java
+++ b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/groupchannel/MemberListActivity.java
@@ -48,7 +48,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         }
 
         if (mChannel == null) {
-            Toast.makeText(this, "Channel doesn't exists", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.channel_not_exists, Toast.LENGTH_SHORT).show();
             onBackPressed();
             finish();
         }
diff --git a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/BaseApplication.java b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/BaseApplication.java
index ee1e5216..2685dd6a 100644
--- a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/BaseApplication.java
+++ b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/BaseApplication.java
@@ -9,7 +9,7 @@
 
 public class BaseApplication extends Application {
 
-    private static final String APP_ID = "9DA1B1F4-0BE6-4DA8-82C5-2E81DAB56F23"; // US-1 Demo
+    private static final String APP_ID = "24CF77F2-1083-4A23-8FD1-4C63C108EE8E";
     public static final String VERSION = "3.0.40";
     private boolean mIsSyncManagerSetup = false;
 
diff --git a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/LoginActivity.java b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/LoginActivity.java
index d57da30a..71ef65bd 100644
--- a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/LoginActivity.java
+++ b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/LoginActivity.java
@@ -104,7 +104,7 @@ public void onConnected(User user, SendBirdException e) {
                             .show();
 
                     // Show login failure snackbar
-                    showSnackbar("Login to SendBird failed");
+                    showSnackbar(getResources().getString(R.string.login_failed));
                     mConnectButton.setEnabled(true);
                     PreferenceUtils.setConnected(false);
                     return;
@@ -147,7 +147,7 @@ public void onUpdated(SendBirdException e) {
                             .show();
 
                     // Show update failed snackbar
-                    showSnackbar("Update user nickname failed");
+                    showSnackbar(getResources().getString(R.string.update_nickname_failed));
 
                     return;
                 }
diff --git a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/SettingsActivity.java b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/SettingsActivity.java
index 7437246b..a74fd8a1 100644
--- a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/SettingsActivity.java
+++ b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/main/SettingsActivity.java
@@ -193,12 +193,12 @@ public void onClick(View v) {
                         updateCurrentUserInfo(mEditTextNickname.getText().toString());
                     }
 
-                    mButtonSaveNickName.setText("EDIT");
+                    mButtonSaveNickName.setText(R.string.edit);
                     mEditTextNickname.setEnabled(false);
                     mEditTextNickname.setFocusable(false);
                     mEditTextNickname.setFocusableInTouchMode(false);
                 } else {
-                    mButtonSaveNickName.setText("SAVE");
+                    mButtonSaveNickName.setText(R.string.save);
                     mEditTextNickname.setEnabled(true);
                     mEditTextNickname.setFocusable(true);
                     mEditTextNickname.setFocusableInTouchMode(true);
@@ -442,10 +442,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void showSetProfileOptionsDialog() {
-        String[] options = new String[] { "Upload a photo", "Take a photo" };
+        String[] options = new String[] { getResources().getString(R.string.upload_photo),
+                getResources().getString(R.string.take_photo) };
 
         AlertDialog.Builder builder = new AlertDialog.Builder(SettingsActivity.this);
-        builder.setTitle("Set profile image")
+        builder.setTitle(R.string.set_profile_image)
                 .setItems(options, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -561,7 +562,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     }
 
     private void permissionDenied() {
-        Snackbar.make(mSettingsLayout, "Permission denied.", Snackbar.LENGTH_LONG).show();
+        Snackbar.make(mSettingsLayout, R.string.permission_denied, Snackbar.LENGTH_LONG).show();
     }
 
     private void requestMedia() {
@@ -570,7 +571,8 @@ private void requestMedia() {
         intent.setType("image/*");
         intent.setAction(Intent.ACTION_PICK);
         // Always show the chooser (if there are multiple options available)
-        startActivityForResult(Intent.createChooser(intent, "Select Image"), INTENT_REQUEST_CHOOSE_MEDIA);
+        startActivityForResult(Intent.createChooser(intent, getResources().getString(R.string.select_image)),
+                INTENT_REQUEST_CHOOSE_MEDIA);
 
         // Set this as false to maintain connection
         // even when an external Activity is started.
@@ -647,7 +649,7 @@ public void onUpdated(SendBirdException e) {
                     Toast.makeText(SettingsActivity.this, "" + e.getCode() + ":" + e.getMessage(), Toast.LENGTH_SHORT).show();
 
                     // Show update failed snackbar
-                    showSnackbar("Update user info failed");
+                    showSnackbar(getResources().getString(R.string.update_info_failed));
                     return;
                 }
 
diff --git a/syncmanager/app/src/main/res/layout/activity_blocked_members_list.xml b/syncmanager/app/src/main/res/layout/activity_blocked_members_list.xml
index 99c2ab37..2fd2dd4a 100644
--- a/syncmanager/app/src/main/res/layout/activity_blocked_members_list.xml
+++ b/syncmanager/app/src/main/res/layout/activity_blocked_members_list.xml
@@ -22,7 +22,7 @@
 
                 <Button
                     android:id="@+id/button_edit"
-                    android:text="Edit"
+                    android:text="@string/edit"
                     android:textColor="@drawable/selector_btn_menu"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
 
                 <Button
                     android:id="@+id/button_unblock"
-                    android:text="Unblock"
+                    android:text="@string/unlock"
                     android:textColor="@drawable/selector_btn_menu"
                     android:visibility="gone"
                     android:layout_width="wrap_content"
diff --git a/syncmanager/app/src/main/res/layout/activity_create_group_channel.xml b/syncmanager/app/src/main/res/layout/activity_create_group_channel.xml
index b586b3fe..72e5b2bd 100644
--- a/syncmanager/app/src/main/res/layout/activity_create_group_channel.xml
+++ b/syncmanager/app/src/main/res/layout/activity_create_group_channel.xml
@@ -26,7 +26,7 @@
 
             <Button
                 android:id="@+id/button_create_group_channel_create"
-                android:text="Create"
+                android:text="@string/all_create"
                 android:textColor="@drawable/selector_btn_menu"
                 android:visibility="gone"
                 android:layout_width="wrap_content"
@@ -36,7 +36,7 @@
 
             <Button
                 android:id="@+id/button_create_group_channel_next"
-                android:text="Next"
+                android:text="@string/next"
                 android:textColor="@drawable/selector_btn_menu"
                 android:visibility="gone"
                 android:layout_width="wrap_content"
diff --git a/syncmanager/app/src/main/res/layout/activity_invite_member.xml b/syncmanager/app/src/main/res/layout/activity_invite_member.xml
index fa816b59..fe8c77be 100644
--- a/syncmanager/app/src/main/res/layout/activity_invite_member.xml
+++ b/syncmanager/app/src/main/res/layout/activity_invite_member.xml
@@ -18,7 +18,7 @@
 
             <Button
                 android:id="@+id/button_invite_member"
-                android:text="Invite"
+                android:text="@string/all_invite"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
diff --git a/syncmanager/app/src/main/res/layout/activity_main.xml b/syncmanager/app/src/main/res/layout/activity_main.xml
index 1bbe5111..718557b1 100644
--- a/syncmanager/app/src/main/res/layout/activity_main.xml
+++ b/syncmanager/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.sendbird.android.sample.com.sendbird.syncmanager.sample.main.MainActivity">
+    tools:context="com.sendbird.syncmanager.sample.main.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -52,7 +52,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="Group Channels"
+                    android:text="@string/all_group_channels"
                     android:layout_gravity="center_vertical"
                     android:textColor="#000000"
                     android:textSize="16sp"/>
diff --git a/syncmanager/app/src/main/res/layout/activity_member_info.xml b/syncmanager/app/src/main/res/layout/activity_member_info.xml
index 0cb45bfa..fdab28ec 100644
--- a/syncmanager/app/src/main/res/layout/activity_member_info.xml
+++ b/syncmanager/app/src/main/res/layout/activity_member_info.xml
@@ -86,7 +86,7 @@
                         android:layout_marginRight="15dp"
                         android:textSize="16.3sp"
                         android:textColor="#362d5d"
-                        android:text="Block this member"/>
+                        android:text="@string/block_member"/>
 
                     <android.support.v7.widget.SwitchCompat
                         android:id="@+id/switch_blocked_by_me"
@@ -102,7 +102,7 @@
                     android:layout_below="@id/linear_layout_switch"
                     android:textSize="12sp"
                     android:textColor="#8e8e8e"
-                    android:text="When Block this member is enabled, the member will be prohibited from chatting in all channels."/>
+                    android:text="@string/block_member_message"/>
 
             </RelativeLayout>
 
diff --git a/syncmanager/app/src/main/res/layout/activity_settings.xml b/syncmanager/app/src/main/res/layout/activity_settings.xml
index a6bb8f6b..9db59d81 100644
--- a/syncmanager/app/src/main/res/layout/activity_settings.xml
+++ b/syncmanager/app/src/main/res/layout/activity_settings.xml
@@ -86,7 +86,7 @@
                                 android:layout_height="wrap_content"
                                 android:focusable="false"
                                 android:focusableInTouchMode="false"
-                                android:hint="Nickname"
+                                android:hint="@string/login_user_nickname"
                                 android:imeOptions="actionDone"
                                 android:inputType="text"
                                 android:textSize="15sp"/>
@@ -95,7 +95,7 @@
 
                         <Button
                             android:id="@+id/button_save_nickname"
-                            android:text="EDIT"
+                            android:text="@string/edit"
                             android:textSize="13sp"
                             android:textColor="#774df2"
                             android:layout_width="wrap_content"
@@ -124,7 +124,7 @@
                         android:layout_gravity="center_vertical"
                         android:gravity="center_vertical"
                         android:layout_marginRight="16dp"
-                        android:text="Group channel notifications"
+                        android:text="@string/group_channel_notify"
                         android:textColor="#1b1d1d"
                         android:textSize="14sp"
                         android:textStyle="bold"/>
@@ -162,7 +162,7 @@
                             android:layout_marginRight="16dp"
                             android:layout_weight="1"
                             android:gravity="center_vertical"
-                            android:text="Show previews"
+                            android:text="@string/show_previews"
                             android:textColor="#1b1d1d"
                             android:textSize="15sp"/>
 
@@ -198,7 +198,7 @@
                             android:layout_marginRight="16dp"
                             android:layout_weight="1"
                             android:gravity="center_vertical"
-                            android:text="Do not disturb"
+                            android:text="@string/dont_disturb"
                             android:textColor="#1b1d1d"
                             android:textSize="15sp"/>
 
@@ -237,7 +237,7 @@
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
-                                android:text="From"
+                                android:text="@string/from"
                                 android:textColor="#1b1d1d"
                                 android:textSize="14sp" />
 
@@ -271,7 +271,7 @@
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
-                                android:text="To"
+                                android:text="@string/to"
                                 android:textColor="#1b1d1d"
                                 android:textSize="14sp" />
 
@@ -305,7 +305,7 @@
                         android:layout_height="24dp"
                         android:layout_gravity="center_vertical"
                         android:gravity="center_vertical"
-                        android:text="Group channel distinct"
+                        android:text="@string/group_channel_distinct"
                         android:textColor="#1b1d1d"
                         android:textSize="14sp"
                         android:textStyle="bold"/>
@@ -329,7 +329,7 @@
                         android:layout_marginRight="16dp"
                         android:layout_weight="1"
                         android:gravity="center_vertical"
-                        android:text="Make channel distinct"
+                        android:text="@string/make_channel_distinct"
                         android:textColor="#1b1d1d"
                         android:textSize="15sp"/>
 
@@ -365,7 +365,7 @@
                         android:layout_marginRight="16dp"
                         android:layout_weight="1"
                         android:gravity="center_vertical"
-                        android:text="Blocked members list"
+                        android:text="@string/blocked_members_list"
                         android:textColor="#1b1d1d"
                         android:textSize="14sp"
                         android:textStyle="bold"/>
diff --git a/syncmanager/app/src/main/res/layout/fragment_group_chat.xml b/syncmanager/app/src/main/res/layout/fragment_group_chat.xml
index 1d7750e4..a653d413 100644
--- a/syncmanager/app/src/main/res/layout/fragment_group_chat.xml
+++ b/syncmanager/app/src/main/res/layout/fragment_group_chat.xml
@@ -22,12 +22,12 @@
             android:background="?attr/selectableItemBackground"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:contentDescription="Upload file"
+            android:contentDescription="@string/upload"
             android:layout_gravity="bottom"/>
 
         <EditText
             android:id="@+id/edittext_group_chat_message"
-            android:hint="Enter message"
+            android:hint="@string/enter_message"
             android:background="@android:color/transparent"
             android:layout_gravity="center"
             android:layout_marginLeft="16dp"
@@ -39,7 +39,7 @@
 
         <Button
             android:id="@+id/button_group_chat_send"
-            android:text="SEND"
+            android:text="@string/send"
             android:textSize="14dp"
             android:textColor="@drawable/selector_btn_send"
             android:background="?attr/selectableItemBackground"
diff --git a/syncmanager/app/src/main/res/layout/fragment_select_distinct.xml b/syncmanager/app/src/main/res/layout/fragment_select_distinct.xml
index 130de86e..b9c749d8 100644
--- a/syncmanager/app/src/main/res/layout/fragment_select_distinct.xml
+++ b/syncmanager/app/src/main/res/layout/fragment_select_distinct.xml
@@ -11,7 +11,7 @@
         android:gravity="center_vertical">
 
         <TextView
-            android:text="Make channel distinct?"
+            android:text="@string/make_channel_distinct_question"
             android:textSize="16sp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/syncmanager/app/src/main/res/layout/list_item_group_chat_admin.xml b/syncmanager/app/src/main/res/layout/list_item_group_chat_admin.xml
index b9af538f..cd3e561e 100644
--- a/syncmanager/app/src/main/res/layout/list_item_group_chat_admin.xml
+++ b/syncmanager/app/src/main/res/layout/list_item_group_chat_admin.xml
@@ -17,7 +17,7 @@
         />
 
     <TextView
-        android:text="User has enterered the chat"
+        android:text="User has entered the chat"
         android:id="@+id/text_group_chat_message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/syncmanager/app/src/main/res/layout/list_item_group_chat_user_me.xml b/syncmanager/app/src/main/res/layout/list_item_group_chat_user_me.xml
index ac252b38..76c7b03a 100644
--- a/syncmanager/app/src/main/res/layout/list_item_group_chat_user_me.xml
+++ b/syncmanager/app/src/main/res/layout/list_item_group_chat_user_me.xml
@@ -57,7 +57,7 @@
 
                 <TextView
                     android:id="@+id/text_group_chat_edited"
-                    android:text="(edited)"
+                    android:text="@string/edited"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="14sp"
diff --git a/syncmanager/app/src/main/res/layout/list_item_group_chat_user_other.xml b/syncmanager/app/src/main/res/layout/list_item_group_chat_user_other.xml
index 10efb8e6..cdfea06f 100644
--- a/syncmanager/app/src/main/res/layout/list_item_group_chat_user_other.xml
+++ b/syncmanager/app/src/main/res/layout/list_item_group_chat_user_other.xml
@@ -74,7 +74,7 @@
 
                 <TextView
                     android:id="@+id/text_group_chat_edited"
-                    android:text="(edited)"
+                    android:text="@string/edited"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="14sp"
diff --git a/syncmanager/app/src/main/res/layout/list_item_user.xml b/syncmanager/app/src/main/res/layout/list_item_user.xml
index 42cc32c1..69c1b659 100644
--- a/syncmanager/app/src/main/res/layout/list_item_user.xml
+++ b/syncmanager/app/src/main/res/layout/list_item_user.xml
@@ -52,7 +52,7 @@
             android:layout_centerVertical="true"
             android:textSize="11.5sp"
             android:textColor="#bcbfc7"
-            android:text="Blocked"
+            android:text="@string/blocked"
             android:layout_marginLeft="10dp"/>
 
         <ImageView
diff --git a/syncmanager/app/src/main/res/menu/context_delete.xml b/syncmanager/app/src/main/res/menu/context_delete.xml
index 28b0b56d..ea956194 100644
--- a/syncmanager/app/src/main/res/menu/context_delete.xml
+++ b/syncmanager/app/src/main/res/menu/context_delete.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/action_delete_group_channel"
-        android:title="Delete"
+        android:title="@string/delete_message"
         android:orderInCategory="10"
         app:showAsAction="always" />
 
diff --git a/syncmanager/app/src/main/res/menu/menu_create_group_channel.xml b/syncmanager/app/src/main/res/menu/menu_create_group_channel.xml
index 7d11b40c..f8e48e52 100644
--- a/syncmanager/app/src/main/res/menu/menu_create_group_channel.xml
+++ b/syncmanager/app/src/main/res/menu/menu_create_group_channel.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/action_create_group_channel"
-        android:title="CREATE"
+        android:title="@string/all_create"
         android:orderInCategory="10"
         app:showAsAction="always"/>
 
diff --git a/syncmanager/app/src/main/res/menu/menu_group_chat.xml b/syncmanager/app/src/main/res/menu/menu_group_chat.xml
index f2c68cd5..0fe74196 100644
--- a/syncmanager/app/src/main/res/menu/menu_group_chat.xml
+++ b/syncmanager/app/src/main/res/menu/menu_group_chat.xml
@@ -3,12 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/action_group_channel_view_members"
-        android:title="View members"
+        android:title="@string/view_member"
         android:orderInCategory="10"
         app:showAsAction="never" />
 
     <item android:id="@+id/action_group_channel_invite"
-        android:title="Invite members"
+        android:title="@string/invite_member"
         android:orderInCategory="20"
         app:showAsAction="never"/>
 
diff --git a/syncmanager/app/src/main/res/menu/menu_main.xml b/syncmanager/app/src/main/res/menu/menu_main.xml
index 1e27696d..43dd4d0c 100644
--- a/syncmanager/app/src/main/res/menu/menu_main.xml
+++ b/syncmanager/app/src/main/res/menu/menu_main.xml
@@ -5,7 +5,7 @@
         android:id="@+id/menu_main"
         android:icon="@drawable/ic_settings_white_24_dp"
         android:orderInCategory="0"
-        android:title="Settings"
+        android:title="@string/settings"
         app:showAsAction="always">
     </item>
 </menu>
diff --git a/syncmanager/app/src/main/res/menu/nav_view.xml b/syncmanager/app/src/main/res/menu/nav_view.xml
index b5d82604..c479de18 100644
--- a/syncmanager/app/src/main/res/menu/nav_view.xml
+++ b/syncmanager/app/src/main/res/menu/nav_view.xml
@@ -5,7 +5,7 @@
         <item
             android:id="@+id/nav_item_group_channels"
             android:icon="@drawable/ic_group_channels"
-            android:title="Group Channels" />
+            android:title="@string/all_group_channels" />
     </group>
 
     <group android:id="@+id/nav_group_actions"
@@ -13,6 +13,6 @@
         <item
             android:id="@+id/nav_item_disconnect"
             android:icon="@drawable/ic_disconnect"
-            android:title="Disconnect" />
+            android:title="@string/login_disconnect" />
     </group>
 </menu>
\ No newline at end of file
diff --git a/syncmanager/app/src/main/res/values-ar/strings.xml b/syncmanager/app/src/main/res/values-ar/strings.xml
new file mode 100644
index 00000000..44fcbc77
--- /dev/null
+++ b/syncmanager/app/src/main/res/values-ar/strings.xml
@@ -0,0 +1,97 @@
+<resources>
+    <string name="app_name">SyncManager Sample</string>
+
+    <!-- all -->
+    <string name="all_app_version">UI v%1$s / SDK v%2$s / SyncManager v%3$s</string>
+
+    <string name="all_create">أنشئ</string>
+    <string name="all_invite">ادع</string>
+
+    <string name="all_group_channels">قنوات المجموعة</string>
+    <string name="login_failed">فشل تسجيل الدخول</string>
+    <string name="update_info_failed">فشل تحديث بيانات المستخدم</string>
+    <string name="update_nickname_failed">فشل تحديث اسم المستخدم</string>
+    <string name="upload_photo">ارفع صورة</string>
+    <string name="take_photo">التقط صورة</string>
+    <string name="set_profile_image">اضبط صورة الملف الشخصي</string>
+    <string name="permission_denied">رفضت الصلاحية.</string>
+    <string name="select_image">حدد صورة</string>
+    <string name="typing_indicator">شخص ما يكتب</string>
+    <string name="leave_channel">غادر القناة</string>
+    <string name="leave_channel_question">أتريد مغادرة القناة %s؟</string>
+    <string name="set_notification_on">شغّل الإشعارات</string>
+    <string name="set_notification_off">أطفئ الإشعارات</string>
+    <string name="channel_options">خيارات القناة</string>
+    <string name="all_leave">غادر</string>
+    <string name="notification_on">فُعلت الإشعارات</string>
+    <string name="notification_off">أُطفئت الإشعارات</string>
+    <string name="delete_message">احذف الرسالة</string>
+    <string name="edit_message">عدّل الرسالة</string>
+    <string name="get_channel_failed">فشل الحصول على القناة.</string>
+    <string name="typing">يكتب</string>
+    <string name="multiple_typing">عدة مستخدمين يكتبون</string>
+    <string name="storage_access">صلاحية الوصول إلى التخزين مطلوبة لتنزيل أو رفع الملفات.</string>
+    <string name="okay">حسناً</string>
+    <string name="download_file">أتريد تنزيل الملف؟</string>
+    <string name="send_failed">فشل الإرسال بالخطأ </string>
+    <string name="extracting_info_failed">فشل استخراج معلومات الملف.</string>
+    <string name="local_storage">يجب أن يكون الملف في التخزين المحلي.</string>
+    <string name="channel_not_exists">القناة غير موجودة</string>
+    <string name="no_members">لا أعضاء</string>
+    <string name="blocked">محجوب</string>
+
+    <!-- main -->
+    <string name="main_drawer_open">افتح القائمة الجانبية</string>
+    <string name="main_drawer_close">أغلق القائمة الجانبية</string>
+    <string name="select_channel_type">حدّد نوع القناة</string>
+    <string name="settings">الإعدادات</string>
+    <string name="blocked_members_list">الأعضاء المحظورين</string>
+
+    <!-- login -->
+    <string name="login_user_id">رقم تعريف المستخدم</string>
+    <string name="login_user_nickname">اسم المستخدم</string>
+    <string name="login_connect">اتصل</string>
+    <string name="login_disconnect">اقطع الاتصال</string>
+
+    <!-- Group Channel List -->
+    <string name="group_channel_list_file_message_text">%1$s رفع ملفاً.</string>
+    <string name="group_channel_notify">إشعارات قناة المجموعة</string>
+    <string name="show_previews">اعرض المعاينات</string>
+    <string name="dont_disturb">وضع عدم الإزعاج</string>
+    <string name="from">من</string>
+    <string name="to">إلى</string>
+    <string name="group_channel_distinct">فصل قناة المجموعة</string>
+    <string name="make_channel_distinct">اجعل القناة مفصولة</string>
+    <string name="make_channel_distinct_question">أتريد جعل القناة مفصولة؟</string>
+    <string name="enter_message">أدخل رسالة</string>
+    <string name="send">أرسل</string>
+    <string name="edited">(معدّلة)</string>
+
+    <string name="create_group_channel">أنشئ قناة مجموعة</string>
+    <string name="member_list">الأعضاء</string>
+    <string name="invite_member">ادع أعضاء</string>
+    <string name="view_member">اعرض الأعضاء</string>
+
+    <string name="member_info">معلومات الأعضاء</string>
+    <string name="block_member">احظر هذا العضو</string>
+    <string name="block_member_message">عند تفعيل "احظر هذا العضو"، سيمنع هذا العضو من الكتابة في جميع القنوات.</string>
+
+    <!-- Menu actions -->
+    <string name="action_create_channel">أنشئ قناة</string>
+
+    <string name="download">نزّل</string>
+    <string name="cancel">ألغ</string>
+    <string name="upload">ارفع</string>
+    <string name="resend_message">أعد الإرسال</string>
+    <string name="delete">احذف</string>
+    <string name="edit">عدّل</string>
+    <string name="unlock">فك القفل</string>
+    <string name="next">التالي</string>
+    <string name="save">احفظ</string>
+    <string name="error">خطأ</string>
+
+    <!-- Message Status -->
+    <string name="message_sending">جارٍ الإرسال</string>
+    <string name="message_failed">فشل</string>
+
+</resources>
diff --git a/syncmanager/app/src/main/res/values/strings.xml b/syncmanager/app/src/main/res/values/strings.xml
index 548e12c6..2078de82 100644
--- a/syncmanager/app/src/main/res/values/strings.xml
+++ b/syncmanager/app/src/main/res/values/strings.xml
@@ -8,6 +8,37 @@
     <string name="all_invite">Invite</string>
 
     <string name="all_group_channels">Group Channels</string>
+    <string name="login_failed">Login failed</string>
+    <string name="update_nickname_failed">Update user nickname failed</string>
+    <string name="upload_photo">Upload a photo</string>
+    <string name="take_photo">Take a photo</string>
+    <string name="set_profile_image">Set profile image</string>
+    <string name="permission_denied">Permission denied.</string>
+    <string name="select_image">Select image</string>
+    <string name="update_info_failed">Update user info failed</string>
+    <string name="typing_indicator">Someone is typing</string>
+    <string name="leave_channel">Leave channel</string>
+    <string name="leave_channel_question">Leave channel %s?</string>
+    <string name="set_notification_on">Turn push notifications ON</string>
+    <string name="notification_on">Push notifications have been turned ON</string>
+    <string name="notification_off">Push notifications have been turned OFF</string>
+    <string name="set_notification_off">Turn push notifications OFF</string>
+    <string name="channel_options">Channel options</string>
+    <string name="all_leave">Leave</string>
+    <string name="delete_message">Delete message</string>
+    <string name="edit_message">Edit message</string>
+    <string name="get_channel_failed">Failed to get channel.</string>
+    <string name="typing">is typing</string>
+    <string name="multiple_typing">Multiple users are typing</string>
+    <string name="storage_access">Storage access permissions are required to upload/download files.</string>
+    <string name="okay">Okay</string>
+    <string name="download_file">Download file?</string>
+    <string name="send_failed">Send failed with error </string>
+    <string name="extracting_info_failed">Extracting file information failed.</string>
+    <string name="local_storage">File must be located in local storage.</string>
+    <string name="channel_not_exists">Channel doesn\'t exists</string>
+    <string name="no_members">No Members</string>
+    <string name="blocked">Blocked</string>
 
     <!-- main -->
     <string name="main_drawer_open">Open navigation drawer</string>
@@ -24,12 +55,26 @@
 
     <!-- Group Channel List -->
     <string name="group_channel_list_file_message_text">%1$s has uploaded a file.</string>
+    <string name="group_channel_notify">Group channel notifications</string>
+    <string name="show_previews">Show previews</string>
+    <string name="dont_disturb">Do not disturb</string>
+    <string name="from">From</string>
+    <string name="to">To</string>
+    <string name="group_channel_distinct">Group channel distinct</string>
+    <string name="make_channel_distinct">Make channel distinct</string>
+    <string name="make_channel_distinct_question">Make channel distinct?</string>
+    <string name="enter_message">Enter message</string>
+    <string name="send">SEND</string>
+    <string name="edited">(edited)</string>
 
     <string name="create_group_channel">Create Group Channel</string>
     <string name="member_list">Members</string>
     <string name="invite_member">Invite members</string>
+    <string name="view_member">View members</string>
 
-    <string name="member_info"></string>
+    <string name="member_info">Members Information</string>
+    <string name="block_member">Block this member</string>
+    <string name="block_member_message">When Block this member is enabled, the member will be prohibited from chatting in all channels.</string>
 
     <!-- Menu actions -->
     <string name="action_create_channel">Create channel</string>
@@ -38,7 +83,12 @@
     <string name="cancel">Cancel</string>
     <string name="upload">Upload</string>
     <string name="resend_message">Resend</string>
-    <string name="delete_message">Delete</string>
+    <string name="delete">Delete</string>
+    <string name="edit">Edit</string>
+    <string name="unlock">Unlock</string>
+    <string name="next">Next</string>
+    <string name="save">SAVE</string>
+    <string name="error">Error</string>
 
     <!-- Message Status -->
     <string name="message_sending">Sending</string>

From 3ffb102be1a658844ea102056dcefb46b4179e67 Mon Sep 17 00:00:00 2001
From: Abdullah Radwan <abbodmar@gmail.com>
Date: Sat, 12 Oct 2019 18:17:27 +0200
Subject: [PATCH 2/2] Updated Firebase support

---
 syncmanager/app/src/main/AndroidManifest.xml  | 10 +--
 .../fcm/MyFirebaseInstanceIDService.java      | 75 ------------------
 .../fcm/MyFirebaseMessagingService.java       | 79 ++++++++++---------
 .../app/src/main/res/values-ar/strings.xml    |  4 +-
 .../app/src/main/res/values/strings.xml       |  2 +
 5 files changed, 49 insertions(+), 121 deletions(-)
 delete mode 100644 syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/fcm/MyFirebaseInstanceIDService.java

diff --git a/syncmanager/app/src/main/AndroidManifest.xml b/syncmanager/app/src/main/AndroidManifest.xml
index c7e71385..337048c1 100644
--- a/syncmanager/app/src/main/AndroidManifest.xml
+++ b/syncmanager/app/src/main/AndroidManifest.xml
@@ -53,16 +53,14 @@
         <activity android:name="com.sendbird.syncmanager.sample.groupchannel.GroupChannelActivity"
             android:windowSoftInputMode="stateHidden" />
 
-        <service android:name="com.sendbird.syncmanager.sample.fcm.MyFirebaseMessagingService">
+		<service
+            android:name="com.sendbird.syncmanager.sample.fcm.MyFirebaseMessagingService"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-        <service android:name="com.sendbird.syncmanager.sample.fcm.MyFirebaseInstanceIDService">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
-            </intent-filter>
-        </service>
+		
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.sendbird.syncmanager.sample.fileprovider"
diff --git a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/fcm/MyFirebaseInstanceIDService.java b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/fcm/MyFirebaseInstanceIDService.java
deleted file mode 100644
index faa7aaa9..00000000
--- a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/fcm/MyFirebaseInstanceIDService.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.sendbird.syncmanager.sample.fcm;
-
-import android.util.Log;
-import android.widget.Toast;
-
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.FirebaseInstanceIdService;
-import com.sendbird.android.SendBird;
-import com.sendbird.android.SendBirdException;
-
-
-public class MyFirebaseInstanceIDService extends FirebaseInstanceIdService {
-
-    private static final String TAG = "MyFirebaseIIDService";
-
-    /**
-     * Called if InstanceID token is updated. This may occur if the security of
-     * the previous token had been compromised. Note that this is called when the InstanceID token
-     * is initially generated so this is where you would retrieve the token.
-     */
-    // [START refresh_token]
-    @Override
-    public void onTokenRefresh() {
-        // Get updated InstanceID token.
-        String refreshedToken = FirebaseInstanceId.getInstance().getToken();
-        Log.d(TAG, "Refreshed token: " + refreshedToken);
-
-        // If you want to send messages to this application instance or
-        // manage this apps subscriptions on the server side, send the
-        // Instance ID token to your app server.
-        sendRegistrationToServer(refreshedToken);
-    }
-    // [END refresh_token]
-
-    /**
-     * Persist token to third-party servers.
-     *
-     * Modify this method to associate the user's FCM InstanceID token with any server-side account
-     * maintained by your application.
-     *
-     * @param token The new token.
-     */
-    private void sendRegistrationToServer(String token) {
-        // TODO: Implement this method to send token to your app server.
-        SendBird.registerPushTokenForCurrentUser(token, new SendBird.RegisterPushTokenWithStatusHandler() {
-            @Override
-            public void onRegistered(SendBird.PushTokenRegistrationStatus pushTokenRegistrationStatus, SendBirdException e) {
-                if (e != null) {
-                    Toast.makeText(MyFirebaseInstanceIDService.this, "" + e.getCode() + ":" + e.getMessage(), Toast.LENGTH_SHORT).show();
-                    return;
-                }
-
-                if (pushTokenRegistrationStatus == SendBird.PushTokenRegistrationStatus.PENDING) {
-                    Toast.makeText(MyFirebaseInstanceIDService.this, "Connection required to register push token.", Toast.LENGTH_SHORT).show();
-                }
-            }
-        });
-    }
-}
\ No newline at end of file
diff --git a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/fcm/MyFirebaseMessagingService.java b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/fcm/MyFirebaseMessagingService.java
index 5e3080cf..ff5d3160 100644
--- a/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/fcm/MyFirebaseMessagingService.java
+++ b/syncmanager/app/src/main/java/com/sendbird/syncmanager/sample/fcm/MyFirebaseMessagingService.java
@@ -29,50 +29,34 @@
 import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
+import android.widget.Toast;
 
-import com.google.firebase.messaging.FirebaseMessagingService;
-import com.google.firebase.messaging.RemoteMessage;
 import com.sendbird.syncmanager.sample.R;
 import com.sendbird.syncmanager.sample.groupchannel.GroupChannelActivity;
 import com.sendbird.syncmanager.sample.utils.PreferenceUtils;
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+import com.sendbird.android.SendBird;
+import com.sendbird.android.SendBirdException;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 public class MyFirebaseMessagingService extends FirebaseMessagingService {
 
-    private static final String TAG = "MyFirebaseMsgService";
-
-    /**
-     * Called when message is received.
-     *
-     * @param remoteMessage Object representing the message received from Firebase Cloud Messaging.
-     */
-    // [START receive_message]
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
-        // [START_EXCLUDE]
-        // There are two types of messages data messages and notification messages. Data messages are handled
-        // here in onMessageReceived whether the app is in the foreground or background. Data messages are the type
-        // traditionally used with GCM. Notification messages are only received here in onMessageReceived when the app
-        // is in the foreground. When the app is in the background an automatically generated notification is displayed.
-        // When the user taps on the notification they are returned to the app. Messages containing both notification
-        // and data payloads are treated as notification messages. The Firebase console always sends notification
-        // messages. For more see: https://firebase.google.com/docs/cloud-messaging/concept-options
-        // [END_EXCLUDE]
-
-        // TODO(developer): Handle FCM messages here.
-        // Not getting messages here? See why this may be: https://goo.gl/39bRNJ
-        Log.d(TAG, "From: " + remoteMessage.getFrom());
+
+        Log.d("FirebaseMsgService", "From: " + remoteMessage.getFrom());
 
         // Check if message contains a data payload.
         if (remoteMessage.getData().size() > 0) {
-            Log.d(TAG, "Message data payload: " + remoteMessage.getData());
+            Log.d("FirebaseMsgService", "Message data payload: " + remoteMessage.getData());
         }
 
         // Check if message contains a notification payload.
         if (remoteMessage.getNotification() != null) {
-            Log.d(TAG, "Message Notification Body: " + remoteMessage.getNotification().getBody());
+            Log.d("FirebaseMsgService", "Message Notification Body: " + remoteMessage.getNotification().getBody());
         }
 
         String channelUrl = null;
@@ -87,18 +71,35 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
         // message, here is where that should be initiated. See sendNotification method below.
         sendNotification(this, remoteMessage.getData().get("message"), channelUrl);
     }
-    // [END receive_message]
-
-    /**
-     * Create and show a simple notification containing the received FCM message.
-     *
-     * @param messageBody FCM message body received.
-     */
-    public static void sendNotification(Context context, String messageBody, String channelUrl) {
+
+    @Override
+    public void onNewToken(String token) {
+        Log.d("FirebaseMsgService", "Refreshed token: " + token);
+
+        sendRegistrationToServer(token);
+    }
+
+    private void sendRegistrationToServer(String token) {
+        SendBird.registerPushTokenForCurrentUser(token, new SendBird.RegisterPushTokenWithStatusHandler() {
+            @Override
+            public void onRegistered(SendBird.PushTokenRegistrationStatus pushTokenRegistrationStatus, SendBirdException e) {
+                if (e != null) {
+                    Toast.makeText(MyFirebaseMessagingService.this, "" + e.getCode() + ":" + e.getMessage(), Toast.LENGTH_SHORT).show();
+                    return;
+                }
+
+                if (pushTokenRegistrationStatus == SendBird.PushTokenRegistrationStatus.PENDING) {
+                    Toast.makeText(MyFirebaseMessagingService.this, R.string.register_push_token, Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+    }
+
+    private void sendNotification(Context context, String messageBody, String channelUrl) {
         NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
         final String CHANNEL_ID = "CHANNEL_ID";
-        if (Build.VERSION.SDK_INT >= 26) {  // Build.VERSION_CODES.O
+        if (Build.VERSION.SDK_INT >= 26) {
             NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID, "CHANNEL_NAME", NotificationManager.IMPORTANCE_HIGH);
             notificationManager.createNotificationChannel(mChannel);
         }
@@ -106,13 +107,13 @@ public static void sendNotification(Context context, String messageBody, String
         Intent intent = new Intent(context, GroupChannelActivity.class);
         intent.putExtra("groupChannelUrl", channelUrl);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0 /* Request code */, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         Uri defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context, CHANNEL_ID)
                 .setSmallIcon(R.drawable.img_notification)
-                .setColor(Color.parseColor("#7469C4"))  // small icon background color
-                .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.img_notification_large))
+                .setColor(Color.parseColor("#4c679c"))
+                .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.mipmap.ic_launcher_round))
                 .setContentTitle(context.getResources().getString(R.string.app_name))
                 .setAutoCancel(true)
                 .setSound(defaultSoundUri)
@@ -123,9 +124,9 @@ public static void sendNotification(Context context, String messageBody, String
         if (PreferenceUtils.getNotificationsShowPreviews()) {
             notificationBuilder.setContentText(messageBody);
         } else {
-            notificationBuilder.setContentText("Somebody sent you a message.");
+            notificationBuilder.setContentText(getResources().getString(R.string.message_received));
         }
 
-        notificationManager.notify(0 /* ID of notification */, notificationBuilder.build());
+        notificationManager.notify(0, notificationBuilder.build());
     }
 }
\ No newline at end of file
diff --git a/syncmanager/app/src/main/res/values-ar/strings.xml b/syncmanager/app/src/main/res/values-ar/strings.xml
index 44fcbc77..472cbf91 100644
--- a/syncmanager/app/src/main/res/values-ar/strings.xml
+++ b/syncmanager/app/src/main/res/values-ar/strings.xml
@@ -39,7 +39,9 @@
     <string name="channel_not_exists">القناة غير موجودة</string>
     <string name="no_members">لا أعضاء</string>
     <string name="blocked">محجوب</string>
-
+    <string name="message_received">أرسل شخص ما إليك رسالة.</string>
+    <string name="register_push_token">الاتصال مطلوب لتسجيل رمز الإشعارات.</string>
+	
     <!-- main -->
     <string name="main_drawer_open">افتح القائمة الجانبية</string>
     <string name="main_drawer_close">أغلق القائمة الجانبية</string>
diff --git a/syncmanager/app/src/main/res/values/strings.xml b/syncmanager/app/src/main/res/values/strings.xml
index 2078de82..abadfe49 100644
--- a/syncmanager/app/src/main/res/values/strings.xml
+++ b/syncmanager/app/src/main/res/values/strings.xml
@@ -39,6 +39,8 @@
     <string name="channel_not_exists">Channel doesn\'t exists</string>
     <string name="no_members">No Members</string>
     <string name="blocked">Blocked</string>
+	<string name="message_received">Somebody sent you a message.</string>
+    <string name="register_push_token">Connection required to register push token.</string>
 
     <!-- main -->
     <string name="main_drawer_open">Open navigation drawer</string>