Merge branch 'master' into andreicmirciu/feedback

Author: andreicmirciu

android/fastlane/metadata/android/en-GB/changelogs/10014.txt

@@ -0,0 +1,5 @@
+Added
+  - You can now see events associated with a class directly on the class page. Just tap an event in your timetable, tap the class name and see the change!
+
+Fixed
+  - People photos not showing due to an expired certificate of cs.pub.ro

android/fastlane/metadata/android/en-US/changelogs/10014.txt

@@ -0,0 +1,5 @@
+Added
+  - You can now see events associated with a class directly on the class page. Just tap an event in your timetable, tap the class name and see the change!
+
+Fixed
+  - People photos not showing due to an expired certificate of cs.pub.ro

android/fastlane/metadata/android/ro/changelogs/10014.txt

@@ -0,0 +1,5 @@
+Adăugat
+  - Acum poți vedea evenimentele asociate unei materii direct pe pagina materiei. Apasă pe un eveniment din orar, apoi pe numele materiei, și poți vedea schimbarea!
+
+Rezolvat
+  - Pozele persoanelor nu mai apăreau din cauza certificatului expirat de pe cs.pub.ro

lib/main.dart

@@ -39,15 +39,17 @@ import 'package:provider/provider.dart';
 import 'package:rrule/rrule.dart';
 import 'package:time_machine/time_machine.dart';
 
-// FIXME: acs.pub.ro has some bad certificate configuration right now.
-// We get around this by accepting any certificate if the host is acs.pub.ro.
+// FIXME: acs.pub.ro has some bad certificate configuration right now, and the
+// cs.pub.ro certificate is expired.
+// We get around this by accepting any certificate if the host is either
+// acs.pub.ro or cs.pub.ro.
 // Remove this in the future.
 class MyHttpOverrides extends HttpOverrides {
   @override
   HttpClient createHttpClient(SecurityContext context) {
     return super.createHttpClient(context)
       ..badCertificateCallback = (X509Certificate cert, String host, int port) {
-        return host == 'acs.pub.ro';
+        return host == 'acs.pub.ro' || host == 'cs.pub.ro';
       };
   }
 }

pubspec.yaml

@@ -13,7 +13,7 @@ description: A mobile application for students at ACS UPB.
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 #
 # ACS UPB Mobile uses semantic versioning. You can read more in the CONTRIBUTING.md file.
-version: 1.2.11+13
+version: 1.2.11+14
 
 environment:
   sdk: ">=2.7.0 <3.0.0"