integrate latest changes from sdk develop; use chat event listener in java samples

Carter Hudson · Carter Hudson · commit 3f617967f51d · 2021-01-28T11:09:26.000-07:00
diff --git a/samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity.java b/samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity.java
@@ -71,7 +71,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             }
         });
         // Step 4 - Let the message input know when we are editing a message
-        binding.messageListView.setOnMessageEditHandler(message -> {
+        binding.messageListView.setMessageEditHandler(message -> {
             messageInputViewModel.getEditMessage().postValue(message);
         });
 
diff --git a/samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity2.java b/samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity2.java
@@ -80,7 +80,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         });
 
         // Step 5 - Let the message input know when we are editing a message
-        binding.messageListView.setOnMessageEditHandler(message -> {
+        binding.messageListView.setMessageEditHandler(message -> {
             messageInputViewModel.getEditMessage().postValue(message);
         });
 
diff --git a/samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity3.java b/samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity3.java
@@ -88,7 +88,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         });
 
         // Step 5 - Let the message input know when we are editing a message
-        binding.messageListView.setOnMessageEditHandler(message -> {
+        binding.messageListView.setMessageEditHandler(message -> {
             messageInputViewModel.getEditMessage().postValue(message);
         });
 
@@ -130,7 +130,6 @@ public void handleOnBackPressed() {
                             typingHeaderView.setText(typing);
                         }
                     });
-                    return Unit.INSTANCE;
                 });
     }
 }
diff --git a/samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity4.java b/samplejava/src/main/java/com/example/chattutorialjava/ChannelActivity4.java
@@ -89,7 +89,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         });
 
         // Step 5 - Let the message input know when we are editing a message
-        binding.messageListView.setOnMessageEditHandler(message -> {
+        binding.messageListView.setMessageEditHandler(message -> {
             messageInputViewModel.getEditMessage().postValue(message);
         });
 
@@ -112,12 +112,14 @@ public void handleOnBackPressed() {
         String nobodyTyping = "nobody is typing";
         typingHeaderView.setText(nobodyTyping);
 
+        // Observe raw events through the low-level client
         Set<String> currentlyTyping = new HashSet<>();
         ChatClient.instance()
                 .channel(cid)
                 .subscribeFor(
                         this,
-                        new Class[]{TypingStartEvent.class, TypingStopEvent.class}, event -> {
+                        new Class[]{TypingStartEvent.class, TypingStopEvent.class},
+                        event -> {
                             if (event instanceof TypingStartEvent) {
                                 User user = ((TypingStartEvent) event).getUser();
                                 String name = (String) user.getExtraData().get("name");
@@ -132,8 +134,9 @@ public void handleOnBackPressed() {
                             if (!currentlyTyping.isEmpty()) {
                                 typing = "typing: " + TextUtils.join(", ", currentlyTyping);
                             }
+
                             typingHeaderView.setText(typing);
-                            return Unit.INSTANCE;
-                        });
+                        }
+                );
     }
 }
diff --git a/samplejava/src/main/java/com/example/chattutorialjava/ImgurAttachmentViewHolderFactory.java b/samplejava/src/main/java/com/example/chattutorialjava/ImgurAttachmentViewHolderFactory.java
@@ -19,15 +19,15 @@ class ImgurAttachmentViewHolderFactory extends MessageListItemViewHolderFactory
 
     @Override
     public int getItemViewType(@NotNull MessageListItem item) {
-        if (hasImgurImage(item)) {
-            return IMGUR;
-        }
-        return super.getItemViewType(item);
+        return hasImgurImage(item) ? IMGUR : super.getItemViewType(item);
     }
 
     @NotNull
     @Override
-    public BaseMessageItemViewHolder<? extends MessageListItem> createViewHolder(@NotNull ViewGroup parentView, int viewType) {
+    public BaseMessageItemViewHolder<? extends MessageListItem> createViewHolder(
+            @NotNull ViewGroup parentView,
+            int viewType
+    ) {
         boolean isImgur = viewType == IMGUR;
         return isImgur ? ImgurAttachmentViewHolder.create(parentView) : super.createViewHolder(parentView, viewType);
     }
@@ -39,7 +39,7 @@ private boolean hasImgurImage(MessageListItem item) {
 
         Message message = ((MessageListItem.MessageItem) item).getMessage();
         List<Attachment> attachments = message.getAttachments();
-        if (attachments == null || attachments.isEmpty()) {
+        if (attachments.isEmpty()) {
             return false;
         }
 
diff --git a/samplejava/src/main/java/com/example/chattutorialjava/MainActivity.java b/samplejava/src/main/java/com/example/chattutorialjava/MainActivity.java
@@ -32,8 +32,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         // Step 1 - Set up the client for API calls, the domain for offline storage and the UI components
         ChatClient client = new ChatClient.Builder("b67pax5b2wdq", getApplicationContext()).build();
-        ChatDomain domain = new ChatDomain.Builder(client, getApplicationContext()).build();
-        new ChatUI.Builder(client, domain, getApplicationContext()).build();
+        new ChatDomain.Builder(client, getApplicationContext()).build();
+        new ChatUI.Builder(getApplicationContext()).build();
 
         // Step 2 - Authenticate and connect the user
         User user = new User();
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity.kt
@@ -57,8 +57,8 @@ class ChannelActivity : AppCompatActivity() {
         }
 
         // Step 4 - Let the message input know when we are editing a message
-        binding.messageListView.setOnMessageEditHandler {
-            messageInputViewModel.editMessage.postValue(it)
+        binding.messageListView.setMessageEditHandler { message ->
+            messageInputViewModel.editMessage.postValue(message)
         }
 
         // Step 5 - Handle navigate up state
@@ -69,12 +69,12 @@ class ChannelActivity : AppCompatActivity() {
         }
 
         // Step 6 - Handle back button behaviour correctly when you're in a thread
-        val handleBackPressed = {
+        val backHandler = {
             messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)
         }
-        binding.messagesHeaderView.setBackButtonClickListener(handleBackPressed)
+        binding.messagesHeaderView.setBackButtonClickListener(backHandler)
         onBackPressedDispatcher.addCallback(this) {
-            handleBackPressed()
+            backHandler()
         }
     }
 
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity2.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity2.kt
@@ -64,8 +64,8 @@ class ChannelActivity2 : AppCompatActivity() {
         }
 
         // Step 5 - Let the message input know when we are editing a message
-        binding.messageListView.setOnMessageEditHandler {
-            messageInputViewModel.editMessage.postValue(it)
+        binding.messageListView.setMessageEditHandler { message ->
+            messageInputViewModel.editMessage.postValue(message)
         }
 
         // Step 6 - Handle back button behaviour correctly when you're in a thread
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity3.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity3.kt
@@ -66,8 +66,8 @@ class ChannelActivity3 : AppCompatActivity() {
         }
 
         // Step 5 - Let the message input know when we are editing a message
-        binding.messageListView.setOnMessageEditHandler {
-            messageInputViewModel.editMessage.postValue(it)
+        binding.messageListView.setMessageEditHandler { message ->
+            messageInputViewModel.editMessage.postValue(message)
         }
 
         // Step 6 - Handle back button behaviour correctly when you're in a thread
@@ -84,18 +84,22 @@ class ChannelActivity3 : AppCompatActivity() {
         binding.typingHeaderView.text = nobodyTyping
 
         // Obtain a ChannelController
-        ChatDomain.instance().useCases.getChannelController(cid).enqueue { channelControllerResult ->
-            if (channelControllerResult.isSuccess) {
-
-                // Observe typing users
-                channelControllerResult.data().typing.observe(this) { typingState ->
-                    binding.typingHeaderView.text = when {
-                        typingState.users.isNotEmpty() -> typingState.users.joinToString(prefix = "typing: ") { user -> user.name }
-                        else -> nobodyTyping
+        ChatDomain.instance().useCases.getChannelController(cid)
+            .enqueue { channelControllerResult ->
+                if (channelControllerResult.isSuccess) {
+                    // Observe typing users
+                    channelControllerResult.data().typing.observe(this) { typingState ->
+                        binding.typingHeaderView.text = when {
+
+                            typingState.users.isNotEmpty() -> {
+                                typingState.users.joinToString(prefix = "typing: ") { user -> user.name }
+                            }
+
+                            else -> nobodyTyping
+                        }
                     }
                 }
             }
-        }
     }
 
     companion object {
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity4.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity4.kt
@@ -68,8 +68,8 @@ class ChannelActivity4 : AppCompatActivity() {
         }
 
         // Step 5 - Let the message input know when we are editing a message
-        binding.messageListView.setOnMessageEditHandler {
-            messageInputViewModel.editMessage.postValue(it)
+        binding.messageListView.setMessageEditHandler { message ->
+            messageInputViewModel.editMessage.postValue(message)
         }
 
         // Step 6 - Handle back button behaviour correctly when you're in a thread
@@ -87,16 +87,17 @@ class ChannelActivity4 : AppCompatActivity() {
 
         val currentlyTyping = mutableSetOf<String>()
 
+        // Observe raw events through the low-level client
         ChatClient
             .instance()
             .channel(cid)
             .subscribeFor(
                 this, TypingStartEvent::class, TypingStopEvent::class
             ) { event ->
-                @Suppress("NON_EXHAUSTIVE_WHEN_ON_SEALED_CLASS")
                 when (event) {
                     is TypingStartEvent -> currentlyTyping.add(event.user.extraData["name"] as String)
                     is TypingStopEvent -> currentlyTyping.remove(event.user.extraData["name"] as String)
+                    else -> Unit
                 }
 
                 binding.typingHeaderView.text = when {
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/MainActivity.kt b/samplekotlin/src/main/java/com/example/chattutorial/MainActivity.kt
@@ -26,11 +26,11 @@ class MainActivity : AppCompatActivity() {
         setContentView(binding.root)
 
         // Step 1 - Set up the client for API calls, the domain for offline storage and the UI components
-        val client =
-            ChatClient.Builder("b67pax5b2wdq", applicationContext).logLevel(ChatLogLevel.ALL)
-                .build()
-        val domain = ChatDomain.Builder(client, applicationContext).build()
-        ChatUI.Builder(client, domain, applicationContext).build()
+        val client = ChatClient.Builder("b67pax5b2wdq", applicationContext)
+            .logLevel(ChatLogLevel.ALL)
+            .build()
+        ChatDomain.Builder(client, applicationContext).build()
+        ChatUI.Builder(applicationContext).build()
 
         // Step 2 - Authenticate and connect the user
         val user = User("summer-brook-2").apply {
diff --git a/settings.gradle b/settings.gradle
@@ -27,7 +27,6 @@ if (new File(rootDir, '../stream-chat-android/.composite').exists()) {
         // module spec is not validated, if you get it wrong you just dont get a local version of the module
         // project spec is validated, if you get it wrong you get an error
         dependencySubstitution {
-
             substitute(module("io.getstream:stream-chat-android-ui-components:")).with(project(":stream-chat-android-ui-components"))
         }
         dependencySubstitution {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {`
`71`	`71`	`}`
`72`	`72`	`});`
`73`	`73`	`// Step 4 - Let the message input know when we are editing a message`
`74`		`- binding.messageListView.setOnMessageEditHandler(message -> {`
	`74`	`+ binding.messageListView.setMessageEditHandler(message -> {`
`75`	`75`	`messageInputViewModel.getEditMessage().postValue(message);`
`76`	`76`	`});`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {`
`88`	`88`	`});`
`89`	`89`
`90`	`90`	`// Step 5 - Let the message input know when we are editing a message`
`91`		`- binding.messageListView.setOnMessageEditHandler(message -> {`
	`91`	`+ binding.messageListView.setMessageEditHandler(message -> {`
`92`	`92`	`messageInputViewModel.getEditMessage().postValue(message);`
`93`	`93`	`});`
`94`	`94`
`@@ -130,7 +130,6 @@ public void handleOnBackPressed() {`
`130`	`130`	`typingHeaderView.setText(typing);`
`131`	`131`	`}`
`132`	`132`	`});`
`133`		`- return Unit.INSTANCE;`
`134`	`133`	`});`
`135`	`134`	`}`
`136`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ class ChannelActivity : AppCompatActivity() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// Step 4 - Let the message input know when we are editing a message`
`60`		`- binding.messageListView.setOnMessageEditHandler {`
`61`		`- messageInputViewModel.editMessage.postValue(it)`
	`60`	`+ binding.messageListView.setMessageEditHandler { message ->`
	`61`	`+ messageInputViewModel.editMessage.postValue(message)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Step 5 - Handle navigate up state`
`@@ -69,12 +69,12 @@ class ChannelActivity : AppCompatActivity() {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// Step 6 - Handle back button behaviour correctly when you're in a thread`
`72`		`- val handleBackPressed = {`
	`72`	`+ val backHandler = {`
`73`	`73`	`messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)`
`74`	`74`	`}`
`75`		`- binding.messagesHeaderView.setBackButtonClickListener(handleBackPressed)`
	`75`	`+ binding.messagesHeaderView.setBackButtonClickListener(backHandler)`
`76`	`76`	`onBackPressedDispatcher.addCallback(this) {`
`77`		`- handleBackPressed()`
	`77`	`+ backHandler()`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ class ChannelActivity2 : AppCompatActivity() {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// Step 5 - Let the message input know when we are editing a message`
`67`		`- binding.messageListView.setOnMessageEditHandler {`
`68`		`- messageInputViewModel.editMessage.postValue(it)`
	`67`	`+ binding.messageListView.setMessageEditHandler { message ->`
	`68`	`+ messageInputViewModel.editMessage.postValue(message)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// Step 6 - Handle back button behaviour correctly when you're in a thread`