Merge pull request #48 from FrangSierra/development

Proguard, listen queries and testing

Author: FrangSierra

app/build.gradle

@@ -1,9 +1,9 @@
 buildscript {
     ext {
-        rx_version = "2.1.8"
+        rx_version = "2.1.10"
         rx_android_version = "2.0.1"
         firebase_version = "11.8.0"
-        support_version = "26.1.0"
+        support_version = "27.0.2"
     }
 }
 apply plugin: 'com.android.library'
@@ -24,12 +24,7 @@ android {
         targetSdkVersion 27
         versionCode 5
         versionName "1.3"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
+        consumerProguardFiles 'consumer-proguard-rules.pro'
     }
 }
 

app/consumer-proguard-rules.pro

@@ -0,0 +1,3 @@
+# Firebase uses Gson annotations and Gson uses generic type information stored in a class file when working with fields.
+# Proguard removes such information by default, so configure it to keep all of it.
+-keepattributes Signature

app/proguard-rules.pro

@@ -23,15 +23,15 @@ public static <U> DocumentSnapshotMapper<DocumentSnapshot, U> of(Class<U> clazz)
     }
 
     public static <U> DocumentSnapshotMapper<QuerySnapshot, List<U>> listOf(Class<U> clazz) {
-        return new DocumentSnapshotMapper.TypedListDocumentSnapshotMapper<>(clazz);
+        return new TypedListQuerySnapshotMapper<>(clazz);
     }
 
     public static <U> DocumentSnapshotMapper<QuerySnapshot, List<U>> listOf(Class<U> clazz, Function<DocumentSnapshot, U> mapper) {
-        return new DocumentSnapshotMapper.TypedListDocumentSnapshotMapper<>(clazz, mapper);
+        return new TypedListQuerySnapshotMapper<>(clazz, mapper);
     }
 
-    public static <U> TypedMapDocumentSnapshotMapper<U> mapOf(Class<U> clazz) {
-        return new DocumentSnapshotMapper.TypedMapDocumentSnapshotMapper<>(clazz);
+    public static <U> TypedMapQuerySnapshotMapper<U> mapOf(Class<U> clazz) {
+        return new TypedMapQuerySnapshotMapper<>(clazz);
     }
 
     private static <U> U getDataSnapshotTypedValue(DocumentSnapshot documentSnapshot, Class<U> clazz) {
@@ -52,16 +52,16 @@ public U apply(final DocumentSnapshot documentSnapshot) {
         }
     }
 
-    private static class TypedListDocumentSnapshotMapper<U> extends DocumentSnapshotMapper<QuerySnapshot, List<U>> {
+    private static class TypedListQuerySnapshotMapper<U> extends DocumentSnapshotMapper<QuerySnapshot, List<U>> {
 
         private final Class<U> clazz;
         private final Function<DocumentSnapshot, U> mapper;
 
-        TypedListDocumentSnapshotMapper(final Class<U> clazz) {
+        TypedListQuerySnapshotMapper(final Class<U> clazz) {
             this(clazz, null);
         }
 
-        TypedListDocumentSnapshotMapper(final Class<U> clazz, Function<DocumentSnapshot, U> mapper) {
+        TypedListQuerySnapshotMapper(final Class<U> clazz, Function<DocumentSnapshot, U> mapper) {
             this.clazz = clazz;
             this.mapper = mapper;
         }
@@ -79,11 +79,11 @@ public List<U> apply(final QuerySnapshot querySnapshot) throws Exception {
     }
 
 
-    private static class TypedMapDocumentSnapshotMapper<U> extends DocumentSnapshotMapper<QuerySnapshot, LinkedHashMap<String, U>> {
+    private static class TypedMapQuerySnapshotMapper<U> extends DocumentSnapshotMapper<QuerySnapshot, LinkedHashMap<String, U>> {
 
         private final Class<U> clazz;
 
-        TypedMapDocumentSnapshotMapper(final Class<U> clazz) {
+        TypedMapQuerySnapshotMapper(final Class<U> clazz) {
             this.clazz = clazz;
         }
 
@@ -100,7 +100,7 @@ public LinkedHashMap<String, U> apply(final QuerySnapshot querySnapshot) {
     static final Predicate<QuerySnapshot> QUERY_EXISTENCE_PREDICATE = new Predicate<QuerySnapshot>() {
         @Override
         public boolean test(@NonNull QuerySnapshot querySnapshot) throws Exception {
-            return querySnapshot.isEmpty();
+            return !querySnapshot.isEmpty();
         }
     };