Merge branch 'master' into snackbar-for-recent-search-deletions

Author: Docile-Alligator

.github/workflows/build.yml

@@ -13,10 +13,10 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v3
 
-    - name: Set-up JDK 11
+    - name: Set-up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
 
     - name: Setup and build with Gradle

.github/workflows/codeql-analysis.yml

@@ -22,6 +22,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Set-up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:

app/build.gradle

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "ml.docilealligator.infinityforreddit"
         minSdk 21
-        targetSdk 33
-        versionCode 163
-        versionName "7.1.0-beta1"
+        targetSdk 34
+        versionCode 179
+        versionName "7.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -50,68 +50,67 @@ android {
     }
 
     buildFeatures {
-        viewBinding true
+        buildConfig = true
+        viewBinding = true
     }
+    namespace 'ml.docilealligator.infinityforreddit'
 }
 
 dependencies {
 /** AndroidX **/
-    implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.biometric:biometric:1.2.0-alpha05'
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation 'androidx.browser:browser:1.8.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    def lifecycleVersion = "2.5.1"
+    implementation 'androidx.activity:activity:1.9.0'
+    def lifecycleVersion = "2.7.0"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-runtime:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycleVersion"
 
-    def pagingVersion = '3.2.0-alpha03'
+    def pagingVersion = '3.3.0'
     implementation "androidx.paging:paging-runtime:$pagingVersion"
     implementation "androidx.paging:paging-guava:$pagingVersion"
-    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    def roomVersion = "2.4.3"
+    implementation 'androidx.preference:preference:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    def roomVersion = "2.6.1"
     implementation "androidx.room:room-runtime:$roomVersion"
     annotationProcessor "androidx.room:room-compiler:$roomVersion"
     implementation "androidx.room:room-guava:$roomVersion"
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
-    implementation 'androidx.work:work-runtime:2.7.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0'
+    implementation 'androidx.work:work-runtime:2.9.0'
+    implementation 'com.google.android.material:material:1.12.0'
 
 /** ExoPlayer **/
-    def exoplayerVersion = "2.18.2"
-    implementation "com.google.android.exoplayer:exoplayer-core:$exoplayerVersion"
-    implementation "com.google.android.exoplayer:exoplayer-dash:$exoplayerVersion"
-    implementation "com.google.android.exoplayer:exoplayer-hls:$exoplayerVersion"
-    implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayerVersion"
-    implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:$exoplayerVersion"
+    def media3_version = "1.4.0-alpha02"
+    implementation "androidx.media3:media3-exoplayer:$media3_version"
+    implementation "androidx.media3:media3-exoplayer-dash:$media3_version"
+    implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
+    implementation "androidx.media3:media3-ui:$media3_version"
+    implementation "androidx.media3:media3-exoplayer-smoothstreaming:$media3_version"
 
 /** Third-party **/
 
 /**** Backend logic ****/
 
     // HTTP clients
-    def retrofitVersion = "2.9.0"
+    def retrofitVersion = '2.11.0'
     implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
     implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
     implementation "com.squareup.retrofit2:adapter-guava:$retrofitVersion"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 
     // Dependency injection
-    def daggerVersion = '2.40.5'
+    def daggerVersion = '2.51.1'
     implementation "com.google.dagger:dagger:$daggerVersion"
     annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
 
     // Binding
-    // NOTE: Deprecated in favor of viewbinding
-    def butterknifeVersion = "10.2.3"
-    implementation "com.jakewharton:butterknife:$butterknifeVersion"
-    annotationProcessor "com.jakewharton:butterknife-compiler:$butterknifeVersion"
-    compileOnly 'com.android.databinding:viewbinding:8.3.1'
+    compileOnly 'com.android.databinding:viewbinding:8.5.1'
 
     // Events
     def eventbusVersion = "3.3.1"
@@ -129,13 +128,13 @@ dependencies {
 
     // Object to JSON
     // NOTE: Replace with Squareup's Moshi?
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.11.0'
 
     // Java library for zip files and streams
-    implementation 'net.lingala.zip4j:zip4j:2.11.2'
+    implementation 'net.lingala.zip4j:zip4j:2.11.5'
 
     // IO functionality
-    implementation 'commons-io:commons-io:2.13.0'
+    implementation 'commons-io:commons-io:2.16.1'
 
     // Crash reporting
     implementation 'com.github.FunkyMuse:Crashy:1.2.0'
@@ -149,7 +148,7 @@ dependencies {
     annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
     implementation 'com.github.santalu:aspect-ratio-imageview:1.0.9'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.28'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.29'
     def bivVersion = "1.8.1"
     implementation "com.github.piasy:BigImageViewer:$bivVersion"
     implementation "com.github.piasy:GlideImageLoader:$bivVersion"
@@ -168,7 +167,7 @@ dependencies {
     implementation 'me.saket:better-link-movement-method:2.2.0'
 
     // Animations
-    implementation 'com.airbnb.android:lottie:4.2.2'
+    implementation 'com.airbnb.android:lottie:6.4.1'
 
     // Loading ProgressBar
     implementation 'com.lsjwzh:materialloadingprogressbar:0.5.8-RELEASE'
@@ -186,7 +185,7 @@ dependencies {
     implementation 'com.nex3z:flow-layout:1.3.3'
 
     // RecyclerView fast scrolling
-    implementation 'me.zhanghai.android.fastscroll:library:1.1.8'
+    implementation 'me.zhanghai.android.fastscroll:library:1.3.0'
 
     implementation 'com.otaliastudios:zoomlayout:1.9.0'
 

app/proguard-rules.pro

@@ -9,8 +9,7 @@
 ## Preferences reflection
 -keep class * extends androidx.preference.PreferenceFragmentCompat
 
--keep class ml.docilealligator.infinityforreddit.settings.FontPreviewFragment { *; }
--keep class ml.docilealligator.infinityforreddit.settings.CrashReportsFragment { *; }
+-keep public class ml.docilealligator.infinityforreddit.settings.**
 
 ## EventBus Rules
 -keepattributes *Annotation*
@@ -66,6 +65,14 @@
 -keep class ml.docilealligator.infinityforreddit.customtheme.CustomTheme { <fields>; }
 -keep class ml.docilealligator.infinityforreddit.multireddit.MultiRedditJSONModel { <fields>; }
 -keep class ml.docilealligator.infinityforreddit.multireddit.SubredditInMultiReddit { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.subscribedsubreddit.SubscribedSubredditData { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.subscribeduser.SubscribedUserData { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.multireddit.MultiReddit { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.multireddit.AnonymousMultiredditSubreddit { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.postfilter.PostFilter { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.postfilter.PostFilterUsage { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.commentfilter.CommentFilter { <fields>; }
+-keep class ml.docilealligator.infinityforreddit.commentfilter.CommentFilterUsage { <fields>; }
 
 # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="ml.docilealligator.infinityforreddit">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <queries>
         <intent>
@@ -24,6 +23,7 @@
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.RUN_USER_INITIATED_JOBS" />
 
     <application
         android:name=".Infinity"
@@ -35,23 +35,43 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="android:label">
+        <activity
+            android:name=".activities.LoginChromeCustomTabActivity"
+            android:label="@string/login_activity_label"
+            android:parentActivityName=".activities.MainActivity"
+            android:theme="@style/AppTheme.Slidable"
+            android:launchMode="singleTop"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="localhost"
+                    android:scheme="infinity" />
+            </intent-filter>
+
+        </activity>
         <activity
             android:name=".activities.CommentFilterUsageListingActivity"
+            android:exported="false"
             android:parentActivityName=".activities.SettingsActivity"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:exported="false" />
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.CustomizeCommentFilterActivity"
+            android:exported="false"
             android:label="@string/customize_comment_filter_activity_label"
             android:parentActivityName=".activities.SettingsActivity"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:exported="false" />
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.CommentFilterPreferenceActivity"
+            android:exported="false"
             android:label="@string/comment_filter_preference_activity_label"
             android:parentActivityName=".activities.SettingsActivity"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:exported="false" />
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.HistoryActivity"
             android:exported="false"
@@ -75,11 +95,6 @@
             android:label="@string/wiki_activity_label"
             android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
-        <activity
-            android:name=".activities.TrendingActivity"
-            android:label="@string/trending_activity_label"
-            android:parentActivityName=".activities.MainActivity"
-            android:theme="@style/AppTheme.Slidable" />
         <activity
             android:name=".activities.PostGalleryActivity"
             android:label="@string/post_gallery_activity_label"
@@ -128,11 +143,6 @@
             android:name=".activities.FetchRandomSubredditOrPostActivity"
             android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".activities.GiveAwardActivity"
-            android:label="@string/give_award_activity_label"
-            android:parentActivityName=".activities.MainActivity"
-            android:theme="@style/AppTheme.Slidable" />
         <activity
             android:name=".activities.SelectUserFlairActivity"
             android:parentActivityName=".activities.MainActivity"
@@ -151,6 +161,7 @@
         <service
             android:name=".services.DownloadMediaService"
             android:enabled="true"
+            android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false" />
 
         <activity
@@ -168,6 +179,7 @@
         <service
             android:name=".services.DownloadRedditVideoService"
             android:enabled="true"
+            android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false" />
 
         <activity
@@ -452,10 +464,12 @@
         <service
             android:name=".services.SubmitPostService"
             android:enabled="true"
+            android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false" />
         <service
             android:name=".services.EditProfileService"
             android:enabled="true"
+            android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false" />
 
         <receiver android:name=".broadcastreceivers.DownloadedMediaDeleteActionBroadcastReceiver" />

app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java

@@ -29,6 +29,7 @@
 import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
 import ml.docilealligator.infinityforreddit.activities.LockScreenActivity;
 import ml.docilealligator.infinityforreddit.activities.LoginActivity;
+import ml.docilealligator.infinityforreddit.activities.LoginChromeCustomTabActivity;
 import ml.docilealligator.infinityforreddit.activities.MainActivity;
 import ml.docilealligator.infinityforreddit.activities.MultiredditSelectionActivity;
 import ml.docilealligator.infinityforreddit.activities.PostFilterPreferenceActivity;
@@ -54,7 +55,6 @@
 import ml.docilealligator.infinityforreddit.activities.SubredditSelectionActivity;
 import ml.docilealligator.infinityforreddit.activities.SubscribedThingListingActivity;
 import ml.docilealligator.infinityforreddit.activities.SuicidePreventionActivity;
-import ml.docilealligator.infinityforreddit.activities.TrendingActivity;
 import ml.docilealligator.infinityforreddit.activities.ViewImageOrGifActivity;
 import ml.docilealligator.infinityforreddit.activities.ViewImgurMediaActivity;
 import ml.docilealligator.infinityforreddit.activities.ViewMultiRedditDetailActivity;
@@ -69,6 +69,7 @@
 import ml.docilealligator.infinityforreddit.bottomsheetfragments.AccountChooserBottomSheetFragment;
 import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomSheetFragment;
 import ml.docilealligator.infinityforreddit.fragments.CommentsListingFragment;
+import ml.docilealligator.infinityforreddit.fragments.CustomThemeListingFragment;
 import ml.docilealligator.infinityforreddit.fragments.FollowedUsersListingFragment;
 import ml.docilealligator.infinityforreddit.fragments.HistoryPostFragment;
 import ml.docilealligator.infinityforreddit.fragments.InboxFragment;
@@ -281,8 +282,6 @@ public interface AppComponent {
 
     void inject(PostGalleryActivity postGalleryActivity);
 
-    void inject(TrendingActivity trendingActivity);
-
     void inject(WikiActivity wikiActivity);
 
     void inject(Infinity infinity);
@@ -313,6 +312,10 @@ public interface AppComponent {
 
     void inject(CommentFilterUsageListingActivity commentFilterUsageListingActivity);
 
+    void inject(CustomThemeListingFragment customThemeListingFragment);
+
+    void inject(LoginChromeCustomTabActivity loginChromeCustomTabActivity);
+
     @Component.Factory
     interface Factory {
         AppComponent create(@BindsInstance Application application);