Merge branch 'master' of https://github.com/GetStream/stream-chat-android

# Conflicts: resolved
#	library/build.gradle

Author: adrian09h

build.gradle

@@ -10,7 +10,6 @@ buildscript {
     repositories {
         google()
         jcenter()
-
     }
 
     dependencies {

library/build.gradle

@@ -61,10 +61,8 @@ dependencies {
     api 'com.google.android.exoplayer:exoplayer-dash:2.9.6'
     api 'com.google.android.exoplayer:exoplayer-hls:2.9.6'
     api 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.9.6'
-
-//    testImplementation 'junit:junit:4.12'
-//    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-//    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    testImplementation 'com.github.junit-team.junit5:junit-jupiter:r5.5.1'
+    testImplementation 'com.github.junit-team.junit5:junit-bom:r5.5.1'
     // JWT TOKEN
 //    implementation 'io.jsonwebtoken:jjwt-api:0.10.5'
 //    implementation 'io.jsonwebtoken:jjwt-impl:0.10.5'

library/src/main/java/com/getstream/sdk/chat/adapter/ChannelListItemAdapter.java

@@ -128,8 +128,8 @@ private void configChannelInfo(ListItemChannelBinding binding, ChannelResponse c
         if (!TextUtils.isEmpty(channel.getName())) {
             binding.tvInitials.setText(channel.getInitials());
             binding.tvName.setText(channel.getName());
-            Utils.circleImageLoad(binding.ivAvatar, channel.getImageURL());
-            if (StringUtility.isValidImageUrl(channel.getImageURL())) {
+            Utils.circleImageLoad(binding.ivAvatar, channel.getImage());
+            if (StringUtility.isValidImageUrl(channel.getImage())) {
                 binding.ivAvatar.setVisibility(View.VISIBLE);
                 binding.tvInitials.setVisibility(View.INVISIBLE);
             } else {

library/src/main/java/com/getstream/sdk/chat/component/Component.java

@@ -2,10 +2,9 @@
 
 import com.getstream.sdk.chat.R;
 import com.getstream.sdk.chat.adapter.MessageListItemViewHolder;
-import com.getstream.sdk.chat.enums.FilterQuery;
+import com.getstream.sdk.chat.enums.FilterObject;
 import com.getstream.sdk.chat.enums.ReadIndicator;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,8 +22,12 @@ public class Component{
     public class Channel{
         private boolean invitation = true;
         private boolean showReadIndicator = true;
-        private List<FilterOption> filterOptions;
-        private FilterQuery query;
+
+        public FilterObject getFilter() {
+            return _filter;
+        }
+
+        private FilterObject _filter;
         private Map<String, Object> sortOptions;
         private ReadIndicator readIndicator = ReadIndicator.LAST_READ_USER;
         /**
@@ -65,25 +68,14 @@ public void setInvitation(boolean invitation) {
             this.invitation = invitation;
         }
 
-        public List<FilterOption> getFilterOptions() {
-            return filterOptions;
-        }
         /**
          * Setter Method for Channels filter option
-         * @param query FilterQuery for query operator
-         * @param filterOptions Query syntax
+         * @param filter FilterQuery for query operator
          */
-        public void setFilterOptions(FilterQuery query, List<FilterOption> filterOptions) {
-            this.query = query;
-            this.filterOptions = filterOptions;
+        public void filter(FilterObject filter) {
+            this._filter = filter;
         }
 
-
-        public FilterQuery getQuery() {
-            return query;
-        }
-
-
         public Map<String, Object> getSortOptions() {
             return sortOptions;
         }
@@ -101,27 +93,21 @@ public void setSortOptions(Map<String, Object> sortOptions) {
      */
     public class User {
 
-        private List<FilterOption> filterOptions;
-        private FilterQuery query;
+        private FilterObject _filter;
         private Map<String, Object> sortOptions;
 
-        public List<FilterOption> getFilterOptions() {
-            return filterOptions;
+        public FilterObject getFilter() {
+            return _filter;
         }
 
         /**
          * Setter Method for Users filter option
-         * @param query FilterQuery for query operator
-         * @param filterOptions Query syntax
+         * @param filter FilterQuery for query operator
          */
-        public void setFilterOptions(FilterQuery query, List<FilterOption> filterOptions) {
-            this.filterOptions = filterOptions;
-            this.query = query;
+        public void filter(FilterObject filter) {
+            this._filter = filter;
         }
 
-        public FilterQuery getQuery() {
-            return query;
-        }
 
         public Map<String, Object> getSortOptions() {
             return sortOptions;

library/src/main/java/com/getstream/sdk/chat/component/FilterOption.java

@@ -0,0 +1,56 @@
+package com.getstream.sdk.chat.enums;
+
+import com.google.gson.annotations.JsonAdapter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * FilterObject holds the filtering data
+ *
+ * If you need to serialize this to JSON make sure to either use gson or serialize the result of
+ * getData()
+ **/
+@JsonAdapter(FilterObjectAdapter.class)
+public class FilterObject {
+
+    public HashMap<String, Object> getData() {
+        HashMap<String, Object> data = new HashMap<>();
+        for (Map.Entry<String, Object> set: this.data.entrySet()) {
+            if (set.getValue() instanceof FilterObject) {
+                data.put(set.getKey(), ((FilterObject) set.getValue()).getData());
+                continue;
+            }
+            if (set.getValue() instanceof FilterObject[]){
+                ArrayList<HashMap<String, Object>> listOfMaps = new ArrayList<>();
+                FilterObject[] values = (FilterObject[]) set.getValue();
+                for (FilterObject subVal: values) {
+                    listOfMaps.add(subVal.getData());
+                }
+                data.put(set.getKey(), listOfMaps);
+                continue;
+            }
+            data.put(set.getKey(), set.getValue());
+        }
+        return data;
+    }
+
+    private HashMap<String, Object> data;
+
+    public FilterObject(HashMap<String, Object> data) {
+        this.data = data;
+    }
+
+    public FilterObject(String key, Object v) {
+        this.data = new HashMap<>();
+        this.data.put(key, v);
+    }
+
+    public FilterObject put(String key, Object v) {
+        HashMap<String, Object> clone = new HashMap<>(this.data);
+        clone.put(key, v);
+        return new FilterObject(clone);
+    }
+
+}

library/src/main/java/com/getstream/sdk/chat/enums/FilterObject.java

@@ -0,0 +1,26 @@
+package com.getstream.sdk.chat.enums;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+
+/**
+ * FilterObjectAdapter makes it easier to serialize this to JSON via gson
+**/
+class FilterObjectAdapter extends TypeAdapter<FilterObject> {
+    @Override
+    public void write(JsonWriter out, FilterObject value) throws IOException {
+        TypeAdapter adapter = new Gson().getAdapter(HashMap.class);
+        adapter.write(out, value.getData());
+    }
+
+    @Override
+    public FilterObject read(JsonReader in) throws IOException {
+        throw new IOException("not supported");
+    }
+}

library/src/main/java/com/getstream/sdk/chat/enums/FilterObjectAdapter.java

@@ -0,0 +1,69 @@
+package com.getstream.sdk.chat.enums;
+
+import java.util.List;
+
+/**
+ * Filters a set of static methods to build a filter object
+ **/
+public class Filters {
+
+    static public FilterObject and(FilterObject... filters) {
+        return new FilterObject("$and", filters);
+    }
+
+    static public FilterObject or(FilterObject... filters) {
+        return new FilterObject("$or", filters);
+    }
+
+    static public FilterObject nor(FilterObject... filters) {
+        return new FilterObject("$nor", filters);
+    }
+
+    static public FilterObject eq(String field, Object value){
+        return new FilterObject(field, value);
+    }
+
+    static public FilterObject ne(String field, Object value){
+        return new FilterObject(field, new FilterObject("$ne", value));
+    }
+
+    static public FilterObject greaterThan(String field, Object value){
+        return new FilterObject(field, new FilterObject("$gt", value));
+    }
+
+    static public FilterObject greaterThanEquals(String field, Object value){
+        return new FilterObject(field, new FilterObject("$gte", value));
+    }
+
+    static public FilterObject lessThan(String field, Object value){
+        return new FilterObject(field, new FilterObject("$lt", value));
+    }
+
+    static public FilterObject lessThanEquals(String field, Object value){
+        return new FilterObject(field, new FilterObject("$lte", value));
+    }
+
+    static public FilterObject in(String field, String... values){
+        return new FilterObject(field, new FilterObject("$in", values));
+    }
+
+    static public FilterObject in(String field, List values){
+        return new FilterObject(field, new FilterObject("$in", values));
+    }
+
+    static public FilterObject in(String field, Number... values){
+        return new FilterObject(field, new FilterObject("$in", values));
+    }
+
+    static public FilterObject nin(String field, String... values){
+        return new FilterObject(field, new FilterObject("$nin", values));
+    }
+
+    static public FilterObject nin(String field, List values){
+        return new FilterObject(field, new FilterObject("$nin", values));
+    }
+
+    static public FilterObject nin(String field, Number... values){
+        return new FilterObject(field, new FilterObject("$nin", values));
+    }
+}