Merge pull request #126 from aerogear/sampleUiBetter

Improve sample.

Author: Lavanyagaur22

offix/src/main/java/org/aerogear/offix/ConflictResolutionHandler.kt

@@ -34,7 +34,7 @@ class ConflictResolutionHandler {
     }
 
     internal fun conflictPresent(parsedResponse: Optional<Response<Any>>?): Boolean {
-        Log.d(TAG, "inside conflictPresent parsed response")
+        Log.d(TAG, "inside conflictPresent parsed response $parsedResponse")
 
         /*Check if the parsed response contains a conflict.
         The contract for conflicts is that the response will contain an error with the
@@ -44,12 +44,11 @@ class ConflictResolutionHandler {
             return false
         }
 
-        Log.d(TAG, "Thread:[" + Thread.currentThread().id + "]: onResponse -- found error")
-
         if (!parsedResponse.get().errors()[0].toString().contains("conflictInfo")) {
             return false
         }
-      return true
-    }
 
+        Log.d("$TAG  300", "ConflictResolutionHandler")
+        return true
+    }
 }

offix/src/main/java/org/aerogear/offix/Offix.kt

@@ -182,7 +182,6 @@ fun getMutation(storedmutation: org.aerogear.offix.persistence.Mutation): Mutati
 
     //Make an object of mutation (done by reflection)
     val obj = constructor.newInstance(*jsonValues.toArray())
-
     return obj as Mutation<Operation.Data, Operation.Data, Operation.Variables>
 }
 

offix/src/main/java/org/aerogear/offix/interceptor/ConflictInterceptor.kt

@@ -37,7 +37,7 @@ class ConflictInterceptor(private val conflictResolutionImpl: ConflictResolution
             queueCallback.addLast(callBack)
         }
         Log.d("$TAG 1", "${request.operation}")
-        Log.d(TAG, "Size of OfflineCallback list ${queueCallback.size}")
+        Log.d(TAG, "Size of queue callback list which stores all mutations ${queueCallback.size}")
 
         /* Check is the network connection is there or not.
          */
@@ -67,8 +67,7 @@ class ConflictInterceptor(private val conflictResolutionImpl: ConflictResolution
              */
             if (Offline.requestList.isNotEmpty()) {
                 chain.proceedAsync(request, dispatcher, OffixConflictCallback(conflictResolutionImpl))
-//                Offline.requestList.remove(request)
-                Log.d("$TAG 100", "If list is not empty: ${Offline.requestList.size}")
+                Log.d("$TAG 100", "Net comes and requestList is not empty: ${Offline.requestList.size}")
                 /* When user comes from offline to online, we wait for the user to perform any mutation.
                    Now along with the mutation performed by the user, we fetch the mutation requests stored in the list and
                    replicate them back to the server.
@@ -80,6 +79,7 @@ class ConflictInterceptor(private val conflictResolutionImpl: ConflictResolution
                     chain.proceedAsync(it, dispatcher, OfflineCallback(it))
                 }
 
+                Offline.requestList.clear()
             } else {
                 Log.d("$TAG 200", "--------")
                 chain.proceedAsync(request, dispatcher, OffixConflictCallback(conflictResolutionImpl))
@@ -144,9 +144,9 @@ class ConflictInterceptor(private val conflictResolutionImpl: ConflictResolution
         val userOfflineCallback = queueCallback.removeFirst()
         override fun onResponse(response: ApolloInterceptor.InterceptorResponse) {
             Log.d(TAG, "onResponse()")
-            Log.d(TAG, "OfflineCallback: Size of OfflineCallback list ${queueCallback.size}")
+            Log.d(TAG, "OfflineCallback: Size of OfflineCallback list--- ${queueCallback.size}")
             Offline.requestList.remove(request)
-            Log.d(TAG, "SIZE OF Request LIST in OfflineCallback: ${Offline.requestList.size}")
+            Log.d(TAG, "SIZE OF Request LIST in OfflineCallback ****: ${Offline.requestList.size}")
             userOfflineCallback.onResponse(response)
         }
 

sample/server/db.sqlite

@@ -0,0 +1,11 @@
+query findUsers($fields: UserFilter!){
+    findUsers(fields: $fields){
+        id
+        firstName
+        lastName
+        title
+        email
+        taskId
+        creationmetadataId
+    }
+}

sample/src/main/graphql/org.aerogear.graphqlandroid/findUsers.graphql

@@ -0,0 +1,11 @@
+mutation updateUser($id: ID!, $input: UserInput!){
+    updateUser(id: $id, input: $input){
+        id
+        firstName
+        lastName
+        title
+        email
+        taskId
+        creationmetadataId
+    }
+}

sample/src/main/graphql/org.aerogear.graphqlandroid/updateUser.graphql

@@ -13,10 +13,8 @@ import com.apollographql.apollo.cache.normalized.lru.LruNormalizedCacheFactory
 import com.apollographql.apollo.cache.normalized.sql.ApolloSqlHelper
 import com.apollographql.apollo.cache.normalized.sql.SqlNormalizedCacheFactory
 import com.apollographql.apollo.subscription.WebSocketSubscriptionTransport
-import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import org.aerogear.offix.interceptor.ConflictInterceptor
-import java.nio.charset.Charset
 
 object Utils {