From 95abafa49d4c378763c1fd030ef2b99c55fe4b0a Mon Sep 17 00:00:00 2001 From: Alain Pimentel Date: Wed, 4 Apr 2018 17:36:19 -0700 Subject: [PATCH] Passing remote logger url with BuildConfig --- android-wsbridge/app/build.gradle | 13 ++++++++++++- .../main/java/com/dji/wsbridge/lib/DJILogger.java | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/android-wsbridge/app/build.gradle b/android-wsbridge/app/build.gradle index a4d5ea0..fd930ba 100644 --- a/android-wsbridge/app/build.gradle +++ b/android-wsbridge/app/build.gradle @@ -25,12 +25,16 @@ android { versionCode 1 versionName "1.2.4" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + buildConfigField "String", "REMOTE_LOGGER_URL", getRemoteLoggerURL() } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + all { + buildConfigField "String", "REMOTE_LOGGER_URL", "\"your_url_goes_here.com\"" + } } } @@ -51,6 +55,13 @@ dependencies { releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' debugCompile 'com.github.markzhai:blockcanary-android:1.5.0' releaseCompile 'com.github.markzhai:blockcanary-no-op:1.5.0' +} - +/** + * + * @return return the entered value if there is any, if not empty string + */ +def getRemoteLoggerURL() { + def value = project.getProperties().get("remoteLoggerURL") + return value != null ? "\"" + value + "\"" : "\"\"" } diff --git a/android-wsbridge/app/src/main/java/com/dji/wsbridge/lib/DJILogger.java b/android-wsbridge/app/src/main/java/com/dji/wsbridge/lib/DJILogger.java index daf4b0b..cc57897 100644 --- a/android-wsbridge/app/src/main/java/com/dji/wsbridge/lib/DJILogger.java +++ b/android-wsbridge/app/src/main/java/com/dji/wsbridge/lib/DJILogger.java @@ -9,6 +9,7 @@ import com.androidnetworking.error.ANError; import com.androidnetworking.interfaces.OkHttpResponseListener; import com.crashlytics.android.Crashlytics; +import com.dji.wsbridge.BuildConfig; import org.json.JSONException; import org.json.JSONObject; @@ -32,7 +33,7 @@ public class DJILogger extends Thread { public static final int CONNECTION_BRIDGE = 2; private static final String TAG = "RemoteLogger"; // Add your remote server IP - private static final String REMOTE_LOGGER_URL = "your_url_goes_here.com"; + private static final String REMOTE_LOGGER_URL = BuildConfig.REMOTE_LOGGER_URL; private final static char[] hexArray = "0123456789ABCDEF".toCharArray(); private static DJILogger instance = new DJILogger(); private String serverURL;