A cross platform Audiobookshelf client for Android and iOS
Dart
Show the real build number for split APKs
Barnabas81bfed90c8fa
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex f635c261..f2546dd2 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -8,7 +8,6 @@ import 'package:permission_handler/permission_handler.dart';import 'package:file_picker/file_picker.dart';import 'package:background_downloader/background_downloader.dart';import 'package:url_launcher/url_launcher.dart';-import 'package:package_info_plus/package_info_plus.dart';import 'package:just_audio/just_audio.dart' show AudioPlayer;import '../providers/auth_provider.dart';import '../providers/library_provider.dart';@@ -748,7 +747,7 @@ class _SettingsScreenState extends State<SettingsScreen> {DownloadService().totalDownloadSize, // 25DownloadService.getDeviceStorage(), // 26AutoSleepSettings.load(), // 27- PackageInfo.fromPlatform(), // 29+ UpdateCheckerService.currentInstalledVersion(), // 29PlayerSettings.getStreamingCacheSizeMb(), // 30PlayerSettings.getLocalServerEnabled(), // 31PlayerSettings.getLocalServerUrl(), // 32@@ -816,7 +815,7 @@ class _SettingsScreenState extends State<SettingsScreen> {final dlSize = results[25] as int;final deviceStorage = results[26] as Map<String, int>?;final autoSleep = results[27] as AutoSleepSettings;- final pkgInfo = results[28] as PackageInfo;+ final appVersion = results[28] as String;final cacheSizeMb = results[29] as int;final localEnabled = results[30] as bool;final localUrl = results[31] as String;@@ -905,9 +904,7 @@ class _SettingsScreenState extends State<SettingsScreen> {_deviceAvailableBytes = deviceStorage['availableBytes']!;}_autoSleepSettings = autoSleep;- _appVersion = pkgInfo.buildNumber.isEmpty- ? pkgInfo.version- : '${pkgInfo.version}+${pkgInfo.buildNumber}';+ _appVersion = appVersion;_streamingCacheSizeMb = cacheSizeMb;_localServerEnabled = localEnabled;_localServerUrl = localUrl;diff --git a/lib/services/update_checker_service.dart b/lib/services/update_checker_service.dartindex 60834275..c9fc62ba 100644--- a/lib/services/update_checker_service.dart+++ b/lib/services/update_checker_service.dart@@ -42,6 +42,24 @@ class UpdateCheckerService {static const _lastCheckKey = 'update_last_check';static const _updateChannel = MethodChannel('com.absorb.update');+ static Future<String> currentInstalledVersion() async {+ final packageInfo = await PackageInfo.fromPlatform();+ int? baseBuildNumber;+ if (!kIsWeb && Platform.isAndroid) {+ try {+ baseBuildNumber =+ await _updateChannel.invokeMethod<int>('getBaseBuildNumber');+ } catch (error) {+ debugPrint('[UpdateChecker] Base build lookup failed: $error');+ }+ }+ return currentUpdateVersion(+ versionName: packageInfo.version,+ packageBuildNumber: packageInfo.buildNumber,+ baseBuildNumber: baseBuildNumber,+ );+ }+/// Check for updates. Returns UpdateInfo if a newer version exists, null otherwise./// Respects a 12-hour cooldown between checks and skips dismissed versions./// When [includePreReleases] is true, pre-release/alpha builds are also considered.@@ -94,9 +112,7 @@ class UpdateCheckerService {}}- final packageInfo = await PackageInfo.fromPlatform();List<String> supportedAbis = const [];- int? baseBuildNumber;if (!kIsWeb && Platform.isAndroid) {try {supportedAbis =@@ -104,22 +120,12 @@ class UpdateCheckerService {} catch (error) {debugPrint('[UpdateChecker] ABI detection failed: $error');}- try {- baseBuildNumber =- await _updateChannel.invokeMethod<int>('getBaseBuildNumber');- } catch (error) {- debugPrint('[UpdateChecker] Base build lookup failed: $error');- }}final selectedAsset = selectAndroidUpdateAsset(assets: releaseAssets,supportedAbis: supportedAbis,);- final currentVersion = currentUpdateVersion(- versionName: packageInfo.version,- packageBuildNumber: packageInfo.buildNumber,- baseBuildNumber: baseBuildNumber,- );+ final currentVersion = await currentInstalledVersion();final downloadUrl = selectedAsset?.downloadUrl ??data['html_url'] as String? ??'';