diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/annotation/NoObfuscate.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/annotation/NoObfuscate.java deleted file mode 100644 index 90dec269e..000000000 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/annotation/NoObfuscate.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright 2012-2017 Mariotaku Lee - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.mariotaku.microblog.library.annotation; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -/** - * Created by mariotaku on 16/4/4. - */ -@Retention(RetentionPolicy.CLASS) -public @interface NoObfuscate { -} diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList$$JsonObjectMapper.java index 193e5379a..09b7c6992 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList$$JsonObjectMapper.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/LinkHeaderList$$JsonObjectMapper.java @@ -18,6 +18,8 @@ package org.mariotaku.microblog.library.mastodon.model; +import android.support.annotation.Keep; + import com.bluelinelabs.logansquare.JsonMapper; import com.bluelinelabs.logansquare.LoganSquare; import com.bluelinelabs.logansquare.ParameterizedType; @@ -26,12 +28,10 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import org.mariotaku.microblog.library.annotation.NoObfuscate; - import java.io.IOException; @SuppressWarnings("unused") -@NoObfuscate +@Keep public final class LinkHeaderList$$JsonObjectMapper extends JsonMapper> { private final JsonMapper m69ClassJsonMapper; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java index d596ac301..95c9b4292 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java @@ -18,13 +18,13 @@ package org.mariotaku.microblog.library.twitter.model; +import android.support.annotation.Keep; + import com.bluelinelabs.logansquare.JsonMapper; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import org.mariotaku.microblog.library.annotation.NoObfuscate; - import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -34,7 +34,7 @@ import java.util.List; * Created by mariotaku on 15/10/21. */ @SuppressWarnings("unused") -@NoObfuscate +@Keep public class IDs$$JsonObjectMapper extends JsonMapper { @SuppressWarnings("TryWithIdenticalCatches") diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java index 114b3e453..dedf3dd40 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs.java @@ -20,6 +20,7 @@ package org.mariotaku.microblog.library.twitter.model; import android.os.Parcel; import android.os.Parcelable; +import android.support.annotation.Keep; import com.bluelinelabs.logansquare.JsonMapper; import com.bluelinelabs.logansquare.LoganSquare; @@ -28,15 +29,13 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; -import org.mariotaku.microblog.library.annotation.NoObfuscate; - import java.io.IOException; /** * Created by mariotaku on 15/5/10. */ @ParcelablePlease -@NoObfuscate +@Keep public class IDs extends TwitterResponseObject implements TwitterResponse, CursorSupport, Parcelable { long previousCursor; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java index 284da7d1b..12ce7a0b9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList$$JsonObjectMapper.java @@ -18,6 +18,8 @@ package org.mariotaku.microblog.library.twitter.model; +import android.support.annotation.Keep; + import com.bluelinelabs.logansquare.JsonMapper; import com.bluelinelabs.logansquare.LoganSquare; import com.bluelinelabs.logansquare.ParameterizedType; @@ -26,12 +28,10 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import org.mariotaku.microblog.library.annotation.NoObfuscate; - import java.io.IOException; @SuppressWarnings("unused") -@NoObfuscate +@Keep public final class PageableResponseList$$JsonObjectMapper extends JsonMapper> { private final JsonMapper m84ClassJsonMapper; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java index 628ed4ded..784f28e2c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/PageableResponseList.java @@ -18,13 +18,13 @@ package org.mariotaku.microblog.library.twitter.model; -import org.mariotaku.microblog.library.annotation.NoObfuscate; +import android.support.annotation.Keep; /** * Response list supports cursor pagination * Created by mariotaku on 15/5/7. */ -@NoObfuscate +@Keep public class PageableResponseList extends ResponseList implements TwitterResponse, CursorSupport { long previousCursor; diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList.java index 060158987..32215988c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList.java @@ -18,7 +18,8 @@ package org.mariotaku.microblog.library.twitter.model; -import org.mariotaku.microblog.library.annotation.NoObfuscate; +import android.support.annotation.Keep; + import org.mariotaku.microblog.library.twitter.util.InternalParseUtil; import org.mariotaku.restfu.http.HttpResponse; @@ -29,7 +30,7 @@ import java.util.List; * Response list * Created by mariotaku on 15/5/7. */ -@NoObfuscate +@Keep public class ResponseList extends ArrayList implements TwitterResponse { private int accessLevel; diff --git a/twidere/proguard-rules.pro b/twidere/proguard-rules.pro index feffe0c77..375785622 100644 --- a/twidere/proguard-rules.pro +++ b/twidere/proguard-rules.pro @@ -48,9 +48,6 @@ -keep class * extends com.bluelinelabs.logansquare.JsonMapper -keep @com.bluelinelabs.logansquare.annotation.JsonObject class * --keep class org.mariotaku.twidere.api.twitter.annotation.NoObfuscate --keep @org.mariotaku.twidere.api.twitter.annotation.NoObfuscate class * - # https://github.com/mariotaku/RestFu -keep class org.mariotaku.restfu.annotation.** { *; } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/AppBarChildBehavior.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/AppBarChildBehavior.kt index df1ea454c..445c63368 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/AppBarChildBehavior.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/AppBarChildBehavior.kt @@ -22,6 +22,7 @@ package org.mariotaku.twidere.util.view import android.content.Context import android.content.res.TypedArray import android.graphics.Rect +import android.support.annotation.Keep import android.support.annotation.StyleableRes import android.support.design.widget.AppBarLayout import android.support.design.widget.CoordinatorLayout @@ -30,7 +31,6 @@ import android.util.AttributeSet import android.util.TypedValue import android.view.View import android.widget.TextView -import org.mariotaku.microblog.library.annotation.NoObfuscate import org.mariotaku.twidere.R import org.mariotaku.twidere.extension.* @@ -278,7 +278,7 @@ class AppBarChildBehavior( } - @NoObfuscate + @Keep open class TextViewTransformation : ChildTransformation { private var sourceSize: Float = Float.NaN