40fde54e0bThis pull request removes the remaining RxJava code and replaces it with
coroutine-equivalent implementations.
- Remove all duplicate methods in `MastodonApi`:
- Methods returning a RxJava `Single` have been replaced by suspending
methods returning a `NetworkResult` in order to be consistent with the
new code.
- _sync_/_async_ method variants are replaced with the _async_ version
only (suspending method), and `runBlocking{}` is used to make the async
variant synchronous.
- Create a custom coroutine-based implementation of `Single` for usage
in Java code where launching a coroutine is not possible. This class can
be deleted after remaining Java code has been converted to Kotlin.
- `NotificationsFragment.java` can subscribe to `EventHub` events by
calling the new lifecycle-aware `EventHub.subscribe()` method. This
allows using the `SharedFlow` as single source of truth for all events.
- Rx Autodispose is replaced by `lifecycleScope.launch()` which will
automatically cancel the coroutine when the Fragment view/Activity is
destroyed.
- Background work is launched in the existing injectable
`externalScope`, since using `GlobalScope` is discouraged.
`externalScope` has been changed to be a `@Singleton` and to use the
main dispatcher by default.
- Transform `ShareShortcutHelper` to an injectable utility class so it
can use the application `Context` and `externalScope` as provided
dependencies to launch a background coroutine.
- Implement a custom Glide extension method
`RequestBuilder.submitAsync()` to do the same thing as
`RequestBuilder.submit().get()` in a non-blocking way. This way there is
no need to switch to a background dispatcher and block a background
thread, and cancellation is supported out-of-the-box.
- An utility method `Fragment.updateRelativeTimePeriodically()` has been
added to remove duplicate logic in `TimelineFragment` and
`NotificationsFragment`, and the logic is now implemented using a simple
coroutine instead of `Observable.interval()`. Note that the periodic
update now happens between onStart and onStop instead of between
onResume and onPause, since the Fragment is not interactive but is still
visible in the started state.
- Rewrite `BottomSheetActivityTest` using coroutines tests.
- Remove all RxJava library dependencies.
116 lines
4.6 KiB
Prolog
116 lines
4.6 KiB
Prolog
# GENERAL OPTIONS
|
|
|
|
# turn on all optimizations except those that are known to cause problems on Android
|
|
-optimizations !code/simplification/cast,!field/*,!class/merging/*
|
|
-optimizationpasses 6
|
|
-allowaccessmodification
|
|
-dontpreverify
|
|
|
|
-dontusemixedcaseclassnames
|
|
-dontskipnonpubliclibraryclasses
|
|
-keepattributes *Annotation*
|
|
|
|
# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
|
|
-keepclasseswithmembernames class * {
|
|
native <methods>;
|
|
}
|
|
# keep setters in Views so that animations can still work.
|
|
# see http://proguard.sourceforge.net/manual/examples.html#beans
|
|
-keepclassmembers public class * extends android.view.View {
|
|
void set*(***);
|
|
*** get*();
|
|
}
|
|
# We want to keep methods in Activity that could be used in the XML attribute onClick
|
|
-keepclassmembers class * extends android.app.Activity {
|
|
public void *(android.view.View);
|
|
}
|
|
# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
|
|
-keepclassmembers enum * {
|
|
public static **[] values();
|
|
public static ** valueOf(java.lang.String);
|
|
}
|
|
-keepclassmembers class * implements android.os.Parcelable {
|
|
public static final ** CREATOR;
|
|
}
|
|
|
|
-keepclassmembers class **.R$* {
|
|
public static <fields>;
|
|
}
|
|
|
|
# TUSKY SPECIFIC OPTIONS
|
|
|
|
# keep members of our model classes, they are used in json de/serialization
|
|
-keepclassmembers class com.keylesspalace.tusky.entity.* { *; }
|
|
|
|
-keep public enum com.keylesspalace.tusky.entity.*$** {
|
|
**[] $VALUES;
|
|
public *;
|
|
}
|
|
|
|
-keepclassmembers class com.keylesspalace.tusky.components.conversation.ConversationAccountEntity { *; }
|
|
-keepclassmembers class com.keylesspalace.tusky.db.DraftAttachment { *; }
|
|
|
|
-keep enum com.keylesspalace.tusky.db.DraftAttachment$Type {
|
|
public *;
|
|
}
|
|
|
|
# https://github.com/google/gson/blob/master/examples/android-proguard-example/proguard.cfg
|
|
|
|
# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
|
|
# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
|
|
-keep class * extends com.google.gson.TypeAdapter
|
|
-keep class * implements com.google.gson.TypeAdapterFactory
|
|
-keep class * implements com.google.gson.JsonSerializer
|
|
-keep class * implements com.google.gson.JsonDeserializer
|
|
|
|
# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
|
|
-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
|
|
-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
|
|
|
|
# Retain generic signatures of classes used in MastodonApi so Retrofit works
|
|
-keep,allowobfuscation,allowshrinking class retrofit2.Response
|
|
-keep,allowobfuscation,allowshrinking class kotlin.collections.List
|
|
-keep,allowobfuscation,allowshrinking class kotlin.collections.Map
|
|
-keep,allowobfuscation,allowshrinking class retrofit2.Call
|
|
|
|
# https://r8.googlesource.com/r8/+/refs/heads/master/compatibility-faq.md#retrofit
|
|
-keepattributes Signature
|
|
-keep class kotlin.coroutines.Continuation
|
|
|
|
# preserve line numbers for crash reporting
|
|
-keepattributes SourceFile,LineNumberTable
|
|
-renamesourcefileattribute SourceFile
|
|
|
|
# Bouncy Castle -- Keep EC
|
|
-keep class org.bouncycastle.jcajce.provider.asymmetric.EC$* { *; }
|
|
-keep class org.bouncycastle.jcajce.provider.asymmetric.ec.KeyPairGeneratorSpi$EC
|
|
|
|
# remove all logging from production apk
|
|
-assumenosideeffects class android.util.Log {
|
|
public static *** getStackTraceString(...);
|
|
public static *** d(...);
|
|
public static *** w(...);
|
|
public static *** v(...);
|
|
public static *** i(...);
|
|
}
|
|
-assumenosideeffects class java.lang.String {
|
|
public static java.lang.String format(...);
|
|
}
|
|
|
|
# remove some kotlin overhead
|
|
-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
|
|
static void checkNotNull(java.lang.Object);
|
|
static void checkNotNull(java.lang.Object, java.lang.String);
|
|
static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
|
|
static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
|
|
static void checkNotNullParameter(java.lang.Object, java.lang.String);
|
|
static void checkExpressionValueIsNotNull(java.lang.Object, java.lang.String);
|
|
static void checkNotNullExpressionValue(java.lang.Object, java.lang.String);
|
|
static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String);
|
|
static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String, java.lang.String);
|
|
static void throwUninitializedPropertyAccessException(java.lang.String);
|
|
}
|
|
|
|
# Preference fragments can be referenced by name, ensure they remain
|
|
# https://github.com/tuskyapp/Tusky/issues/3161
|
|
-keep class * extends androidx.preference.PreferenceFragmentCompat
|