kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 10:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Multiple Files Download Results in Wrong Content Title In The Notification

Browse Source
This commit is contained in:
Adeel Zafar 2019-02-18 01:34:01 +05:00 committed by Isaac Hutt
parent f721d03bf0
commit c0b1e22eae
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadService.java
View File

@ -25,6 +25,7 @@ import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
@ -88,6 +89,7 @@ public class DownloadService extends Service {
public static final String ACTION_STOP = "STOP"; public static final String ACTION_STOP = "STOP";
public static final String ACTION_NO_WIFI = "NO_WIFI"; public static final String ACTION_NO_WIFI = "NO_WIFI";
public static final String NOTIFICATION_ID = "NOTIFICATION_ID"; public static final String NOTIFICATION_ID = "NOTIFICATION_ID";
public static final String NOTIFICATION_TITLE_KEY = "NOTIFICATION_TITLE_KEY";
public static final Object pauseLock = new Object(); public static final Object pauseLock = new Object();
// 1024 / 100 // 1024 / 100
private static final double BOOK_SIZE_OFFSET = 10.24; private static final double BOOK_SIZE_OFFSET = 10.24;
@ -215,7 +217,9 @@ public class DownloadService extends Service {
.addAction(pause) .addAction(pause)
.addAction(stop) .addAction(stop)
.setOngoing(true)); .setOngoing(true));
Bundle bundle = new Bundle();
bundle.putString(NOTIFICATION_TITLE_KEY, notificationTitle);
notification.get(notificationID).addExtras(bundle);
notificationManager.notify(notificationID, notification.get(notificationID).build()); notificationManager.notify(notificationID, notification.get(notificationID).build());
downloadStatus.put(notificationID, PLAY); downloadStatus.put(notificationID, PLAY);
LibraryFragment.downloadingBooks.remove(book); LibraryFragment.downloadingBooks.remove(book);
@ -335,9 +339,12 @@ public class DownloadService extends Service {
public void onNext(Integer progress) { public void onNext(Integer progress) {
if (progress == 100) { if (progress == 100) {
notification.get(notificationID).setOngoing(false); notification.get(notificationID).setOngoing(false);
Bundle b = notification.get(notificationID).getExtras();
notification.get(notificationID) notification.get(notificationID)
.setContentTitle(notificationTitle + " " + getResources().getString( .setContentTitle(
R.string.zim_file_downloaded)); b.getString(NOTIFICATION_TITLE_KEY) + " " + getResources().getString(
R.string.zim_file_downloaded));
notification.get(notificationID).getExtras();
notification.get(notificationID) notification.get(notificationID)
.setContentText(getString(R.string.zim_file_downloaded)); .setContentText(getString(R.string.zim_file_downloaded));
final Intent target = new Intent(DownloadService.this, MainActivity.class); final Intent target = new Intent(DownloadService.this, MainActivity.class);