Release Teacher 1.15.0 (44)

instructure · Dec 7, 2021 · df31076 · df31076
2 parents c69957d + 50f4c34
commit df31076
Show file tree

Hide file tree

Showing 332 changed files with 23,585 additions and 1,828 deletions.
diff --git a/android-vault b/android-vault
diff --git a/apps/flutter_parent/android/app/build.gradle b/apps/flutter_parent/android/app/build.gradle
@@ -92,7 +92,7 @@ dependencies {
 
     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
@@ -10,14 +10,16 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CAMERA" android:required="false"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <!-- For notifications plugin -->
 
     <application
         android:label="Canvas Parent"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false"
-        android:fullBackupContent="false">
+        android:fullBackupContent="false"
+        android:requestLegacyExternalStorage="true">
         android:usesCleartextTraffic="true"
 
         <meta-data

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