Merge pull request #175 from Pocket/beta

8.32.1 Production

Author: marcin-kozinski

.java-version

@@ -1 +1 @@
-17
+21

CREDITS.md

@@ -9,7 +9,7 @@ Many thanks for your contributions and the years spent working together!
 * Mike Herbig
 * John Oberhauser
 * Devota Aabel
-* Daniel Brooks
+* [@bassrock](https://github.com/bassrock)
 * Tim Choh
 * Thomas Ezan
 * James Yopp

Pocket/build.gradle.kts

@@ -15,8 +15,8 @@ plugins {
 }
 
 val versionMajor = 8 // Max value of 200
-val versionMinor = 31 // Max of two digits
-val versionPatch = 0 // Max of two digits
+val versionMinor = 32 // Max of two digits
+val versionPatch = 1 // Max of two digits
 val versionBuild = 0 // Max of three digits
 
 // See usage and more details below, but this produces version numbers like 6.2.4.1 and codes like 60204001
@@ -63,30 +63,15 @@ android {
         versionName = "$versionMajor.$versionMinor.$versionPatch.$versionBuild"
 
         vectorDrawables.useSupportLibrary = true // https://medium.com/@chrisbanes/appcompat-v23-2-age-of-the-vectors-91cbafa87c88#.m9i38hx27
-        resourceConfigurations.addAll(
-            arrayOf(
-                "de",
-                "es",
-                "es-rES",
-                "fr",
-                "fr-rCA",
-                "it",
-                "ja",
-                "ko",
-                "nl",
-                "pl",
-                "pt",
-                "pt-rBR",
-                "ru",
-                "zh",
-                "zh-rCN",
-                "zh-rTW"
-            )
-        )
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    androidResources {
+        localeFilters += listOf("de", "es", "es-rES", "fr", "fr-rCA", "it", "ja", "ko", "nl", "pl", "pt", "pt-rBR", "ru", "zh", "zh-rCN", "zh-rTW")
+        generateLocaleConfig = true
+    }
+
     flavorDimensions.add(FlavorDimensions.TARGET)
     productFlavors {
         // Development
@@ -346,4 +331,12 @@ dependencies {
     implementation(libs.sentry.okhttp)
 }
 
+kapt {
+    arguments {
+        arg("dagger.fastInit", "enabled")
+        arg("dagger.useBindingGraphFix", "ENABLED")
+        arg("dagger.ignoreProvisionKeyWildcards", "ENABLED")
+    }
+}
+
 registerCopyMergedManifestTask()

Pocket/merged_manifests/playUnsignedRelease/AndroidManifest.xml

@@ -3,8 +3,8 @@
     package="com.ideashower.readitlater.pro"
     android:installLocation="auto"
     android:targetSandboxVersion="2"
-    android:versionCode="83100000"
-    android:versionName="8.31.0.0" >
+    android:versionCode="83201000"
+    android:versionName="8.32.1.0" >
 
     <uses-sdk
         android:minSdkVersion="23"
@@ -84,7 +84,7 @@
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/nm_icon"
-        android:localeConfig="@xml/locale_config"
+        android:localeConfig="@xml/_generated_res_locale_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/Theme.PocketDefault" >
 

Pocket/src/main/AndroidManifest.xml

@@ -57,7 +57,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/nm_icon"
         android:theme="@style/Theme.PocketDefault"
-        android:localeConfig="@xml/locale_config"
         android:networkSecurityConfig="@xml/network_security_config">
 
         <!-- Declaring support for larger aspect ratios than the default 1.86 (including Galaxy S8). see https://android-developers.googleblog.com/2017/03/update-your-app-to-take-advantage-of.html -->

Pocket/src/main/java/com/pocket/app/App.java

@@ -185,7 +185,7 @@ public void onCreate() {
 						"Help with Pocket",
 						message,
 						true, true,
-						new ErrorReport(t),
+						new ErrorReport(t, message),
 						null));
 
 		// Note: Recompile and Reverse Engineer Detection is currently hidden in Assets.start():
@@ -276,9 +276,9 @@ public static App from(Context context) {
 	/**
 	 * Convenience method for getting a string resource.
 	 * 
-	 * @param id
 	 * @deprecated access from a context you get in a constructor or parameter, avoid static access
 	 */
+	@Deprecated
 	public static String getStringResource(int id) {
 		if (id == 0) {
 			return null;

Pocket/src/main/java/com/pocket/app/home/Home.kt

@@ -19,7 +19,7 @@ class Home {
             corpusRecommendationId: String?,
         )
         fun onSeeAllRecommendationsClicked(
-            slateId: String,
+            index: Int,
             slateTitle: String
         )
         fun onSaveClicked(url: String, isSaved: Boolean, corpusRecommendationId: String?)
@@ -70,7 +70,7 @@ class Home {
         data object GoToMyList : Event()
 
         data class GoToSlateDetails(
-            val slateId: String,
+            val index: Int,
         ) : Event()
 
         data class GoToTopicDetails(

Pocket/src/main/java/com/pocket/app/home/HomeFragment.kt

@@ -143,7 +143,7 @@ class HomeFragment : AbsPocketFragment() {
             }
             is Home.Event.GoToSlateDetails -> {
                 findNavController().navigateSafely(
-                    HomeFragmentDirections.goToSlateDetails(event.slateId)
+                    HomeFragmentDirections.goToSlateDetails(event.index)
                 )
             }
             is Home.Event.GoToTopicDetails -> {

Pocket/src/main/java/com/pocket/app/home/HomeViewModel.kt

@@ -202,7 +202,6 @@ class HomeViewModel @Inject constructor(
                     // Report and filter out.
                     errorHandler.reportOnProductionOrThrow(RuntimeException(
                         "Slate is empty: " + listOf(
-                            "id = ${slate.id}",
                             "title = ${slate.title}",
                             "locale = $localeString",
                         )
@@ -287,9 +286,9 @@ class HomeViewModel @Inject constructor(
         )
     }
 
-    override fun onSeeAllRecommendationsClicked(slateId: String, slateTitle: String) {
+    override fun onSeeAllRecommendationsClicked(index: Int, slateTitle: String) {
         tracker.track(HomeEvents.slateSeeAllClicked(slateTitle = slateTitle))
-        _events.tryEmit(Home.Event.GoToSlateDetails(slateId))
+        _events.tryEmit(Home.Event.GoToSlateDetails(index))
     }
 
     override fun onTopicClicked(topicId: String, topicTitle: String) {
@@ -380,10 +379,7 @@ class HomeViewModel @Inject constructor(
         val title: String?,
         val subheadline: String?,
         val recommendations: List<RecommendationUiState>,
-    ) {
-        // Exclude slate id from `.equals()` etc., because it's not stable.
-        lateinit var slateId: String
-    }
+    )
 
     private fun DomainSlate.toRecommendationSlateUiState(
         stringLoader: StringLoader,
@@ -394,9 +390,7 @@ class HomeViewModel @Inject constructor(
         recommendations = recommendations
             .map { it.toRecommendationUiState(stringLoader) }
             .take(recommendationsPerSlate)
-    ).apply {
-        slateId = id
-    }
+    )
 
 
     data class TopicUiState(

Pocket/src/main/java/com/pocket/app/home/details/slates/SlateDetailsFragment.kt

@@ -39,7 +39,7 @@ class SlateDetailsFragment : DetailsFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel.onInitialized(args.slateId)
+        viewModel.onInitialized(args.index)
     }
 
     override fun goToReader(event: DetailsViewModel.Event.GoToReader) {