Release/v5.0.74+1874 (#3775)

* Hide "Renew" button in Mobile Access [#3634]

* Update CHANGELOG.md [#3634]

* Fixed total number of events in Event2SearchPanel [#3633].

* rename Sponsor to Event Host

* update changelog

* Added filters & sort capabilities when searching events [#3633].

* Fixed search query [#3633].

* Version: 5.0.54+1854

* Display required mark to all controls that are required [#3585].

* Fixed validation of requierd hybrid event properties [#3585].

* Move error description above the Create button [#3585].

* Improve GroupEventSelector display in Create event panel [#3585].

* Updated CHANGELOG.md [#3585].

* Use better ratio images for Android splash screen.

* Updated CHANGELOG.md

* sync plugin

* update changelog

* Hook up "Request" button in Mobile Access [#3641]:
 - use by default Identity BB for requesting invitation
 - request device registration via Identity BB when "Request" button is tapped
 - request device registration on startup if "Automatic credentials" is "on"

* Update CHANGELOG.md [#3641]

* Added commented shortcut for logging UIUC token.

* Do not show "View on map" command if laundry room has no location data [#3299]

* Version: 5.0.55+1855

* Log two new default analytics [#3648]:
 - is system locale selected
 - selected locale language code

* Updated CHANGELOG.md [#3648]

* Hide Laundry location button even if it's location is valid [#1674]

* Rename Attendee List to Registrants in Event2AttendanceDetailPanel [#3647]

* Groups load upcoming events [#3645]

* sync plugin

* Fix typo. Rename Chineese to Chinese [#3646]

* Version: 5.0.56+1856

* start improving survey preview [#3581]

* override survey preview popup message [#3581]

* Sync plugin.

* Merge string.en.json [#3665]

* Merge string.zh.json [#3665]

* Add missing entries from strings.en.json [#3665]

* Update CHANGELOG.md [#3665]

* Show assistance tab depending on group membership for "Assistant"

* Remove description from Attendance panels

* Implement new Mobile access flow for requesting mobile credentials. [#3651]

* Update CHANGELOG.md [#3651]

* Version: 5.0.57+1857

* Acknowledge the new model for mobile id credentials from Identity BB [#3679]

* Load mobile access details after successful device registration [#3679]

* Read delete timout from config [#3679]

* Update CHANGELOG.md [#3679]

* Change To-Do item header title [#3677]

* Update CHANGELOG.md [#3677]

* sync plugin

* keep content.attributes consistent with the ContentBB content

* version: 5.0.58+1858

* Rename "i-card" to "Illini ID" [#3685]

* Update CHANGELOG.md [#3685]

* Do not show Illini ID FAQs for users that are not allowed to have Mobile Access [#3687]

* Update CHANGELOG.md [#3687]

* Fix wording for team roster and staff [#3682]

* Update CHANGELOG.md [#3682]

* Events Feed renamed to All Events [#3690]

* Added dialog prompt to Star an event after successful registration [#3692]

* Removed members selection when Create/Add event to group [#3672]

* update changelog

* version: 5.0.59+1859

* Hide Illini ID FAQs for all [#3696]

* Update CHANGELOG.md [#3696]

* Show Mobile Access based on mobile id status from studentid API [#3698]

* Update CHANGELOG.md [#3698]

* Remove warning.

* - Bring back dialog for adding event to multiple groups that user is admin of [#3695]

* - Group events load private events for group members[#3674]

* remove hardcoded test message

* version: 5.0.60+1860

* hook EventSelector.finishSelection

* Event2CreatePanel update attendance description [#3702]

* Acknowledge location description when presenting event locations [#3510].

* version: 5.0.61+1861

* Display right number of registrations [#3671].

* Update texts for Attendance panels

* Update Texts for Event registration panel

* Highlight Attendees count when their count reaches or exceeds event capacity [#3671].

* Show Guest List in Registration Panel

* update changelog.md

* Do not allow register button if event capacity is filled, display proper info status in this case [#3671].

* Updated CHANGELOG.md [#3671].

* version: 5.0.62+1862

* SavedPanel: load events from events/lite (includes private events)

* Fix android studio INTERPRETER_PATH to use Mac OS path

* Display game events date time in local time zone - 3.1 [#3714]

* Show "Past" and "Upcoming" games based on the event day/time until midnight local time - 3.2 [#3714]

* Show only participants in the Registration Panel guest list [#3678+]

* Update CHANGELOG.md [#3714]

* Version: 5.0.63+1863

* Fixed DSYM upload for Firebase Crashlytics on iOS.

* Replace & with 'and' for event Categories

* replace & with 'and' for group categories

* replace & with 'and' for event sub category 'category' field

* Display event2 time in local timezone [#3718]

* Sync plugin [#3718]

* Use local timezone for events time [#3718]

* Update CHANGELOG.md [#3718]

* Tidy source code [#3718].

* Tidy source code [#3718].

* Sync plugin [rokwire/app-flutter-plugin#377].

* Version: 5.0.64+1864

* Upgrade to connectivity_plus plugin [#rokmetro/vogue-app/issues/45).

* Android: Update HID / Origo sdk to latest 1.9.1 version [#3725]

* Update CHANGELOG.md [#3725]

* iOS: update HID / Origo sdk to the latest 1.10.0 [#3727]

* Update CHANGELOG.md [#3727]

* Display registration type in attendees list [#3722].

* Load live games based on local timezone. [#3729]

* Update CHANGELOG.md [#3729]

* Play sound when adding attendee [#3722].

* Updated CHANGELOG.md [#3722].

* Version: 5.0.65+1865

* Show "am/pm" in lower case [#3735]

* Show display date time formatted in the game [#3735]

* Update CHANGELOG.md [#3735]

* Sync plugin.

* Do not show "Event Attendance" when modifying event. It is not acknolwedged from the backend [#3656]

* Sync plugin.

* Do not allow adding additional attendance taker if one's netid is in the registrant list [#3656]

* Update CHANGELOG.md [#3656]

* Version: 5.0.66+1866

* Do not show Register button until we are sure that registration is available for the event [#3671].

* Undo do not show "Event Attendance" when modifying event [#3656].

* Undo do not allow adding additional attendance taker if one's netid is in the registrant list [#3656].

* Updated CHANGELOG.md [#3656].

* version: 5.0.67+1867

* Updated plugin [#3743].

* Updated CHANGELOG.md [#3743].

* Do not show additional attendance takers edit when creating/updating event [#3656].

* Add event selector to AthleticsGameDetailPanel

* update CHANGELOG

* fix warning

* version: 5.0.68+1868

* allow editing of event survey from bottom modal only if event has attendance details set

* update changelog

* fix typo, fix event survey refresh

* Submit updated strings.zh.json [#3749]

* Add missing key-value pairs [#3749]

* Update CHANGELOG.md [#3749]

* Tuned refreshing of event detail [#3723].

* sync assets/extra/content.attributes.json with latest on bb [#3749]

* version: 5.0.69+1869

* Plugin version 1.5.0

* SECURITY.md version 5.0.69

* better handling of event survey update errors

* pop to the details panel if survey creation fails after event creation

* Sync plugin.

* Updated CHANGELOG.md [rokwire/app-flutter-plugin#381].

* App version 5.0.70, Plugin version 1.5.1

* Acknowledge the new service APIs for the new /group/events/v3 backend APIs [#3733].

* Updated attendance taking message [#3762].

* Acknowledge 'can_renew_mobileid' value from studentid endpoint [#3763]

* Check for invalid attendance takers before updating event attendance [#3762].

* Updated CHANGELOG.md [#3762].

* Show "Pending" / "Issuing" label based on the mobile id status that Identity BB returns [#3763]

* Bring back "Renew" mobile id button. Show it based on the response from the /studentid API [#3763]

* Implement "Renew" mobile access button. [#3763]

* Update CHANGELOG.md [#3763]

* Version: 5.0.71+1871

* Fixed unused import warnings.

* Show progress indicator in GroupAllEventsPanel [#3733].

* Updated CHANGELOG.md [#3733].

* App version 5.0.72+1872 / Plugin version: 1.5.2

* Check if attendee candidate is registered for an event before registering it [#3722].

* Check if maual attendee is already added before adding it [#3722].

* Added a marker for checking if scanned attendee is already added before adding it [#3722].

* Added methods for capacity check and prompt, commented for now [#3722].

* Update strings.en.json file [#3770]

* Change "Self Registered" to "Self-Registered" - 5.2 [#3770]

* Update CHANGELOG.md [#3770]

* Check for scanned attendees if they are already registered [#3722].

* Check for event capacity reached [#3722].

* Updated CHANGELOG.md [#3722].

* App version 5.0.73+1873 / Plugin version 1.5.3

* Acknowledge selected and highlighted states when guest list item is disabled [#3722].

* version: 5.0.74+1874

* version: 5.0.74+1874 / SECURITY.md

---------

Co-authored-by: Dobromir Dobrev <dobromir.i.dobrev@gmail.com>
Co-authored-by: Mihail Varbanov <mihail.varbanov@inabyte.com>
Co-authored-by: Todor Bachvarov <tobachvarov@gmail.com>
Co-authored-by: Ryan Oberlander <reoberlander2@gmail.com>

Author: 5 people

.android_studio/prebuild_illinois.run.xml

@@ -7,7 +7,7 @@
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
     <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="INDEPENDENT_INTERPRETER_PATH" value="false" />
-    <option name="INTERPRETER_PATH" value="$PROJECT_DIR$/../../../../../../../../Program Files/Git/bin/sh.exe" />
+    <option name="INTERPRETER_PATH" value="/bin/bash" />
     <option name="INTERPRETER_OPTIONS" value="-l" />
     <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="true" />

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "plugin"]
 	path = plugin
 	url = https://github.com/rokwire/app-flutter-plugin.git
+[submodule "libs"]
+	path = libs
+	url = https://github.com/rokwire/illinois-app-libs.git

CHANGELOG.md

@@ -3,7 +3,7 @@ The official mobile app of the University of Illinois. Powered by the [Rokwire P
 
 ## Requirements
 
-### [Flutter](https://flutter.dev/docs/get-started/install) v3.3.2
+### [Flutter](https://flutter.dev/docs/get-started/install) v3.10.2
 
 ### [Android Studio](https://developer.android.com/studio) 2021.3.1+
 
@@ -26,6 +26,13 @@ cd illinois-app.git
 git clone https://github.com/rokwire/app-flutter-plugin.git plugin
 ```
 
+### Make sure libs repo persists
+Rokwire app libs directory is used by the Illinois app for private external libraries. It should be located in the `libs` subdirectory of the application's root project directory. If it does not exist you need to clone it manually.
+```
+cd illinois-app
+git clone https://github.com/rokwire/illinois-app-libs.git libs
+```
+
 ### Supply the following private configuration files:
 
 #### • .travis.yml
@@ -82,9 +89,15 @@ Alternatively, you can use AESCrypt.encode from /lib/utils/Crypt.dart to generat
 The Firebase configuration file for iOS generated from Google Firebase console.
 
 #### • android/app/src/illinois/keys.properties
-Contains GoogleMaps API key for the Illinois flavor.
+Contains:
+- GoogleMaps API key for the Illinois flavor.
+- Origo configuration specific keys and ids.
 ```
 googleMapsApiKey=XXXXXXXXXXXXXXXXXXXXXX-XXXXXXXXXXXXXXXX
+origoAppId=XXXXXXXXXXXXXXXXX
+origoLockServiceCode=X
+origoAidFilter1=XXXXXXXXXXXXXXXXXXXX
+origoAidFilter2=XXXXXXXXXXXXXXXXXXXXXXXXXX
 ```
 
 #### • android/app/src/illinois/dev/google-services.json

README.md

@@ -6,6 +6,8 @@ Patches for [ **illinois-app** ] will only be applied to the following versions:
 
 | Version | Supported |
 | ------- | ------------------ |
+| 5.0.74 | :white_check_mark: |
+| < 5.0.74 | :x: |
 | 4.3.61 | :white_check_mark: |
 | < 4.3.61 | :x: |
 | 4.2.52 | :white_check_mark: |

SECURITY.md

@@ -0,0 +1,9 @@
+#include: package:flutter_lints/flutter.yaml
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
+# https://medium.com/flutter-community/watch-your-code-dart-flutter-lint-55a697d01c8d
+
+# A good example of this file can be found at
+# https://github.com/flutter/flutter/blob/master/analysis_options.yaml
+

analysis_options.yaml

@@ -137,6 +137,13 @@ android {
                 }
             }
             manifestPlaceholders = [mapsApiKey: "${illinoisKeysProperties.getProperty('googleMapsApiKey')}"]
+
+            //Origo Mobile keys build configurations - see keys.properties
+            resValue "string", "hceAidFilter1", "${illinoisKeysProperties.getProperty('origoAidFilter1')}"
+            resValue "string", "hceAidFilter2", "${illinoisKeysProperties.getProperty('origoAidFilter2')}"
+
+            buildConfigField "String", "ORIGO_APP_ID", "\"${illinoisKeysProperties.getProperty('origoAppId')}\""
+            buildConfigField "int", "ORIGO_LOCK_SERVICE_CODE", illinoisKeysProperties.getProperty('origoLockServiceCode')
         }
     }
 
@@ -181,6 +188,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'com.google.android.gms:play-services-location:20.0.0'
     implementation 'com.android.volley:volley:1.2.1'
+    implementation 'com.google.code.gson:gson:2.8.9' // used by maps and origo as well
     //Firebase
     implementation 'com.google.firebase:firebase-core:21.1.1'
     implementation 'com.google.firebase:firebase-analytics:21.1.1'
@@ -190,7 +198,7 @@ dependencies {
     //Lifecycle
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
-    //Security
+    //Security - also required by Origo 1.7.7 and above
     implementation "androidx.security:security-crypto:1.1.0-alpha03"
 
     // Support foldable devices
@@ -201,6 +209,29 @@ dependencies {
     implementation 'com.google.zxing:core:3.3.0' //Use zxing 3.3.0 because we have minSdk < 24
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+
+    // Origo and mobile keys SDK
+    debugImplementation name: '../../libs/hid-origo/android/origo-sdk-debug', version: '1.9.1', ext: 'aar'
+    releaseImplementation name: '../../libs/hid-origo/android/origo-sdk-release', version: '1.9.1', ext: 'aar'
+    debugImplementation name: '../../libs/hid-origo/android/mobilekeys-android-sdk-debug', version: '8.0.6', ext: 'aar'
+    releaseImplementation name: '../../libs/hid-origo/android/mobilekeys-android-sdk-release', version: '8.0.6', ext: 'aar'
+
+    // Origo transitive dependencies
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.68'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'com.mixpanel.android:mixpanel-android:5.8.5'
+
+    // Required from Origo-SDK v1.7.7
+    implementation('com.google.crypto.tink:tink-android') {
+        version {
+            strictly '1.4.0'
+        }
+    }
+
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    // end Origo
 }
 
 apply plugin: 'com.google.gms.google-services'

android/app/build.gradle

@@ -16,6 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
+    <!-- For Mobile Access vibration feature -->
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <queries>
         <package android:name="edu.illinois.covid" />