antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

style: code cleanup

Browse source
This commit is contained in:
antonio 2024-01-28 18:30:50 +01:00
parent 33aa38e885
commit e8f3cdbb48
2 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/com/cappielloantonio/tempo/service/DownloaderManager.java
View file

@ -31,9 +31,10 @@ public class DownloaderManager {
private final Context context; private final Context context;
private final DataSource.Factory dataSourceFactory; private final DataSource.Factory dataSourceFactory;
private final HashMap<String, Download> downloads;
private final DownloadIndex downloadIndex; private final DownloadIndex downloadIndex;
private static HashMap<String, Download> downloads;
public DownloaderManager(Context context, DataSource.Factory dataSourceFactory, DownloadManager downloadManager) { public DownloaderManager(Context context, DataSource.Factory dataSourceFactory, DownloadManager downloadManager) {
this.context = context.getApplicationContext(); this.context = context.getApplicationContext();
this.dataSourceFactory = dataSourceFactory; this.dataSourceFactory = dataSourceFactory;
@ -83,8 +84,8 @@ public class DownloaderManager {
public void remove(MediaItem mediaItem, com.cappielloantonio.tempo.model.Download download) { public void remove(MediaItem mediaItem, com.cappielloantonio.tempo.model.Download download) {
DownloadService.sendRemoveDownload(context, DownloaderService.class, buildDownloadRequest(mediaItem).id, false); DownloadService.sendRemoveDownload(context, DownloaderService.class, buildDownloadRequest(mediaItem).id, false);
downloads.remove(download.getId());
deleteDatabase(download.getId()); deleteDatabase(download.getId());
downloads.remove(download.getId());
} }
public void remove(List<MediaItem> mediaItems, List<com.cappielloantonio.tempo.model.Download> downloads) { public void remove(List<MediaItem> mediaItems, List<com.cappielloantonio.tempo.model.Download> downloads) {
@ -115,6 +116,16 @@ public class DownloaderManager {
return download != null ? download.getTitle() : null; return download != null ? download.getTitle() : null;
} }
public static void updateRequestDownload(Download download) {
updateDatabase(download.request.id);
downloads.put(download.request.id, download);
}
public static void removeRequestDownload(Download download) {
deleteDatabase(download.request.id);
downloads.remove(download.request.id);
}
private static DownloadRepository getDownloadRepository() { private static DownloadRepository getDownloadRepository() {
return new DownloadRepository(); return new DownloadRepository();
} }
@ -134,16 +145,4 @@ public class DownloaderManager {
private static void updateDatabase(String id) { private static void updateDatabase(String id) {
getDownloadRepository().update(id); getDownloadRepository().update(id);
} }
public void updateRequestDownload(Download download) {
updateDatabase(download.request.id);
if (download.state == Download.STATE_COMPLETED) {
downloads.put(download.request.id, download);
}
}
public void removeRequestDownload(Download download) {
deleteDatabase(download.request.id);
downloads.remove(download.request.id);
}
} }

6
app/src/main/java/com/cappielloantonio/tempo/service/DownloaderService.java
View file

@ -53,7 +53,6 @@ public class DownloaderService extends androidx.media3.exoplayer.offline.Downloa
private static final class TerminalStateNotificationHelper implements DownloadManager.Listener { private static final class TerminalStateNotificationHelper implements DownloadManager.Listener {
private final Context context; private final Context context;
private final DownloadNotificationHelper notificationHelper; private final DownloadNotificationHelper notificationHelper;
private final DownloaderManager downloaderManager;
private final Notification successfulDownloadGroupNotification; private final Notification successfulDownloadGroupNotification;
private final Notification failedDownloadGroupNotification; private final Notification failedDownloadGroupNotification;
@ -66,7 +65,6 @@ public class DownloaderService extends androidx.media3.exoplayer.offline.Downloa
public TerminalStateNotificationHelper(Context context, DownloadNotificationHelper notificationHelper, int firstNotificationId) { public TerminalStateNotificationHelper(Context context, DownloadNotificationHelper notificationHelper, int firstNotificationId) {
this.context = context.getApplicationContext(); this.context = context.getApplicationContext();
this.notificationHelper = notificationHelper; this.notificationHelper = notificationHelper;
this.downloaderManager = DownloadUtil.getDownloadTracker(context);
nextNotificationId = firstNotificationId; nextNotificationId = firstNotificationId;
successfulDownloadGroupNotification = DownloadUtil.buildGroupSummaryNotification( successfulDownloadGroupNotification = DownloadUtil.buildGroupSummaryNotification(
@ -97,7 +95,7 @@ public class DownloaderService extends androidx.media3.exoplayer.offline.Downloa
notification = notificationHelper.buildDownloadCompletedNotification(context, R.drawable.ic_check_circle, null, DownloaderManager.getDownloadNotificationMessage(download.request.id)); notification = notificationHelper.buildDownloadCompletedNotification(context, R.drawable.ic_check_circle, null, DownloaderManager.getDownloadNotificationMessage(download.request.id));
notification = Notification.Builder.recoverBuilder(context, notification).setGroup(DownloadUtil.DOWNLOAD_NOTIFICATION_SUCCESSFUL_GROUP).build(); notification = Notification.Builder.recoverBuilder(context, notification).setGroup(DownloadUtil.DOWNLOAD_NOTIFICATION_SUCCESSFUL_GROUP).build();
NotificationUtil.setNotification(this.context, successfulDownloadGroupNotificationId, successfulDownloadGroupNotification); NotificationUtil.setNotification(this.context, successfulDownloadGroupNotificationId, successfulDownloadGroupNotification);
downloaderManager.updateRequestDownload(download); DownloaderManager.updateRequestDownload(download);
} else if (download.state == Download.STATE_FAILED) { } else if (download.state == Download.STATE_FAILED) {
notification = notificationHelper.buildDownloadFailedNotification(context, R.drawable.ic_error, null, DownloaderManager.getDownloadNotificationMessage(download.request.id)); notification = notificationHelper.buildDownloadFailedNotification(context, R.drawable.ic_error, null, DownloaderManager.getDownloadNotificationMessage(download.request.id));
notification = Notification.Builder.recoverBuilder(context, notification).setGroup(DownloadUtil.DOWNLOAD_NOTIFICATION_FAILED_GROUP).build(); notification = Notification.Builder.recoverBuilder(context, notification).setGroup(DownloadUtil.DOWNLOAD_NOTIFICATION_FAILED_GROUP).build();
@ -111,7 +109,7 @@ public class DownloaderService extends androidx.media3.exoplayer.offline.Downloa
@Override @Override
public void onDownloadRemoved(@NonNull DownloadManager downloadManager, Download download) { public void onDownloadRemoved(@NonNull DownloadManager downloadManager, Download download) {
downloaderManager.removeRequestDownload(download); DownloaderManager.removeRequestDownload(download);
} }
} }
} }