Merge pull request #1478 from instructure/release/student-6.16.0-234

Release Student 6.16.0 (234)
instructure · Feb 7, 2022 · 98efbbb · 98efbbb
2 parents 186ccae + 1d76d65
commit 98efbbb
Show file tree

Hide file tree

Showing 472 changed files with 46,928 additions and 20,334 deletions.
diff --git a/apps/flutter_parent/android/app/build.gradle b/apps/flutter_parent/android/app/build.gradle
@@ -86,13 +86,13 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.KOTLIN}"
 
     testImplementation 'junit:junit:4.12'
 
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation "com.squareup.okhttp3:okhttp:3.13.1"
+    implementation "com.squareup.okhttp3:okhttp:4.9.1"
     implementation 'org.jsoup:jsoup:1.11.3'
     implementation 'com.google.gms:google-services:4.3.3'
 }

diff --git a/apps/flutter_parent/android/app/src/main/AndroidManifest.xml b/apps/flutter_parent/android/app/src/main/AndroidManifest.xml
@@ -20,7 +20,6 @@
         android:allowBackup="false"
         android:fullBackupContent="false"
         android:requestLegacyExternalStorage="true">
-        android:usesCleartextTraffic="true"
 
         <meta-data
             android:name="flutterEmbedding"

diff --git a/...parent/android/app/src/main/kotlin/com/instructure/parentapp/plugins/DataSeedingPlugin.kt b/...parent/android/app/src/main/kotlin/com/instructure/parentapp/plugins/DataSeedingPlugin.kt
@@ -5,6 +5,7 @@ import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.jsoup.Connection
 import org.jsoup.Jsoup
 import org.jsoup.nodes.FormElement
@@ -62,7 +63,7 @@ object DataSeedingPlugin {
                 val authFormResponse = loginForm.submit().cookies(loginPageResponse.cookies()).execute()
                 val authForm = authFormResponse.parse().select("form").first() as FormElement
                 val responseUrl = authForm.submit().cookies(authFormResponse.cookies()).execute().url().toString()
-                authCode = HttpUrl.parse(responseUrl)?.queryParameter("code")
+                authCode = responseUrl?.toHttpUrlOrNull()?.queryParameter("code")
                     ?: throw RuntimeException("/login/oauth2/auth failed!")
 
                 return null

diff --git a/...utter_parent/android/app/src/main/kotlin/com/instructure/parentapp/plugins/UrlLauncher.kt b/...utter_parent/android/app/src/main/kotlin/com/instructure/parentapp/plugins/UrlLauncher.kt
@@ -84,7 +84,7 @@ object UrlLauncher {
 
     private fun makeIntent(url: String, excludeInstructure: Boolean): Intent {
         var intent: Intent = Intent(Intent.ACTION_VIEW).setData(Uri.parse(url));
-        if (excludeInstructure && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        if (excludeInstructure) {
             intent = Intent.createChooser(intent, null).apply {
                 putExtra(Intent.EXTRA_EXCLUDE_COMPONENTS, excludeComponents)
             }

diff --git a/apps/flutter_parent/android/build.gradle b/apps/flutter_parent/android/build.gradle
@@ -1,5 +1,4 @@
 buildscript {
-    ext.kotlin_version = '1.2.71'
     repositories {
         google()
         mavenCentral()
@@ -26,15 +25,6 @@ subprojects {
 }
 subprojects {
     project.evaluationDependsOn(':app')
-    //TODO revisit this when the firebase_remote_config is finally updated (https://github.com/FirebaseExtended/flutterfire/issues/3847)
-    project.configurations.all {
-        resolutionStrategy.eachDependency { details ->
-            if (details.requested.group == 'com.google.protobuf'
-                    && details.requested.name.contains('protobuf-javalite') ) {
-                details.useTarget group: details.requested.group, name: 'protobuf-lite', version:'3.0.1'
-            }
-        }
-    }
 }
 
 task clean(type: Delete) {

diff --git a/apps/flutter_parent/lib/l10n/app_localizations.dart b/apps/flutter_parent/lib/l10n/app_localizations.dart
@@ -1651,4 +1651,13 @@ class AppLocalizations {
 
   String get qrCodeNoCameraError =>
       Intl.message('QR scanning requires camera access', desc: 'placeholder for camera error for QR code scan');
+
+  String get lockedForUserError =>
+      Intl.message('The linked item is no longer available', desc: 'error message when the alert could no be opened');
+
+  String get lockedForUserTitle =>
+      Intl.message('Locked', desc: 'title for locked alerts');
+
+  String get messageSent =>
+      Intl.message('Message sent', desc: 'confirmation message on the screen when the user succesfully sends a message');
 }
diff --git a/apps/flutter_parent/lib/l10n/res/intl_ca.arb b/apps/flutter_parent/lib/l10n/res/intl_ca.arb