extract string resources
This commit is contained in:
David Luhmer
parent
3971416d15
commit
71fa993608
4 changed files with 33 additions and 47 deletions
|
|
@ -76,7 +76,7 @@ public class NextcloudNotificationManager {
|
|||
PendingIntent pIntent = PendingIntent.getActivity(context, 0, intentNewsReader, 0);
|
||||
NotificationCompat.Builder mNotificationDownloadImages = new NotificationCompat.Builder(context, channelId)
|
||||
.setContentTitle(context.getResources().getString(R.string.app_name))
|
||||
.setContentText("Downloading images for offline usage")
|
||||
.setContentText(context.getString(R.string.notification_download_images_offline))
|
||||
.setSmallIcon(R.drawable.ic_notification)
|
||||
.setContentIntent(pIntent)
|
||||
.setAutoCancel(true)
|
||||
|
|
@ -109,7 +109,7 @@ public class NextcloudNotificationManager {
|
|||
PendingIntent pIntent = PendingIntent.getActivity(context, 0, intentNewsReader, 0);
|
||||
NotificationCompat.Builder mNotificationWebPages = new NotificationCompat.Builder(context, channelId)
|
||||
.setContentTitle(context.getResources().getString(R.string.app_name))
|
||||
.setContentText("Downloading webpages for offline usage")
|
||||
.setContentText(context.getString(R.string.notification_download_articles_offline))
|
||||
.setSmallIcon(R.drawable.ic_notification)
|
||||
.setContentIntent(pIntent)
|
||||
.setAutoCancel(true)
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ import java.util.List;
|
|||
import java.util.Random;
|
||||
|
||||
import de.greenrobot.dao.query.LazyList;
|
||||
import de.luhmer.owncloudnewsreader.R;
|
||||
import de.luhmer.owncloudnewsreader.async_tasks.DownloadImageHandler;
|
||||
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
|
||||
import de.luhmer.owncloudnewsreader.database.model.Feed;
|
||||
|
|
@ -170,7 +171,7 @@ public class DownloadImagesService extends JobIntentService {
|
|||
//RemoveOldImages();
|
||||
} else {
|
||||
mNotificationDownloadImages
|
||||
.setContentText((count + 1) + "/" + maxCount + " - Downloading Images for offline usage")
|
||||
.setContentText((count + 1) + "/" + maxCount + " - " + getString(R.string.notification_download_images_offline))
|
||||
.setProgress(maxCount, count + 1, false);
|
||||
|
||||
mNotificationManager.notify(NOTIFICATION_ID, mNotificationDownloadImages.build());
|
||||
|
|
|
|||
|
|
@ -117,13 +117,10 @@ public class DownloadWebPageService extends Service {
|
|||
private void runOnMainThreadAndWait(final Runnable runnable) throws InterruptedException {
|
||||
synchronized(runnable) {
|
||||
Handler handler = new Handler(Looper.getMainLooper());
|
||||
handler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
runnable.run();
|
||||
synchronized (runnable) {
|
||||
runnable.notifyAll();
|
||||
}
|
||||
handler.post(() -> {
|
||||
runnable.run();
|
||||
synchronized (runnable) {
|
||||
runnable.notifyAll();
|
||||
}
|
||||
});
|
||||
runnable.wait(); // unlocks runnable while waiting
|
||||
|
|
@ -210,22 +207,19 @@ public class DownloadWebPageService extends Service {
|
|||
//Log.v(TAG, "Loading page:");
|
||||
initWebView();
|
||||
loadUrlInWebViewAndWait();
|
||||
} /* else {
|
||||
} else {
|
||||
Log.v(TAG, "Already cached article: " + url);
|
||||
} */
|
||||
}
|
||||
}
|
||||
updateNotificationProgress();
|
||||
}
|
||||
|
||||
private void initWebView() {
|
||||
try {
|
||||
runOnMainThreadAndWait(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
webView = new WebView(DownloadWebPageService.this);
|
||||
webView.setWebViewClient(new DownloadImageWebViewClient(lock));
|
||||
webView.setWebChromeClient(new DownloadImageWebViewChromeClient());
|
||||
}
|
||||
runOnMainThreadAndWait(() -> {
|
||||
webView = new WebView(DownloadWebPageService.this);
|
||||
webView.setWebViewClient(new DownloadImageWebViewClient(lock));
|
||||
webView.setWebChromeClient(new DownloadImageWebViewChromeClient());
|
||||
});
|
||||
} catch (InterruptedException e) {
|
||||
Log.e(TAG, "Error while setting up WebView", e);
|
||||
|
|
@ -234,11 +228,9 @@ public class DownloadWebPageService extends Service {
|
|||
|
||||
private void loadUrlInWebViewAndWait() {
|
||||
try {
|
||||
runOnMainThreadAndWait(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
webView.loadUrl(url);
|
||||
}
|
||||
runOnMainThreadAndWait(() -> {
|
||||
Log.d(TAG, "downloading website for url: " + url);
|
||||
webView.loadUrl(url);
|
||||
});
|
||||
lock.wait();
|
||||
} catch (InterruptedException e) {
|
||||
|
|
@ -287,28 +279,17 @@ public class DownloadWebPageService extends Service {
|
|||
}
|
||||
|
||||
private void saveWebArchive(final WebView view, final String url) {
|
||||
new Thread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
delayedRunOnMainThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
// Can't store directly on external dir.. (workaround -> store on internal storage first and move then))
|
||||
final File webArchive = getWebPageArchiveFileForUrl(DownloadWebPageService.this, url);
|
||||
final File webArchiveExternalStorage = getWebPageArchiveFileForUrl(DownloadWebPageService.this, url);
|
||||
view.saveWebArchive(webArchive.getAbsolutePath(), false, new ValueCallback<String>() {
|
||||
@Override
|
||||
public void onReceiveValue(String value) {
|
||||
// Move file to external storage once done writing
|
||||
webArchive.renameTo(webArchiveExternalStorage);
|
||||
//boolean success = webArchive.renameTo(webArchiveExternalStorage);
|
||||
//Log.v(TAG, "Move succeeded: " + success);
|
||||
}
|
||||
});
|
||||
}
|
||||
}, 2000);
|
||||
}
|
||||
}).start();
|
||||
new Thread(() -> delayedRunOnMainThread(() -> {
|
||||
// Can't store directly on external dir.. (workaround -> store on internal storage first and move then))
|
||||
final File webArchive = getWebPageArchiveFileForUrl(DownloadWebPageService.this, url);
|
||||
final File webArchiveExternalStorage = getWebPageArchiveFileForUrl(DownloadWebPageService.this, url);
|
||||
view.saveWebArchive(webArchive.getAbsolutePath(), false, value -> {
|
||||
// Move file to external storage once done writing
|
||||
webArchive.renameTo(webArchiveExternalStorage);
|
||||
//boolean success = webArchive.renameTo(webArchiveExternalStorage);
|
||||
//Log.v(TAG, "Move succeeded: " + success);
|
||||
});
|
||||
}, 2000)).start();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -324,7 +305,7 @@ public class DownloadWebPageService extends Service {
|
|||
EventBus.getDefault().post(new StopWebArchiveDownloadEvent());
|
||||
} else {
|
||||
mNotificationWebPages
|
||||
.setContentText((current) + "/" + totalCount + " - Downloading Images for offline usage")
|
||||
.setContentText((current) + "/" + totalCount + " - " + getString(R.string.notification_download_articles_offline))
|
||||
.setProgress(totalCount, current, false);
|
||||
|
||||
mNotificationManager.notify(NOTIFICATION_ID, mNotificationWebPages.build());
|
||||
|
|
|
|||
|
|
@ -52,6 +52,10 @@
|
|||
</plurals>
|
||||
|
||||
|
||||
<!-- notifications -->
|
||||
<string name="notification_download_articles_offline">Downloading articles for offline usage</string>
|
||||
<string name="notification_download_images_offline">Downloading images for offline usage</string>
|
||||
|
||||
<!-- Add new feed -->
|
||||
<string name="hint_feed_url">Feed URL</string>
|
||||
<string name="action_add_feed">Add feed</string>
|
||||
|
|
|
|||
Loading…
Reference in a new issue