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

Some work on Download Service

Browse Source
This commit is contained in:
mhutti1 2017-08-16 09:27:33 -04:00 committed by Isaac Hutt
parent 8629e78511
commit 956272811e
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java
View File

@ -75,6 +75,9 @@ public class DownloadFragment extends Fragment {
} }
private void updateNoDownloads() { private void updateNoDownloads() {
if (faActivity == null) {
return;
}
TextView noDownloadsText = (TextView) faActivity.findViewById(R.id.download_management_no_downloads); TextView noDownloadsText = (TextView) faActivity.findViewById(R.id.download_management_no_downloads);
if (noDownloadsText == null) return; if (noDownloadsText == null) return;
if (listView.getCount() == 0) { if (listView.getCount() == 0) {

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

@ -12,6 +12,7 @@ import android.os.IBinder;
import android.os.Looper; import android.os.Looper;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.SparseIntArray; import android.util.SparseIntArray;
@ -66,7 +67,6 @@ 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 int notificationCount = 1;
public static ArrayList<String> notifications = new ArrayList<>(); public static ArrayList<String> notifications = new ArrayList<>();
public String notificationTitle; public String notificationTitle;
@ -106,11 +106,17 @@ public class DownloadService extends Service {
if (intent == null) { if (intent == null) {
return START_NOT_STICKY; return START_NOT_STICKY;
} }
String log = intent.getAction();
log += " : ";
if (intent.hasExtra(NOTIFICATION_ID)) {
log += intent.getIntExtra(NOTIFICATION_ID, -3);
}
Log.d("kiwixdownloadservice", log);
if (intent.hasExtra(NOTIFICATION_ID) && intent.getAction().equals(ACTION_STOP)) { if (intent.hasExtra(NOTIFICATION_ID) && intent.getAction().equals(ACTION_STOP)) {
stopDownload(intent.getIntExtra(NOTIFICATION_ID, 0)); stopDownload(intent.getIntExtra(NOTIFICATION_ID, 0));
return START_NOT_STICKY; return START_NOT_STICKY;
} }
if (intent.hasExtra(NOTIFICATION_ID) && intent.getAction().equals(ACTION_PAUSE)) { if (intent.hasExtra(NOTIFICATION_ID) && (intent.getAction().equals(ACTION_PAUSE))) {
if (KiwixMobileActivity.wifiOnly && !NetworkUtils.isWiFi(getApplicationContext())) { if (KiwixMobileActivity.wifiOnly && !NetworkUtils.isWiFi(getApplicationContext())) {
startActivity(new Intent(this, ZimManageActivity.class).setAction(ACTION_NO_WIFI).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); startActivity(new Intent(this, ZimManageActivity.class).setAction(ACTION_NO_WIFI).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
this.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); this.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
@ -120,7 +126,6 @@ public class DownloadService extends Service {
} }
DownloadService.notificationCount++;
SD_CARD = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()) SD_CARD = PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
.getString(KiwixMobileActivity.PREF_STORAGE,Environment.getExternalStorageDirectory().getPath()); .getString(KiwixMobileActivity.PREF_STORAGE,Environment.getExternalStorageDirectory().getPath());
KIWIX_ROOT = SD_CARD + "/Kiwix/"; KIWIX_ROOT = SD_CARD + "/Kiwix/";
@ -129,24 +134,30 @@ public class DownloadService extends Service {
notificationTitle = intent.getExtras().getString(DownloadIntent.DOWNLOAD_ZIM_TITLE); notificationTitle = intent.getExtras().getString(DownloadIntent.DOWNLOAD_ZIM_TITLE);
LibraryNetworkEntity.Book book = (LibraryNetworkEntity.Book) intent.getSerializableExtra("Book"); LibraryNetworkEntity.Book book = (LibraryNetworkEntity.Book) intent.getSerializableExtra("Book");
int notificationID = book.getId().hashCode();
if ( downloadStatus.get(notificationID, -1) == PAUSE || downloadStatus.get(notificationID, -1) == PLAY ) {
return START_NOT_STICKY;
}
notifications.add(notificationTitle); notifications.add(notificationTitle);
final Intent target = new Intent(this, KiwixMobileActivity.class); final Intent target = new Intent(this, KiwixMobileActivity.class);
target.putExtra("library", true); target.putExtra("library", true);
bookDao = new BookDao(KiwixDatabase.getInstance(this)); bookDao = new BookDao(KiwixDatabase.getInstance(this));
PendingIntent pendingIntent = PendingIntent.getActivity PendingIntent pendingIntent = PendingIntent.getActivity
(getBaseContext(), notificationCount, (getBaseContext(), notificationID,
target, PendingIntent.FLAG_CANCEL_CURRENT); target, PendingIntent.FLAG_CANCEL_CURRENT);
Intent pauseIntent = new Intent(this, this.getClass()).setAction(ACTION_PAUSE).putExtra(NOTIFICATION_ID, notificationCount); Intent pauseIntent = new Intent(this, this.getClass()).setAction(ACTION_PAUSE).putExtra(NOTIFICATION_ID, notificationID);
Intent stopIntent = new Intent(this, this.getClass()).setAction(ACTION_STOP).putExtra(NOTIFICATION_ID, notificationCount); Intent stopIntent = new Intent(this, this.getClass()).setAction(ACTION_STOP).putExtra(NOTIFICATION_ID, notificationID);
PendingIntent pausePending = PendingIntent.getService(getBaseContext(), notificationCount, pauseIntent, PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent pausePending = PendingIntent.getService(getBaseContext(), notificationID, pauseIntent, PendingIntent.FLAG_CANCEL_CURRENT);
PendingIntent stopPending = PendingIntent.getService(getBaseContext(), notificationCount, stopIntent, PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent stopPending = PendingIntent.getService(getBaseContext(), notificationID, stopIntent, PendingIntent.FLAG_CANCEL_CURRENT);
NotificationCompat.Action pause = new NotificationCompat.Action(R.drawable.ic_pause_black_24dp, getString(R.string.download_pause), pausePending); NotificationCompat.Action pause = new NotificationCompat.Action(R.drawable.ic_pause_black_24dp, getString(R.string.download_pause), pausePending);
NotificationCompat.Action stop = new NotificationCompat.Action(R.drawable.ic_stop_black_24dp, getString(R.string.download_stop), stopPending); NotificationCompat.Action stop = new NotificationCompat.Action(R.drawable.ic_stop_black_24dp, getString(R.string.download_stop), stopPending);
notification.put(notificationCount , new NotificationCompat.Builder(this) notification.put(notificationID , new NotificationCompat.Builder(this)
.setContentTitle(getResources().getString(R.string.zim_file_downloading) + " " + notificationTitle) .setContentTitle(getResources().getString(R.string.zim_file_downloading) + " " + notificationTitle)
.setProgress(100, 0, false) .setProgress(100, 0, false)
.setSmallIcon(R.drawable.kiwix_notification) .setSmallIcon(R.drawable.kiwix_notification)
@ -156,11 +167,11 @@ public class DownloadService extends Service {
.addAction(stop) .addAction(stop)
.setOngoing(true)); .setOngoing(true));
notificationManager.notify(notificationCount, notification.get(notificationCount).build()); notificationManager.notify(notificationID, notification.get(notificationID).build());
downloadStatus.put(notificationCount, PLAY); downloadStatus.put(notificationID, PLAY);
LibraryFragment.downloadingBooks.remove(book); LibraryFragment.downloadingBooks.remove(book);
String url = intent.getExtras().getString(DownloadIntent.DOWNLOAD_URL_PARAMETER); String url = intent.getExtras().getString(DownloadIntent.DOWNLOAD_URL_PARAMETER);
downloadBook(url, notificationCount, book); downloadBook(url, notificationID, book);
return START_REDELIVER_INTENT; return START_REDELIVER_INTENT;
} }
@ -280,6 +291,9 @@ public class DownloadService extends Service {
updateForeground(); updateForeground();
} }
updateDownloadFragmentProgress(progress, notificationID); updateDownloadFragmentProgress(progress, notificationID);
if (progress == 100) {
stopSelf();
}
}, Throwable::printStackTrace); }, Throwable::printStackTrace);
} }