diff --git a/lib/pangea/analytics_misc/level_up/level_up_manager.dart b/lib/pangea/analytics_misc/level_up/level_up_manager.dart index cec323475..85459da81 100644 --- a/lib/pangea/analytics_misc/level_up/level_up_manager.dart +++ b/lib/pangea/analytics_misc/level_up/level_up_manager.dart @@ -74,8 +74,8 @@ class LevelUpManager { prevVocab = lastSummary.levelVocabConstructs!; prevGrammar = lastSummary.levelGrammarConstructs!; } else { - prevGrammar = (nextGrammar / prevLevel) as int; - prevVocab = (nextVocab / prevLevel) as int; + prevGrammar = (nextGrammar / prevLevel).round(); + prevVocab = (nextVocab / prevLevel).round(); } } } diff --git a/lib/pangea/chat_list/utils/app_version_util.dart b/lib/pangea/chat_list/utils/app_version_util.dart index 5a32ce83f..cdd6242ce 100644 --- a/lib/pangea/chat_list/utils/app_version_util.dart +++ b/lib/pangea/chat_list/utils/app_version_util.dart @@ -76,10 +76,17 @@ class AppVersionUtil { // convert the version number string into a list of ints // and the build number string into an int - final currentVersionParts = - currentVersion.split(".").map((e) => int.parse(e)).toList(); - final remoteVersionParts = - remoteVersion.split(".").map((e) => int.parse(e)).toList(); + final currentVersionParts = currentVersion + .replaceAll(RegExp(r'[^0-9.]'), '') + .split(".") + .map((e) => int.parse(e)) + .toList(); + final remoteVersionParts = remoteVersion + .replaceAll(RegExp(r'[^0-9.]'), '') + .split(".") + .map((e) => int.parse(e)) + .toList(); + final currentBuildNumberInt = int.parse(currentBuildNumber); final remoteBuildNumberInt = int.parse(remoteBuildNumber);