Android UI Kit v2.3.1-1

Author: darshanbhanushali

README.md

@@ -13,7 +13,7 @@
 ![GitHub repo size](https://img.shields.io/github/repo-size/cometchat-pro/android-java-chat-app)
 ![GitHub contributors](https://img.shields.io/github/contributors/cometchat-pro/android-java-chat-app)
 ![GitHub stars](https://img.shields.io/github/stars/cometchat-pro/android-java-chat-app?style=social)
-![Version](https://shields.io/badge/version-v2.1.1--1-orange)
+![Version](https://shields.io/badge/version-v2.3.1--1-orange)
 ![Twitter Follow](https://img.shields.io/twitter/follow/cometchat?style=social)
 
 <img src="https://files.readme.io/952af91-UI_Kit__1.png"/>

app/build.gradle

@@ -76,5 +76,5 @@ dependencies {
     implementation 'com.facebook.shimmer:shimmer:0.4.0'
 
 //
-    implementation 'com.cometchat:pro-android-chat-sdk:2.3.0'
+    implementation 'com.cometchat:pro-android-chat-sdk:2.3.1'
 }

app/release/output.json

@@ -20,7 +20,7 @@ allprojects {
         jcenter()
 
         maven {
-            url "https://dl.bintray.com/cometchat/pro"
+            url "https://dl.cloudsmith.io/public/cometchat/cometchat-pro-android/maven/"
         }
 
     }

build.gradle

@@ -90,7 +90,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:17.0.0'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
     //cometchat
-    compileOnly 'com.cometchat:pro-android-chat-sdk:2.3.0'
+    compileOnly 'com.cometchat:pro-android-chat-sdk:2.3.1'
 
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0'
 }

uikit/build.gradle

@@ -26,6 +26,7 @@
 import com.cometchat.pro.core.CometChat;
 import com.cometchat.pro.exceptions.CometChatException;
 import com.cometchat.pro.models.User;
+import com.cometchat.pro.rtc.model.AudioMode;
 import com.cometchat.pro.uikit.R;
 import com.cometchat.pro.uikit.ui_components.calls.call_manager.ongoing_call.OngoingCallService;
 import com.cometchat.pro.uikit.ui_components.shared.CometChatSnackBar;
@@ -73,7 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ongoingCallService = new OngoingCallService();
         mServiceIntent = new Intent(this,ongoingCallService.getClass());
         if (!isMyServiceRunning(ongoingCallService.getClass())) {
-            startForegroundService(mServiceIntent);
+            startService(mServiceIntent);
         }
 
         mainView = findViewById(R.id.call_view);
@@ -91,11 +92,17 @@ protected void onCreate(Bundle savedInstanceState) {
                     .build();
         Log.e( "startCallActivity: ",sessionID+" "+type);
         CometChat.startCall(callSettings, new CometChat.OngoingCallListener() {
+
             @Override
             public void onUserListUpdated(List<User> list) {
                 Log.e( "onUserListUpdated: ",list.toString() );
             }
 
+            @Override
+            public void onAudioModesUpdated(List<AudioMode> list) {
+                Log.e( "onAudioModeUpdated: ",list.toString() );
+            }
+
             @Override
             public void onUserJoined(User user) {
                 connectingLayout.setVisibility(View.GONE);
@@ -122,17 +129,15 @@ mainView, getString(R.string.user_left)+":"+ user.getName(),
 
             @Override
             public void onError(CometChatException e) {
-                if (mServiceIntent!=null)
-                    stopService(mServiceIntent);
+                stopService(mServiceIntent);
                 Log.e("onstartcallError: ", e.getMessage());
                 CometChatSnackBar.show(CometChatStartCallActivity.this,
                         mainView,CometChatError.localized(e), CometChatSnackBar.ERROR);
             }
 
             @Override
             public void onCallEnded(Call call) {
-                if (mServiceIntent!=null)
-                    stopService(mServiceIntent);
+                stopService(mServiceIntent);
                 Log.e("TAG", "onCallEnded: ");
                 finish();
             }

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/calls/call_manager/CometChatStartCallActivity.java

@@ -63,7 +63,7 @@ private void startMyOwnForeground() {
                 .setContentIntent(pendingIntent)
                 .setCategory(Notification.CATEGORY_CALL)
                 .build();
-        startForeground(1,notification);
+        notificationManager.notify(1,notification);
     }
 
     private Intent getCallIntent(String title) {
@@ -104,7 +104,7 @@ public void onDestroy() {
     @Override
     public boolean stopService(Intent name) {
         stopTimer();
-        return stopService(name);
+        return super.stopService(name);
     }
 
     private Timer timer;

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/calls/call_manager/ongoing_call/OngoingCallService.java

@@ -10,6 +10,7 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -76,6 +77,8 @@ public class CometChatGroupList extends Fragment  {
 
     private LinearLayout noGroupLayout;
 
+    private SwipeRefreshLayout swipeRefreshLayout;
+
     private List<Group> groupList = new ArrayList<>();
 
     private static final String TAG = "CometChatGroupList";
@@ -95,6 +98,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         noGroupLayout = view.findViewById(R.id.no_group_layout);
         etSearch = view.findViewById(R.id.search_bar);
         clearSearch = view.findViewById(R.id.clear_search);
+        swipeRefreshLayout = view.findViewById(R.id.swipeToRefresh);
 
         ivCreateGroup = view.findViewById(R.id.create_group);
         ivCreateGroup.setImageTintList(ColorStateList.valueOf(Color.parseColor(UISettings.getColor())));
@@ -183,6 +187,14 @@ public void OnItemClick(Group group, int position) {
                     event.OnItemClick(group,position);
             }
         });
+        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                groupsRequest=null;
+                rvGroupList.clear();
+                fetchGroup();
+            }
+        });
         return view;
     }
 
@@ -215,6 +227,8 @@ public void onSuccess(List<Group> groups) {
                     noGroupLayout.setVisibility(View.GONE);
                     rvGroupList.setVisibility(View.VISIBLE);
                 }
+                if (swipeRefreshLayout.isRefreshing())
+                    swipeRefreshLayout.setRefreshing(false);
             }
             @Override
             public void onError(CometChatException e) {

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/groups/group_list/CometChatGroupList.java

@@ -2173,8 +2173,8 @@ public void onResume() {
         checkOnGoingCall();
         if (!(resultIntentCode== UIKitConstants.RequestCode.GALLERY ||
                 resultIntentCode== UIKitConstants.RequestCode.CAMERA ||
-                resultIntentCode == UIKitConstants.RequestCode.FILE) ||
-                resultIntentCode == UIKitConstants.RequestCode.AUDIO) {
+                resultIntentCode == UIKitConstants.RequestCode.FILE ||
+                resultIntentCode == UIKitConstants.RequestCode.AUDIO)) {
             rvChatListView.removeItemDecoration(stickyHeaderDecoration);
             messagesRequest = null;
             messageAdapter = null;

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/messages/message_list/CometChatMessageList.java

@@ -359,7 +359,7 @@ protected FilterResults performFiltering(CharSequence charSequence) {
                                 conversation.getLastMessage().getCategory().equals(CometChatConstants.CATEGORY_MESSAGE) &&
                                 conversation.getLastMessage().getType().equals(CometChatConstants.MESSAGE_TYPE_TEXT)
                                 && ((TextMessage)conversation.getLastMessage()).getText()!=null
-                                && ((TextMessage)conversation.getLastMessage()).getText().contains(searchKeyword)) {
+                                && ((TextMessage)conversation.getLastMessage()).getText().toLowerCase().contains(searchKeyword.toLowerCase())) {
                             tempFilter.add(conversation);
                         }
                     }