ThmmyNoLife
/
mTHMMY
mirror of https://github.com/ThmmyNoLife/mTHMMY
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Downloads/notifications improvements

pull/24/head
Ezerous 8 years ago
parent
86f1c6eb7a
commit
944fb432fb
2 changed files with 30 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
  2. 32
      app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java

11
app/src/main/java/gr/thmmy/mthmmy/receiver/Receiver.java
View File

@ -12,9 +12,11 @@ import gr.thmmy.mthmmy.R;
import static gr.thmmy.mthmmy.services.DownloadService.ACTION_DOWNLOAD; import static gr.thmmy.mthmmy.services.DownloadService.ACTION_DOWNLOAD;
import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_DOWNLOAD_ID; import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_DOWNLOAD_ID;
import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_DOWNLOAD_STATE;
import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_NOTIFICATION_TEXT; import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_NOTIFICATION_TEXT;
import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_NOTIFICATION_TICKER; import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_NOTIFICATION_TICKER;
import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_NOTIFICATION_TITLE; import static gr.thmmy.mthmmy.services.DownloadService.EXTRA_NOTIFICATION_TITLE;
import static gr.thmmy.mthmmy.services.DownloadService.STARTED;
public class Receiver extends BroadcastReceiver { public class Receiver extends BroadcastReceiver {
public Receiver() { public Receiver() {
@ -29,6 +31,7 @@ public class Receiver extends BroadcastReceiver {
{ {
Bundle extras = intent.getExtras(); Bundle extras = intent.getExtras();
int id = extras.getInt(EXTRA_DOWNLOAD_ID); int id = extras.getInt(EXTRA_DOWNLOAD_ID);
String state = extras.getString(EXTRA_DOWNLOAD_STATE, "NONE");
String title = extras.getString(EXTRA_NOTIFICATION_TITLE); String title = extras.getString(EXTRA_NOTIFICATION_TITLE);
String text =extras.getString(EXTRA_NOTIFICATION_TEXT); String text =extras.getString(EXTRA_NOTIFICATION_TEXT);
String ticker =extras.getString(EXTRA_NOTIFICATION_TICKER); String ticker =extras.getString(EXTRA_NOTIFICATION_TICKER);
@ -36,9 +39,11 @@ public class Receiver extends BroadcastReceiver {
builder.setContentTitle(title) builder.setContentTitle(title)
.setContentText(text) .setContentText(text)
.setTicker(ticker) .setTicker(ticker)
.setAutoCancel(true) .setAutoCancel(true) //???
.setSmallIcon(R.mipmap.ic_launcher) .setSmallIcon(R.mipmap.ic_launcher);
;
if(state.equals(STARTED))
builder.setOngoing(true);
Notification notification = builder.build(); Notification notification = builder.build();
notificationManager.notify(id, notification); notificationManager.notify(id, notification);

32
app/src/main/java/gr/thmmy/mthmmy/services/DownloadService.java
View File

@ -34,10 +34,16 @@ public class DownloadService extends IntentService {
public static final String EXTRA_DOWNLOAD_URL = "gr.thmmy.mthmmy.services.extra.DOWNLOAD_URL"; public static final String EXTRA_DOWNLOAD_URL = "gr.thmmy.mthmmy.services.extra.DOWNLOAD_URL";
public static final String EXTRA_DOWNLOAD_ID = "gr.thmmy.mthmmy.services.extra.DOWNLOAD_ID"; public static final String EXTRA_DOWNLOAD_ID = "gr.thmmy.mthmmy.services.extra.DOWNLOAD_ID";
public static final String EXTRA_DOWNLOAD_STATE = "gr.thmmy.mthmmy.services.extra.DOWNLOAD_STATE";
public static final String EXTRA_NOTIFICATION_TITLE = "gr.thmmy.mthmmy.services.extra.NOTIFICATION_TITLE"; public static final String EXTRA_NOTIFICATION_TITLE = "gr.thmmy.mthmmy.services.extra.NOTIFICATION_TITLE";
public static final String EXTRA_NOTIFICATION_TEXT = "gr.thmmy.mthmmy.services.extra.NOTIFICATION_TEXT"; public static final String EXTRA_NOTIFICATION_TEXT = "gr.thmmy.mthmmy.services.extra.NOTIFICATION_TEXT";
public static final String EXTRA_NOTIFICATION_TICKER = "gr.thmmy.mthmmy.services.extra.NOTIFICATION_TICKER"; public static final String EXTRA_NOTIFICATION_TICKER = "gr.thmmy.mthmmy.services.extra.NOTIFICATION_TICKER";
public static final String STARTED = "Started";
public static final String COMPLETED = "Completed";
public static final String FAILED = "Failed";
public DownloadService() { public DownloadService() {
super("DownloadService"); super("DownloadService");
@ -137,13 +143,13 @@ public class DownloadService extends IntentService {
trueName = file.getName(); trueName = file.getName();
Report.v(TAG, "Started saving file " + trueName); Report.v(TAG, "Started saving file " + trueName);
sendNotification("Started", trueName); sendNotification(downloadId, STARTED, trueName);
sink = Okio.buffer(Okio.sink(file)); sink = Okio.buffer(Okio.sink(file));
sink.writeAll(response.body().source()); sink.writeAll(response.body().source());
sink.flush(); sink.flush();
Report.i(TAG, "Download OK!"); Report.i(TAG, "Download OK!");
sendNotification("Completed", trueName); sendNotification(downloadId, COMPLETED, trueName);
} }
else else
Report.e(TAG, "Response not a binary!"); Report.e(TAG, "Response not a binary!");
@ -152,17 +158,17 @@ public class DownloadService extends IntentService {
Report.e(TAG, "FileNotFound", e); Report.e(TAG, "FileNotFound", e);
Report.i(TAG, "Download failed..."); Report.i(TAG, "Download failed...");
if(trueName!=null) if(trueName!=null)
sendNotification("Failed", trueName); sendNotification(downloadId, FAILED, trueName);
else else
sendNotification("Failed", "file"); sendNotification(downloadId, FAILED, "file");
} }
catch (IOException e){ catch (IOException e){
Report.e(TAG, "IOException", e); Report.e(TAG, "IOException", e);
Report.i(TAG, "Download failed..."); Report.i(TAG, "Download failed...");
if(trueName!=null) if(trueName!=null)
sendNotification("Failed", trueName); sendNotification(downloadId, FAILED, trueName);
else else
sendNotification("Failed", "file"); sendNotification(downloadId, FAILED, "file");
} finally { } finally {
if (sink!= null) { if (sink!= null) {
try { try {
@ -174,27 +180,33 @@ public class DownloadService extends IntentService {
} }
} }
private void sendNotification(String type, @NonNull String fileName) private void sendNotification(int downloadId, String type, @NonNull String fileName)
{ {
switch (type) { switch (type) {
case "Started": { case STARTED: {
Intent intent = new Intent(ACTION_DOWNLOAD); Intent intent = new Intent(ACTION_DOWNLOAD);
intent.putExtra(EXTRA_DOWNLOAD_ID, downloadId);
intent.putExtra(EXTRA_DOWNLOAD_STATE, STARTED);
intent.putExtra(EXTRA_NOTIFICATION_TITLE, "Download Started"); intent.putExtra(EXTRA_NOTIFICATION_TITLE, "Download Started");
intent.putExtra(EXTRA_NOTIFICATION_TEXT, "\"" + fileName + "\" downloading..."); intent.putExtra(EXTRA_NOTIFICATION_TEXT, "\"" + fileName + "\" downloading...");
intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Downloading..."); intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Downloading...");
sendBroadcast(intent); sendBroadcast(intent);
break; break;
} }
case "Completed": { case COMPLETED: {
Intent intent = new Intent(ACTION_DOWNLOAD); Intent intent = new Intent(ACTION_DOWNLOAD);
intent.putExtra(EXTRA_DOWNLOAD_ID, downloadId);
intent.putExtra(EXTRA_DOWNLOAD_STATE, COMPLETED);
intent.putExtra(EXTRA_NOTIFICATION_TITLE, "Download Completed"); intent.putExtra(EXTRA_NOTIFICATION_TITLE, "Download Completed");
intent.putExtra(EXTRA_NOTIFICATION_TEXT, "\"" + fileName + "\" finished downloading."); intent.putExtra(EXTRA_NOTIFICATION_TEXT, "\"" + fileName + "\" finished downloading.");
intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Download Completed"); intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Download Completed");
sendBroadcast(intent); sendBroadcast(intent);
break; break;
} }
case "Failed": { case FAILED: {
Intent intent = new Intent(ACTION_DOWNLOAD); Intent intent = new Intent(ACTION_DOWNLOAD);
intent.putExtra(EXTRA_DOWNLOAD_ID, downloadId);
intent.putExtra(EXTRA_DOWNLOAD_STATE, FAILED);
intent.putExtra(EXTRA_NOTIFICATION_TITLE, "Download Failed"); intent.putExtra(EXTRA_NOTIFICATION_TITLE, "Download Failed");
intent.putExtra(EXTRA_NOTIFICATION_TEXT, "\"" + fileName + "\" failed."); intent.putExtra(EXTRA_NOTIFICATION_TEXT, "\"" + fileName + "\" failed.");
intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Download Failed"); intent.putExtra(EXTRA_NOTIFICATION_TICKER, "Download Failed");

Write Preview
Loading…
Cancel
Save