diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 108d46d..3568e56 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -19,8 +19,8 @@ -keepattributes Signature -keepattributes InnerClasses -dontwarn ch.qos.logback.core.net.** --assumenosideeffects class ch.qos.logback.** { *; } --assumenosideeffects class org.slf4j.** { *; } +# -assumenosideeffects class ch.qos.logback.** { *; } +# -assumenosideeffects class org.slf4j.** { *; } -keep class com.crashlytics.** { *; } -dontwarn com.crashlytics.** -dontwarn retrofit2.** @@ -40,4 +40,55 @@ # Only required if you use AsyncExecutor -keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent { (java.lang.Throwable); -} \ No newline at end of file +} + +# Retrofit 1.X + +-keep class com.squareup.okhttp.** { *; } +-keep class retrofit.** { *; } +-keep interface com.squareup.okhttp.** { *; } + +-dontwarn com.squareup.okhttp.** +-dontwarn okio.** +-dontwarn retrofit.** +-dontwarn rx.** + +-keepclasseswithmembers class * { + @retrofit.http.* ; +} + +# If in your rest service interface you use methods with Callback argument. +-keepattributes Exceptions + +# If your rest service methods throw custom exceptions, because you've defined an ErrorHandler. +-keepattributes Signature + +# Also you must note that if you are using GSON for conversion from JSON to POJO representation, you must ignore those POJO classes from being obfuscated. +# Here include the POJO's that have you have created for mapping JSON response to POJO for example. + +-keep class com.google.gson.** { *; } +-keep class com.google.inject.** { *; } +-keep class org.apache.http.** { *; } +-keep class org.apache.james.mime4j.** { *; } +-keep class javax.inject.** { *; } +-keep class retrofit.** { *; } + +-keep class ch.qos.logback.** { *; } +-keep class org.slf4j.** { *; } + +# Proguard rules for retrofit + +# Platform calls Class.forName on types which do not exist on Android to determine platform. +-dontnote retrofit2.Platform +# Platform used when running on RoboVM on iOS. Will not be used at runtime. +-dontnote retrofit2.Platform$IOS$MainThreadExecutor +# Platform used when running on Java 8 VMs. Will not be used at runtime. +-dontwarn retrofit2.Platform$Java8 +# Retain generic type information for use by reflection by converters and adapters. +-keepattributes Signature +# Retain declared checked exceptions for use by a Proxy instance. +-keepattributes Exceptions + +-keep class java.nio.file.** { *; } +-keep class retrofit2.** { *; } +-keep class okio.** { *; } \ No newline at end of file diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java index 780b909..8bdd10f 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java @@ -54,7 +54,14 @@ public class GooglePlacesWorker extends AsyncTask; +} + +# If in your rest service interface you use methods with Callback argument. +-keepattributes Exceptions + +# If your rest service methods throw custom exceptions, because you've defined an ErrorHandler. +-keepattributes Signature + +# Also you must note that if you are using GSON for conversion from JSON to POJO representation, you must ignore those POJO classes from being obfuscated. +# Here include the POJO's that have you have created for mapping JSON response to POJO for example. + +-keep class com.google.gson.** { *; } +-keep class com.google.inject.** { *; } +-keep class org.apache.http.** { *; } +-keep class org.apache.james.mime4j.** { *; } +-keep class javax.inject.** { *; } +-keep class retrofit.** { *; } + +-keep class ch.qos.logback.** { *; } +-keep class org.slf4j.** { *; } + # Proguard rules for retrofit # Platform calls Class.forName on types which do not exist on Android to determine platform. @@ -28,6 +63,7 @@ -keepattributes Signature # Retain declared checked exceptions for use by a Proxy instance. -keepattributes Exceptions + -keep class java.nio.file.** { *; } -keep class retrofit2.** { *; } -keep class okio.** { *; } \ No newline at end of file diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/CustomConverter.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/CustomConverter.java new file mode 100644 index 0000000..dea8898 --- /dev/null +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/CustomConverter.java @@ -0,0 +1,14 @@ +package pl.tpolgrabia.googleutils.utils; + +import retrofit2.Converter; +import retrofit2.Retrofit; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + +/** + * Created by tpolgrabia on 09.10.16. + */ +public class CustomConverter extends Converter.Factory { + +} diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java index 43e5d0f..88d3cf5 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java @@ -2,10 +2,7 @@ package pl.tpolgrabia.googleutils.utils; import android.content.Context; import com.androidquery.AQuery; -import okhttp3.Interceptor; import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.logging.HttpLoggingInterceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.tpolgrabia.googleutils.GooglePlacesService; @@ -53,7 +50,7 @@ public class PlacesUtils { } OkHttpClient.Builder httpClient = new OkHttpClient.Builder(); - // httpClient.addInterceptor(new RetrofitDebugInterceptor()); + httpClient.addInterceptor(new RetrofitDebugInterceptor()); Retrofit retrofit = new Retrofit.Builder() .baseUrl(GooglePlacesConstants.GOOGLE_MAPS_PLACES_API_BASEURL) @@ -74,22 +71,4 @@ public class PlacesUtils { } - private static class RetrofitDebugInterceptor implements Interceptor { - @Override - public okhttp3.Response intercept(Chain chain) throws IOException { - final Request req = chain.request(); - okhttp3.Response response = chain.proceed(req); - boolean successFull = response.isSuccessful(); - int code = response.code(); - String message = response.message(); - String msg = response.body().string(); - lg.debug("Got response. Is successfull: {}, code: {}, message: {}, msg: {}", - successFull, - code, - message, - msg); - // now we repeat once again (because we have used the stream) - return chain.proceed(chain.request()); - } - } } diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/RetrofitDebugInterceptor.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/RetrofitDebugInterceptor.java new file mode 100644 index 0000000..50bd6db --- /dev/null +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/RetrofitDebugInterceptor.java @@ -0,0 +1,37 @@ +package pl.tpolgrabia.googleutils.utils; + +import android.util.Log; +import okhttp3.Interceptor; +import okhttp3.Request; +import okhttp3.ResponseBody; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; + +/** + * Created by tpolgrabia on 09.10.16. + */ +class RetrofitDebugInterceptor implements Interceptor { + + private static final Logger lg = LoggerFactory.getLogger(RetrofitDebugInterceptor.class); + + @Override + public okhttp3.Response intercept(Chain chain) throws IOException { + final Request req = chain.request(); + okhttp3.Response response = chain.proceed(req); + boolean successFull = response.isSuccessful(); + int code = response.code(); + String message = response.message(); + String msg = response.body().string(); + Log.d("XXX", String.format("Got response. Is successfull: %d, code: %d, message: %s, msg: %s", + successFull ? 1 : 0, + code, + message, + msg)); + // now we repeat once again (because we have used the stream) + return response.newBuilder() + .body(ResponseBody.create(response.body().contentType(), msg)) + .build(); + } +}