mirror of
https://github.com/pachli/pachli-android.git
synced 2025-01-24 14:11:56 +01:00
710e209e34
Continue the work to remove the "activeAccount" idiom. - Uses a new PachliAccount type through most of the app. This holds information that was previously accessed separately (e.g., content filters, lists) in one place. The information is loaded when the app launches or the active account switches. - Fetching data when the account is switched / loaded simplifies error handling, as more code can now assume the data has already been loaded. If it hasn't the code path is simply unreachable. - This opens up the possibility of "acting as one account while logged in as another". E.g., have two accounts, and be logged in to one account and boost a post you've seen from your other account. - Add a database migration to populate existing accounts with default data when the user updates the app. - Refactor code that used those list and filter repositories to get the data from the PachliAccount instead. New local and remote data sources are implemented, and the list and filter repositories mediate between those sources. - Start a ViewModel for MainActivity, which includes: - Sending user actions as UiAction objects - Providing a flow of uiState for MainActivity to react to - Remove most uses of SharedPreferencesRepository from MainActivity - Show messages about errors that occur when logging in - Refactor intent routing in MainActivity to make the logic clearer. - Add new `core.data` types to push more `core.network` types out of the UI code - `core.data.model.MastodonList` for `core.network.model.MastoList` - `core.data.model.Server` for `core.network.model.Server` - Continue the work to send the Pachli account ID to the code that uses it. - Most view models now get the account ID via assisted injection. - QueuedMedia now includes the AccountEntity so it can operate with any account. Modify the `uploadMedia` API call to include explicit authentication details. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
109 lines
4.1 KiB
Prolog
109 lines
4.1 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
|
|
|
|
-dontusemixedcaseclassnames
|
|
-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>;
|
|
}
|
|
|
|
# Pachli specific options
|
|
|
|
# keep members of our model classes, they are used in json de/serialization
|
|
-keepclassmembers class app.pachli.core.network.model.** { *; }
|
|
-keepclassmembers class app.pachli.core.model.** { *; }
|
|
|
|
-keep public enum app.pachli.core.network.model.*$** {
|
|
**[] $VALUES;
|
|
public *;
|
|
}
|
|
|
|
-keepclassmembers class app.pachli.core.database.model.ConversationAccountEntity { *; }
|
|
-keepclassmembers class app.pachli.core.database.model.DraftAttachment { *; }
|
|
-keep class app.pachli.core.model.TimelineJsonAdapter { *; }
|
|
|
|
-keep enum app.pachli.core.database.model.DraftAttachment$Type {
|
|
public *;
|
|
}
|
|
|
|
# Keep class names. Obfuscating them serves no purpose in an open source
|
|
# project and adds an additional step to de-obfuscate them when managing user
|
|
# error reports
|
|
-keepnames class *
|
|
|
|
# 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
|