Skip to content

Commit 58e8697

Browse files
Merge pull request #50 from cometchat-pro/v3
V3
2 parents 4adc2fd + f6ac03f commit 58e8697

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ dependencies {
7676
implementation 'com.google.android.material:material:1.2.0-alpha05'
7777
implementation 'com.facebook.shimmer:shimmer:0.4.0'
7878

79-
implementation 'com.cometchat:pro-android-chat-sdk:3.0.9'
79+
implementation 'com.cometchat:pro-android-chat-sdk:3.0.16'
8080
implementation 'com.cometchat:pro-android-calls-sdk:2.2.0'
8181

8282
}

app/src/androidTest/java/com/cometchat/pro/androiduikit/utils/AvatarBorderMatcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ protected boolean matchesSafely(View target) {
4646
return false;
4747
}
4848
CometChatAvatar avatarA = new CometChatAvatar(context);
49-
avatarA.setImageDrawable(imageView.getDrawable());
49+
avatarA.setDrawable(imageView.getDrawable());
5050
CometChatAvatar avatarB = new CometChatAvatar(context);
51-
avatarB.setImageDrawable(expectedDrawable);
51+
avatarB.setDrawable(expectedDrawable);
5252
return avatarA.getBorderWidth()==avatarB.getBorderWidth()?true:false;
5353
}
5454

uikit/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66
minSdkVersion 21
77
targetSdkVersion 32
88
versionCode 1
9-
versionName "3.0.9-4"
9+
versionName "3.0.16-1"
1010
multiDexEnabled true
1111
vectorDrawables.useSupportLibrary = true
1212
renderscriptSupportModeEnabled true
@@ -90,7 +90,7 @@ dependencies {
9090
implementation 'com.google.android.gms:play-services-location:17.0.0'
9191
implementation 'com.google.android.gms:play-services-maps:17.0.0'
9292
//cometchat
93-
implementation 'com.cometchat:pro-android-chat-sdk:3.0.9'
93+
implementation 'com.cometchat:pro-android-chat-sdk:3.0.16'
9494
implementation 'com.cometchat:pro-android-calls-sdk:2.2.0'
9595
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0'
9696
}

uikit/src/main/java/com/cometchat/pro/uikit/ui_components/users/user_list/CometChatUserList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public void onError(CometChatException e) {
312312
* @see UsersRequest
313313
*/
314314
private void searchUser(String s) {
315-
UsersRequest usersRequest = new UsersRequest.UsersRequestBuilder().setSearchKeyword(s).setLimit(100).build();
315+
UsersRequest usersRequest = new UsersRequest.UsersRequestBuilder().friendsOnly(UIKitSettings.getUsersMode()==UserMode.FRIENDS).setSearchKeyword(s).setLimit(100).build();
316316
usersRequest.fetchNext(new CometChat.CallbackListener<List<User>>() {
317317
@Override
318318
public void onSuccess(List<User> users) {

uikit/src/main/java/com/cometchat/pro/uikit/ui_resources/utils/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ public static String getOutputMediaFile(Context context) {
674674
// String var1 = Environment.getExternalStorageDirectory() + "/" + context.getResources().getString(R.string.app_name) + "/"
675675
// + "audio/";
676676
createDirectory(dir);
677-
return dir + (new SimpleDateFormat("yyyyMMddHHmmss")).format(new Date()) + ".mp3";
677+
return dir + (new SimpleDateFormat("yyyyMMddHHmmss")).format(new Date()) + ".m4a";
678678

679679
}
680680

0 commit comments

Comments
 (0)