peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-08-18 20:49:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

App name overrides more consistent (#450)

Browse Source
This commit is contained in:
Imran Remtulla
2023-04-12 15:36:17 -04:00
parent 0704dfe2ee
commit 7ea75325bb
5 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/providers/apps_provider.dart
View File

@@ -36,6 +36,8 @@ class AppInMemory {
AppInMemory(this.app, this.downloadProgress, this.installedInfo);
AppInMemory deepCopy() =>
AppInMemory(app.deepCopy(), downloadProgress, installedInfo);
String get name => app.overrideName ?? installedInfo?.name ?? app.finalName;
}
class DownloadedApk {
@@ -163,7 +165,7 @@ class AppsProvider with ChangeNotifier {
Future<DownloadedApk> downloadApp(App app, BuildContext? context) async {
NotificationsProvider? notificationsProvider =
context?.read<NotificationsProvider>();
var notifId = DownloadNotification(app.name, 0).id;
var notifId = DownloadNotification(app.finalName, 0).id;
if (apps[app.id] != null) {
apps[app.id]!.downloadProgress = 0;
notifyListeners();
@@ -173,7 +175,7 @@ class AppsProvider with ChangeNotifier {
.getSource(app.url)
.apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex].value);
var fileName = '${app.id}-${downloadUrl.hashCode}.apk';
var notif = DownloadNotification(app.name, 100);
var notif = DownloadNotification(app.finalName, 100);
notificationsProvider?.cancel(notif.id);
int? prevProg;
File downloadedFile =
@@ -183,7 +185,7 @@ class AppsProvider with ChangeNotifier {
apps[app.id]!.downloadProgress = progress;
notifyListeners();
}
notif = DownloadNotification(app.name, prog ?? 100);
notif = DownloadNotification(app.finalName, prog ?? 100);
if (prog != null && prevProg != prog) {
notificationsProvider?.notify(notif);
}
@@ -641,7 +643,7 @@ class AppsProvider with ChangeNotifier {
sp.getSource(newApps[i].url);
apps[newApps[i].id] = AppInMemory(newApps[i], null, info);
} catch (e) {
errors.add([newApps[i].id, newApps[i].name, e.toString()]);
errors.add([newApps[i].id, newApps[i].finalName, e.toString()]);
}
}
if (errors.isNotEmpty) {
@@ -675,9 +677,6 @@ class AppsProvider with ChangeNotifier {
var app = a.deepCopy();
AppInfo? info = await getInstalledInfo(app.id);
app.name = info?.name ?? app.name;
if (app.additionalSettings['appName']?.toString().isNotEmpty == true) {
app.name = app.additionalSettings['appName'].toString().trim();
}
if (attemptToCorrectInstallStatus) {
app = getCorrectedInstallStatusAppIfPossible(app, info) ?? app;
}
@@ -945,7 +944,7 @@ class _APKPickerState extends State<APKPicker> {
scrollable: true,
title: Text(tr('pickAnAPK')),
content: Column(children: [
Text(tr('appHasMoreThanOnePackage', args: [widget.app.name])),
Text(tr('appHasMoreThanOnePackage', args: [widget.app.finalName])),
const SizedBox(height: 16),
...widget.app.apkUrls.map(
(u) => RadioListTile<String>(

8
lib/providers/notifications_provider.dart
View File

@@ -34,9 +34,9 @@ class UpdateNotification extends ObtainiumNotification {
message = updates.isEmpty
? tr('noNewUpdates')
: updates.length == 1
? tr('xHasAnUpdate', args: [updates[0].name])
? tr('xHasAnUpdate', args: [updates[0].finalName])
: plural('xAndNMoreUpdatesAvailable', updates.length - 1,
args: [updates[0].name, (updates.length - 1).toString()]);
args: [updates[0].finalName, (updates.length - 1).toString()]);
}
}
@@ -46,9 +46,9 @@ class SilentUpdateNotification extends ObtainiumNotification {
tr('appsUpdatedNotifDescription'), Importance.defaultImportance) {
message = updates.length == 1
? tr('xWasUpdatedToY',
args: [updates[0].name, updates[0].latestVersion])
args: [updates[0].finalName, updates[0].latestVersion])
: plural('xAndNMoreUpdatesInstalled', updates.length - 1,
args: [updates[0].name, (updates.length - 1).toString()]);
args: [updates[0].finalName, (updates.length - 1).toString()]);
}
}

9
lib/providers/source_provider.dart
View File

@@ -80,6 +80,15 @@ class App {
return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls PREFERREDAPK: $preferredApkIndex ADDITIONALSETTINGS: ${additionalSettings.toString()} LASTCHECK: ${lastUpdateCheck.toString()} PINNED $pinned';
}
String? get overrideName =>
additionalSettings['appName']?.toString().trim().isNotEmpty == true
? additionalSettings['appName']
: null;
String get finalName {
return overrideName ?? name;
}
App deepCopy() => App(
id,
url,