diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java index b11693781..ce8d4eb42 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java @@ -7,6 +7,7 @@ import android.app.DownloadManager; import android.content.Context; import android.net.Uri; import android.os.Environment; +import android.widget.Toast; import com.vk.core.util.AlertDialogs; import com.vk.dto.common.ImageSize; @@ -26,11 +27,12 @@ public class StoryDownloader{ request.setTitle("photo" + story.E.a); request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DCIM, "/Stories/photo" + story.E.a + ".jpg"); ((DownloadManager) getContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request); - return; } + // if story is a video - if(story.M1() && story.F != null){ - downloadVideo(story.F, getContext()); + if(story.F != null){ + downloadVideo(story.F, null); + return; } }; } diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java index a92311a10..0532891e7 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java @@ -1,6 +1,7 @@ package ru.vtosters.lite.downloaders; import static ru.vtosters.lite.net.Request.makeRequest; +import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Globals.getUserToken; @@ -10,6 +11,7 @@ import android.app.ProgressDialog; import android.content.Context; import android.net.Uri; import android.os.Environment; +import android.util.Log; import android.widget.Toast; import com.vk.core.util.ToastUtils; @@ -68,6 +70,17 @@ public class VideoDownloader{ max[i] = list.get(i); } + if(context == null){ + var url = urls.get(urls.size() - 1); + + DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url)); + request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); + request.setTitle(videoFile.toString()); + request.setDestinationInExternalPublicDir(Environment.DIRECTORY_MOVIES, videoFile + ".mp4"); + ((DownloadManager) getContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request); + return; + } + var builder = new AlertDialog.Builder(context); builder.setItems(max, ((dialog, which) -> { var url = urls.get(which);