Added possibility to have many Sentry instances and different http request mechanism

.gitignore

@@ -20,9 +20,6 @@ local.properties
 .classpath
 
 .gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/misc.xml
-/.idea/libraries
 .DS_Store
-/build
+*.iml
+.idea/

build.gradle

@@ -13,8 +13,37 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        mavenLocal()
         maven {
             url 'https://dl.bintray.com/joshdholtz/maven/'
         }
     }
+
+    ext {
+        bintrayRepo = 'maven'
+        bintrayName = 'sentry-android'
+
+        publishedGroupId = 'com.joshdholtz.sentry'
+
+
+        siteUrl = 'https://github.com/nuuneoi/FBLikeAndroid'
+        gitUrl = 'https://github.com/nuuneoi/FBLikeAndroid.git'
+
+        libraryVersion = '1.5.5'
+
+        developerId = 'joshdholtz'
+        developerName = 'Josh Holtz'
+        developerEmail = '[email protected]'
+
+        licenseName = 'The MIT License (MIT)'
+        licenseUrl = 'http://opensource.org/licenses/mit-license.php'
+        allLicenses = ["MIT"]
+
+        ext_compileSdkVersion = 25
+        ext_buildToolsVersion  = "25.0.2"
+
+        ext_minSdkVersion = 10
+        ext_targetSdkVersion = 25
+    }
+
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

sentry-android-okhttp-client/.gitignore

@@ -0,0 +1 @@
+/build

sentry-android-okhttp-client/build.gradle

@@ -0,0 +1,54 @@
+plugins {
+    id "com.jfrog.bintray" version "1.7.3"
+}
+apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+
+android {
+    compileSdkVersion ext_compileSdkVersion
+    buildToolsVersion ext_buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion ext_minSdkVersion
+        targetSdkVersion ext_targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+
+ext {
+    libraryName = 'sentry-android-okhttp-client'
+    artifact = 'sentry-android-okhttp-client'
+    libraryDescription = 'A Sentry okhttp client for Android'
+}
+
+dependencies {
+    compile "com.squareup.okhttp3:okhttp:3.6.0"
+    compile project(":sentry-android")
+//    compile "com.joshdholtz.sentry:sentry-android:${libraryVersion}"
+}
+
+apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
+
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            repository(url: nexusReleaseRepository) {
+                authentication(userName: nexusUserName, password: nexusPassword)
+            }
+            snapshotRepository(url: nexusSnapshotRepository) {
+                authentication(userName: nexusUserName, password: nexusPassword)
+            }
+        }
+    }
+}

sentry-android-okhttp-client/sentry-android-okhttp-client.iml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":sentry-android-okhttp-client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.joshdholtz.sentry" external.system.module.version="1.4.2-finanteq" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":sentry-android-okhttp-client" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="LIBRARY_PROJECT" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="okio-1.9.0" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" />
+    <orderEntry type="module" module-name="sentry-android" exported="" />
+  </component>
+</module>

sentry-android-okhttp-client/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest package="com.joshdholtz.sentry.okhttp">
+
+</manifest>

sentry-android-okhttp-client/src/main/java/com/joshdholtz/sentry/okhttp/OkHttpRequestSender.java

@@ -0,0 +1,118 @@
+package com.joshdholtz.sentry.okhttp;
+
+import com.joshdholtz.sentry.HttpRequestSender;
+
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+
+public class OkHttpRequestSender implements HttpRequestSender {
+
+    private static class OkBuilder implements Builder {
+
+        private static class OkResponse implements Response {
+
+            private final int code;
+            private final String bodyContent;
+
+            public OkResponse(int code, String bodyContent) {
+                this.code = code;
+                this.bodyContent = bodyContent;
+            }
+
+            @Override
+            public int getStatusCode() {
+                return code;
+            }
+
+            @Override
+            public String getContent() {
+                return bodyContent;
+            }
+        }
+
+        private final okhttp3.Request.Builder builder;
+        private OkHttpClient okHttpClient;
+        private boolean useHttps;
+        private String url;
+
+        private OkBuilder(OkHttpClient okHttpClient) {
+            this.okHttpClient = okHttpClient;
+            builder = new okhttp3.Request.Builder();
+        }
+
+        @Override
+        public Request build() throws Exception {
+            final Call call = okHttpClient.newCall(builder.build());
+            return new Request() {
+                @Override
+                public Response execute() throws Exception {
+                    okhttp3.Response response = call.execute();
+                    try {
+                        ResponseBody body = response.body();
+                        String bodyContent = null;
+                        if (body != null) {
+                            bodyContent = body.string();
+                        }
+
+                        return new OkResponse(response.code(), bodyContent);
+                    } finally {
+                        if (response.body() != null) {
+                            response.body().close();
+                        }
+                    }
+                }
+            };
+        }
+
+        @Override
+        public Builder useHttps() {
+            useHttps = true;
+            if (url != null) {
+                addHttps();
+            }
+            return this;
+        }
+
+        private void addHttps() {
+            if (!url.startsWith("http")) {
+                url = "https://" + url;
+            }
+        }
+
+        @Override
+        public Builder url(String url) {
+            this.url = url;
+            if (useHttps) {
+                addHttps();
+            }
+            builder.url(this.url);
+            return this;
+        }
+
+        @Override
+        public Builder header(String headerName, String headerValue) {
+            builder.header(headerName, headerValue);
+            return this;
+        }
+
+        @Override
+        public Builder content(String requestData, String mediaType) {
+            builder.post(RequestBody.create(MediaType.parse(mediaType), requestData));
+            return this;
+        }
+    }
+
+    private OkHttpClient okHttpClient;
+
+    public OkHttpRequestSender(OkHttpClient okHttpClient) {
+        this.okHttpClient = okHttpClient;
+    }
+
+    @Override
+    public Builder newBuilder() {
+        return new OkBuilder(okHttpClient);
+    }
+}