Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix last long lines in UpdateService

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-04-05 23:24:39 +02:00
parent 9bec554d2f
commit 2c6ed51a35
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/fdroid/fdroid/UpdateService.java
View File

@ -178,7 +178,8 @@ public class UpdateService extends IntentService {
if (Build.VERSION.SDK_INT <= 10) { if (Build.VERSION.SDK_INT <= 10) {
Intent pendingIntent = new Intent(this, MainActivity.class); Intent pendingIntent = new Intent(this, MainActivity.class);
pendingIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); pendingIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
notificationBuilder.setContentIntent(PendingIntent.getActivity(this, 0, pendingIntent, PendingIntent.FLAG_UPDATE_CURRENT)); notificationBuilder.setContentIntent(
PendingIntent.getActivity(this, 0, pendingIntent, PendingIntent.FLAG_UPDATE_CURRENT));
} }
} }
@ -526,11 +527,13 @@ public class UpdateService extends IntentService {
} }
String message; String message;
if (totalBytes == -1) { if (totalBytes == -1) {
message = context.getString(R.string.status_download_unknown_size, updater.indexUrl, downloadedSizeFriendly); message = context.getString(R.string.status_download_unknown_size,
updater.indexUrl, downloadedSizeFriendly);
percent = -1; percent = -1;
} else { } else {
String totalSizeFriendly = Utils.getFriendlySize(totalBytes); String totalSizeFriendly = Utils.getFriendlySize(totalBytes);
message = context.getString(R.string.status_download, updater.indexUrl, downloadedSizeFriendly, totalSizeFriendly, percent); message = context.getString(R.string.status_download,
updater.indexUrl, downloadedSizeFriendly, totalSizeFriendly, percent);
} }
sendStatus(context, STATUS_INFO, message, percent); sendStatus(context, STATUS_INFO, message, percent);
} }
@ -544,7 +547,8 @@ public class UpdateService extends IntentService {
if (totalBytes > 0) { if (totalBytes > 0) {
percent = (int) (bytesRead / (totalBytes * 100L)); percent = (int) (bytesRead / (totalBytes * 100L));
} }
String message = context.getString(R.string.status_processing_xml_percent, updater.indexUrl, downloadedSize, totalSize, percent); String message = context.getString(R.string.status_processing_xml_percent,
updater.indexUrl, downloadedSize, totalSize, percent);
sendStatus(context, STATUS_INFO, message, percent); sendStatus(context, STATUS_INFO, message, percent);
} }