Merge pull request #28 from FarshidRoohi/master

change lib okHttp

Author: FarshidRoohi

.idea/misc.xml

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.61'
+    ext.kotlin_version = '1.2.71'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2'
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

build.gradle

@@ -1,6 +1,6 @@
-#Sat Aug 04 16:51:08 IRDT 2018
+#Sat Oct 20 15:37:01 IRST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -3,6 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 
+def versionLib = '0.0.22'
+
+group = 'com.zarinpal'
+version = versionLib
+
 android {
     compileSdkVersion 28
 
@@ -27,11 +32,6 @@ android {
 
 }
 
-def versionLib = '0.0.21'
-
-group = 'com.zarinpal'
-version = versionLib
-
 task generateSourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
     classifier 'sources'
@@ -82,7 +82,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
     implementation 'com.android.support:support-annotations:28.0.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
 

qlroid/build.gradle

@@ -31,8 +31,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    compile'com.squareup.okhttp3:okhttp:3.11.0'
-    compile 'com.google.code.gson:gson:2.8.5'
+    implementation'com.squareup.okhttp3:okhttp:3.11.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
 
 
 

qlroidx/build.gradle

@@ -1,109 +1,56 @@
 package graphsample.imanx.github.com.comgithubimanxgraphsample;
 
+import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
-import com.github.imanx.QLroid.argument.Arg;
-import com.github.imanx.qlroidx.Argument;
-import com.github.imanx.qlroidx.GraphCallback;
-import com.google.gson.reflect.TypeToken;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.lang.reflect.Type;
+import com.github.imanx.QLroid.Query;
+import com.github.imanx.QLroid.callback.Callback;
+import com.github.imanx.QLroid.request.Header;
+import com.github.imanx.QLroid.request.Request;
 
 public class MainActivity extends AppCompatActivity {
 
     public static final String TAG = MainActivity.class.getSimpleName();
 
-    private String baseUrl = "http://91.239.55.205:8080/api/graphql/my";
+    private String baseUrl = "https://plus.zarinpal.com/api/graphql/my";
+    private String token = "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6ImE3MWNmZjU1YWI0NGY5YjY0M2Q4NmY1NTYzNWRlZjI5MzMzODVkYzU3OGFkMGJkZTg2Mjk0MjQzMmQxYmU4MzEzZDgxOTYwMjgwNjRiZjRmIn0.eyJhdWQiOiIxIiwianRpIjoiYTcxY2ZmNTVhYjQ0ZjliNjQzZDg2ZjU1NjM1ZGVmMjkzMzM4NWRjNTc4YWQwYmRlODYyOTQyNDMyZDFiZTgzMTNkODE5NjAyODA2NGJmNGYiLCJpYXQiOjE1Mzg5ODU2MDQsIm5iZiI6MTUzODk4NTYwNCwiZXhwIjoxNTcwNTIxNjAxLCJzdWIiOiIyIiwic2NvcGVzIjpbXX0.yvCi-idUpafQvp2DBLcFydKM2zV92xgaD1IPPKZrwcYGj58rnhYx_vR66iKzFaHTgSH9UgnyJ-uC0lxVIgE1AvTu_C1dCQRRoICVB2EXVCi-sBEojs4GOqPoMRszj1eeqZwLT85iUiXEXWaNU7GLskBWtGcotq24IbtjK3v67vkl62pzhBxsnNzZX8bKIc9ahKYDfydl8DHuFoZMW4Js3bacI9fsD3Mv_416tkPaRZK93uViq9ifYsWyHhfpR4m-zcdcbdCGymTOLDKorxAkRuB8qqdHcSSTPG-wB1pq-6vyJ0v8LVUnPnkzwgAmiwGipzMJBlz3HRFkH9g2ASEyuo-swcROpKVU-RvysYh-C0z3ss6c6lC85MR3xH30bzgeWN88YrNLw90OK3lesVgs-Xs1VqZbdUaO2p2Y0eoMjOgHyE9hGkFnxEcfCnGwpvKbe0b2h5CdjZepcfF2-qveVGBDnSkh1e3jztBGjcQmtoN8cBNgxq1TPBpBx_TTFXYffJUMoFj1K4iIAvuhTMw0In8nzIwD3o0uXENKelJzE3uEKyICZ1dg3bQZdz3sGRoPADqPnzOJQ1FbvsL3OQtrH9Qvkfv-U27w5KKUYb7r4-OxY4eiwpeNhIWe49VtptfbNYznfH4hqEdny9Ak5qgIXnLBvhanEPXE24nyYT3HonI";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        Header header = new Header();
+        header.append("Authorization", token);
+        header.append("Accept", "application/json");
 
-//        com.github.imanx.qlroidx.Query query = new com.github.imanx.qlroidx.Query("Cards", new Card());
-        com.github.imanx.qlroidx.Mutation mutation =
-                new com.github.imanx.qlroidx.Mutation("PreferencesEdit", getArgument(), new Me());
-
-
-        new com.github.imanx.qlroidx.Request(baseUrl, mutation)
-                .addHeader("Authorization", "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjdjMDJmMGJjMDU0MDg2YjkyZjUyMDI1NzNlNGIzOWNmYTIwNTFmM2RlNmRlYjQ1YjA1ZWUxYmZlOGUwMGY4M2M5OWM1ZGY1ZGE5YWM3MmMyIn0.eyJhdWQiOiIxIiwianRpIjoiN2MwMmYwYmMwNTQwODZiOTJmNTIwMjU3M2U0YjM5Y2ZhMjA1MWYzZGU2ZGViNDViMDVlZTFiZmU4ZTAwZjgzYzk5YzVkZjVkYTlhYzcyYzIiLCJpYXQiOjE1Mzc0NjMxNDgsIm5iZiI6MTUzNzQ2MzE0OCwiZXhwIjoxNTY4OTk5MTQ4LCJzdWIiOiIzIiwic2NvcGVzIjpbXX0.p5Py07yami1SDeJxhcpMVQ776CNKqxe3ykoYLwthnuayIpz4ED36eaQWgmHywW61v9wOXATBvriBKouZWWpk4VhrKe08NseahvQoCXnosjsHh9-JEFJKmqYZUb9PCSIhIq-MVRehwXwv_EJQho0XA0nZuwbIX_Y3SzwmnXf72jb0KoHf0xkckHqXeRW0vGFezd_PRAS0IFaClrtqyJ8oPT3NpTic0wnRIIBuYgLOnbi6kiamgxgq5h8Ib4rlTgPSw2h46R4JtMttJUXl6xRfBmO6TedRMTmcjGWz6MYYUqwfg3AkgAedbMdyg7OVkIGpKplUu_nKPtL4oseHZeK9_yirrhyhCm3WaRLM7AYdJt_m7Trd76f58b7jiWQGRdNhp0y9KleF_uDAm0or_YuYqzaV7bzZSKFhrXkglQxWC2YnvVDJ7-0rnftQiZyhV47_ddbfbqgjW5B0INml7e7MZaTu6f9baVg50swf0XDlKmwCjy-Wa3JaN-5gyaUzAuCkYGjNVr7seMz5MbO5RUfH1g5X2j4b48JWVrLEKurilEpCNCbqTwdX7BXHavdr10DWlMhN3-zDcmCCDjFIeZ9Ux89fKgfvk_NAr6GdKiDYEZdNZKBtGZ0ycceNxRV75DfqGJ_mQScp5wxunQkbQcYhmD3hc08QUQ1mo789-KwbjA4")
+        getQuery().setHeader(header)
                 .setTimeout(10)
-                .enqueue(new GraphCallback<Me>() {
+                .build()
+                .enqueue(new Callback() {
                     @Override
-                    public void onResponse(com.github.imanx.qlroidx.Request request, String response, Me me) {
-                        Log.i(TAG, "onResponse: " + me.getFirstName());
+                    public void onResponse(String response) {
+                        Log.i(TAG, "onResponse: " + response);
                     }
 
                     @Override
-                    public void onFailure(com.github.imanx.qlroidx.Request request, String response, int status, Exception ex) {
-                        Log.i(TAG, "onFailure: " + response + " || " + status + " || ex : " + ex.getMessage());
-                    }
-
-                    @Override
-                    public Type getType() {
-                        return new TypeToken<Me>() {
-                        }.getType();
+                    public void onFailure(int httpCode, String data) {
+                        Log.i(TAG, "onFailure: " + httpCode + " ||  " + data);
                     }
                 });
-    }
-
-
-    public Argument getArgument() {
-
-        Argument argument = new Argument();
-
-        try {
-
-            argument.add(new Argument.SubArg("username", "farshid_zp", String.class));
-            argument.add(new Argument.SubArg("email", "[email protected]", String.class));
-
-            JSONArray array = new JSONArray();
-
-            // New Ticket
-
-            JSONObject newTicket = new JSONObject();
-
-            newTicket.put("type", "TICKET_NEW");
-
-            JSONArray channels = new JSONArray();
-            channels.put("MAIL");
-            channels.put("PUSH");
-
-            newTicket.put("channels", channels);
-
-
-            // Replay Ticket
-
-            JSONObject ticketReplay = new JSONObject();
-            ticketReplay.put("type", "TICKET_REPLY");
-
-            JSONArray channelsReplay = new JSONArray();
-            channelsReplay.put("MAIL");
-            channelsReplay.put("WEBHOOK");
-
-            ticketReplay.put("channels", channelsReplay);
-
-
-            // Add Items
-            array.put(newTicket);
-            array.put(ticketReplay);
-
-
-            argument.add(new Argument.SubArg("notification_preferences", array.toString(), UserNotificationPreferencesInput[].class));
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return argument;
-
 
     }
 
+    public Request.Builder getQuery() {
+        return new Request.Builder(this, Uri.parse(baseUrl), new Query(new Me()) {
+            @Nullable
+            @Override
+            public String getOperationName() {
+                return "Me";
+            }
+        });
+    }
 }