diff --git a/app/build.gradle b/app/build.gradle index 139ca936c..3002ee0f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ final def APP_NAME = "Chinwag Social" // The application id. Must be unique, e.g. based on your domain final def APP_ID = "org.chinwag.socialapp" // url of a custom app logo. Recommended size at least 600x600. Keep empty to use the Tusky elephant friend. -final def CUSTOM_LOGO_URL = "" +final def CUSTOM_LOGO_URL = "https://static.chinwag.net.au/chinwag-logo-simple.svg" // e.g. mastodon.social. Keep empty to not suggest any instance on the signup screen final def CUSTOM_INSTANCE = "chinwag.org" // link to your support account. Will be linked on the about page when not empty. @@ -30,8 +30,8 @@ android { applicationId APP_ID namespace "com.keylesspalace.tusky" minSdk 24 - targetSdk 34 - versionCode 121 + targetSdk 35 + versionCode 93 versionName "25.2-CW0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -98,6 +98,12 @@ android { androidTest.assets.srcDirs += files("$projectDir/schemas".toString()) } + packagingOptions { + jniLibs { + useLegacyPackaging true + } + } + // Exclude unneeded files added by libraries packagingOptions.resources.excludes += [ 'LICENSE_OFL', diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java index 179464543..08d702d5e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java @@ -544,12 +544,12 @@ public class NotificationsAdapter extends RecyclerView.Adapter