From a85c32cbdfbf5f4b48688f699f2838933a599d8c Mon Sep 17 00:00:00 2001 From: Ben Henning Date: Wed, 6 Oct 2021 23:23:17 -0700 Subject: [PATCH] Fix #3810: Fix splash screen freeze on Android 11 (#3866) * Add support for AABs, build flavors, and proguard. There are a lot of details to cover here--see the PR for the complete context. * Lint & codeowner fixes. * Fix failures. - Add missing codeowner - Add support for configuring base branch reference - Update CI for dev/alpha AAB builds to use 'develop' since there's no origin configured by default in the workflows * Different attempt to fix bad develop reference in CI. * Initial commit. This is needed to open a PR on GitHub. This commit is being made so that the PR can start off in a broken Actions state. This also initially disables most non-Bazel workflows to make workflow iteration faster and less impacting on other team members. * Introduce infrastructure for batching. This introduces a new mechanism for passing lists of tests to sharded test targets in CI, and hooks it up. No actual sharding is occurring yet. This led to some simplifications in the CI workflow since the script can be more dynamic in computing the full list of targets (which also works around a previous bug with instrumentation tests being run). Java proto lite also needed to be upgraded for the scripts to be able to use it. More testing/documentation needed as this functionality continues to expand. * Add bucketing strategy. This simply partitions bucketed groups of targets into chunks of 10 for each run. Only 3 buckets are currently retained to test sharding in CI before introducing full support. * Fix caching & stabilize builds. Fixes some caching bucket and output bugs. Also, introduces while loop & keep_going to introduce resilience against app test build failures (or just test failures in general). * Increase sharding & add randomization. Also, enable other workflows. Note that CI shouldn't fully pass yet since some documentation and testing needs to be added yet, but this is meant to be a more realistic test of the CI environment before the PR is finished. * Improving partitionin & readability. Adds a human-readable prefix to make the shards look a bit nicer. Also, adds more fine-tuned partitioning to bucket & reduce shard counts to improve overall timing. Will need to be tested in CI. * Add new tests & fix static analysis errors. * Fix script. A newly computed variable wasn't updated to be used in an earlier change. * Fix broken tests & test configuration. Add docstrings for proto. * Fix mistake from earlier commit. * Try 10 max parallel actions instead. See https://github.com/oppia/oppia-android/pull/3757#issuecomment-911460981 for context. * Fix another error from an earlier commit. * Localisation updates from https://translatewiki.net. * Fix mv command so it works on Linux & OSX. Neither 'mv -t' nor piping to mv work on OSX so we needed to find an alternative (in this case just trying to move everything). This actually works a bit better since it's doing a per-file move rather than accommodating for files that shouldn't be moved (which isn't an issue since the destination directory is different than the one containing the AAB file). * Introduce initial domain layer for translations. Documentation, thorough tests, and detailed description of these changes are still needed. * Initial app layer implementation for translations. This demonstrates working string selection for system-based and overwritten app languages, including necessary activity recreation & layout direction overwriting. This also includes a bunch of Dagger infra refactoring so that some app layer packages can now be modularized (including the new packages). * Domain changes needed per downstream UI changes. * Add patterns & fixes. This involves MANY broad changes to ensure consistent string retrieval (for arrays and plurals), formatting, and string transformations throughout the codebase. Some extra patterns to added to fix things that were needed, and a few issues were fixed along the way. * Add needed domain changes for downstream branch. Also includes fixing circular dependency issue by splitting out some of the locale components to be part of utility rather than domain (so that utiltiy and other packages can depend on MachineLocale). * Introduce support for content localization. This includes a bunch of stuff that'll be described in more detail in the PR description, but it essentially: - Adds support for displaying content in explorations, questions, concept cards, and revision cards in a non-English language - Adds support for submitting non-English answers - Updates test structures to validate everything exception questions is working for localization * Fix structures to work with parsing assumptions. * Fix regex checks for translated strings. Also, performance improvements for the regex check. * Lint-ish fix. * Fix failing regex checks. * Add check for nested res subdirectories. * Add remaining regex patterns & fixes. * Clean up locale infra. Add some other needed functionality. * Attempt to delete strings to force history. * Gate options behind compile-time flag. Flag status is off by default until #52 is finished. * Proguard fixes for Glide. Update version code since 6 & 7 were shipped. * Make AAB builds/runs manual-only targets. * Fix broken tests. * Fix lint issues & add KDocs. Also, abstract ContentLocale for consistency & to disallow direct construction. * Add 6/11 test suites (& placeholders for other 4). Silence one file missing a test suite (since it doesn't need one). Also, some tweaks to the language support definitions. * Add more test suites for domain layers. Included introducing a new general purpose utility for testing data providers + its own test suite. * Introduce wrapper & fake for bidi wrapping. Also, add test version of AssetRepository. Add new placeholder tests & update all tests project-wide to make sure that they build. * Add remaining tests. Included some shadow refactoring, and introducing new test-only resources. * Fix Gradle builds. * Lint fixes. * Resolve remaining incomplete TODOs. * Add new codeowners. * Post-merge fixes. Make all non-app layer targets build (haven't run tests yet). Audited existing bidi wrapping cases & converted strings over to being %s-only. * Fix most test targets (builds). All non-app tests confirmed as passing. * Fix all remaining test builds. Introduce new TestActivity for scaffolding all non-activity tests. * Fix all app layer tests. Add fixes for question player & old answer displaying. Add fix for guaranteed crash on startup after some changes between now & the first build of MR3 (dueu to extra updates in SplashActivityPresenter). * Fix questions & profile issues. * Type specifier pattern & fixes. Address temporary TODO by removing kdoc. * Add missing KDocs. * Boilerplate & TODOs for needed tests. * Add new needed test dep. Required an update to truth proto lite import (due to an incompatible update in the common Truth dep). * Add needed testing coverage. Other miscellaneous fixes needed to support new tests. * Two fixes. 1. Introduce proper API compatibility for LocaleController 2. Ensure TranslationController is scoped (breaks test in downstream PR) * Fix Gradle builds on branch. * Resolve nearly all pending TODOs. Only remainder is a test suite whose tests need to be migrated. * Lint fixes. * Re-add method removed from merge. * Lint fixes. This also fixes broken extra/unused imports from the merge. Verified that the dev build works as of this commit. Haven't verified anything else. * Fix compute affected tests script. Adds support for very large PR changesets. * Fix failures found on CI. * Fix remaining Gradle failures found in CI. * Fix existing domain + app layer tests. Some reworking was needed in QuestionAssessmentProgressControllerTest. * Post-merge fix. * Gradle Espresso test fix. * Add missing KDocs, remove extra file, and other cleanups. * Lint fixes. * Fix CI & lint checks (except regex). * Deflake DataProviderTestMonitorTest. * Address reviewer comments. * Lint fixes. * Fix affected tests from earlier changes. These failures were found from CI test workflows. * Fix remaining Gradle failures. This introduces a proper fallback mechanism for content strings that allows Gradle builds & tests to work properly, and adds more robustness in case misconfigurations actually happen. * Add placeholders for new needed tests. * Fix broken tests. This came from the earlier commit's fix--the suite hadn't been updated. * Add needed tests for new behaviors. * Fix Gradle build & mechanism change failures. * Lint fixes. * Undo inadvertent change to Gradle jvmargs. * Disable most tests on Espresso. * Test fixes + make monitor Espresso-compatible. * Fix broken tests. Refactor how platform parameter module. Add new options fragment tests. * Add exemptions & regex check tests. * Lint fixes. * Lint fixes. * Add new ratio input rule classifier. * Fix broken tests (per CI). * Add mechanism to recover from crashes. * Remove malformed TODO. * Add Proguard rules needed to fix splash issue. See PR & related issue for more context. * Update LocaleController.kt Remove TODO on #3800 since it's been resolved. Co-authored-by: translatewiki.net --- config/proguard/androidx-proguard-rules.pro | 14 ++++++++++++++ .../android/domain/locale/LocaleController.kt | 2 -- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/config/proguard/androidx-proguard-rules.pro b/config/proguard/androidx-proguard-rules.pro index 2a4f1c64760..1eaab2b2c54 100644 --- a/config/proguard/androidx-proguard-rules.pro +++ b/config/proguard/androidx-proguard-rules.pro @@ -39,3 +39,17 @@ # A strange unknown issue that arises within a Room class (it seems an actual dependency is missing # within Room). -dontwarn androidx.room.paging.LimitOffsetDataSource + +# Ensure that lifecycle-related components (such as LiveData) work correctly. For context, see: +# https://github.com/oppia/oppia-android/issues/3810#issuecomment-931925578. +-keepclassmembers enum androidx.lifecycle.Lifecycle$Event { + ; +} +-keep !interface * implements androidx.lifecycle.LifecycleObserver {} +-keep class * implements androidx.lifecycle.GeneratedAdapter { + (...); +} +-keepclassmembers class ** { + @androidx.lifecycle.OnLifecycleEvent *; +} +-keepclassmembers class androidx.lifecycle.ReportFragment$LifecycleCallbacks { *; } diff --git a/domain/src/main/java/org/oppia/android/domain/locale/LocaleController.kt b/domain/src/main/java/org/oppia/android/domain/locale/LocaleController.kt index 70e62e4b430..ec90dae8f02 100644 --- a/domain/src/main/java/org/oppia/android/domain/locale/LocaleController.kt +++ b/domain/src/main/java/org/oppia/android/domain/locale/LocaleController.kt @@ -103,8 +103,6 @@ class LocaleController @Inject constructor( }.build() } - // TODO(#3800): Utilize this method to build in resilience for low-memory process deaths resulting - // in crashes upon the app be foregrounded. /** * Returns a new [DisplayLocale] corresponding to the specified [OppiaLocaleContext]. This is * meant to be used in cases when a context needs to be saved (e.g. in a bundle) and later