From ee0827989b6cb21d035f34c7d87f5d110fa736da Mon Sep 17 00:00:00 2001
From: "mudhayarajan.2013@gmail.com" <mudhayarajan.2013@gmail.com>
Date: Fri, 17 Dec 2021 21:56:03 +0530
Subject: [PATCH] Update to version 3.1.2(beta)

---
 .idea/deploymentTargetDropDown.xml            |  16 ++
 .idea/misc.xml                                |   9 +-
 app/build.gradle                              |   8 +-
 app/src/main/AndroidManifest.xml              |   3 +-
 .../java/com/mugames/vidsnap/VidSnapApp.java  |  10 +-
 .../com/mugames/vidsnap/database/History.java |   5 +-
 .../vidsnap/database/HistoryDatabase.java     |  93 +++-----
 .../mugames/vidsnap/extractor/Facebook.java   |  58 ++---
 .../mugames/vidsnap/extractor/Instagram.java  |   4 +-
 .../mugames/vidsnap/extractor/Periscope.java  |   4 +-
 .../com/mugames/vidsnap/extractor/Twitch.java |   2 +-
 .../mugames/vidsnap/extractor/Twitter.java    |  14 +-
 .../mugames/vidsnap/extractor/YouTube.java    |  27 +--
 .../vidsnap/extractor/status/WhatsApp.java    |  84 ++++---
 .../main/java/com/mugames/vidsnap/m3u8.java   |  16 +-
 .../mugames/vidsnap/network/Downloader.java   | 191 ++++++++++-----
 .../mugames/vidsnap/network/HttpRequest.java  |   6 +-
 .../com/mugames/vidsnap/network/Response.java |  46 ++++
 .../mugames/vidsnap/postprocessor/FFMPEG.java |   8 +-
 .../com/mugames/vidsnap/storage/AppPref.java  |  22 +-
 .../com/mugames/vidsnap/storage/FileUtil.java |  13 +-
 .../vidsnap/ui/activities/MainActivity.java   | 219 +++++++++---------
 .../vidsnap/ui/adapters/DownloadAdapter.java  |  48 ++--
 .../ui/adapters/DownloadableAdapter.java      |  10 +-
 .../ui/fragments/DownloadFragment.java        |   5 +-
 .../vidsnap/ui/fragments/HistoryFragment.java |  15 --
 .../vidsnap/ui/fragments/LoginFragment.java   |  20 +-
 .../vidsnap/ui/fragments/QualityFragment.java |  37 ++-
 .../vidsnap/ui/fragments/StatusFragment.java  |  33 +--
 .../vidsnap/ui/fragments/VideoFragment.java   | 108 ++++++---
 .../ui/viewmodels/DownloadViewModel.java      |  16 +-
 .../ui/viewmodels/MainActivityViewModel.java  |  80 +++++--
 .../ui/viewmodels/VideoFragmentViewModel.java |  24 +-
 .../vidsnap/utility/DownloadReceiver.java     |  76 +++---
 .../com/mugames/vidsnap/utility/Statics.java  |   7 +
 .../vidsnap/utility/UtilityInterface.java     |   7 +-
 .../utility/bundles/DownloadDetails.java      |  36 ++-
 .../res/drawable/circular_progressbar.xml     |  36 +++
 .../res/layout/fragment_downloading_item.xml  | 111 +++++----
 .../layout/fragment_quality_list_dialog.xml   |  32 ++-
 app/src/main/res/values/strings.xml           |   1 +
 build.gradle                                  |   2 +-
 ffmpeg-kit-android-lib/build.gradle           |   2 -
 43 files changed, 991 insertions(+), 573 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 app/src/main/java/com/mugames/vidsnap/network/Response.java
 create mode 100644 app/src/main/res/drawable/circular_progressbar.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..0f220b4
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetsSelectedWithDialog>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="192.168.110.33:5555" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetsSelectedWithDialog>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b5fd42b..a468d1d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,22 +4,27 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/drawable/check_circle.xml" value="0.21851851851851853" />
+        <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/drawable/circular_progressbar.xml" value="0.2703125" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/drawable/downloadable_foreground.xml" value="0.1" />
+        <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/drawable/ic_arrow_back.xml" value="0.12708333333333333" />
+        <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/drawable/ic_cancel.xml" value="0.12708333333333333" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/drawable/ic_play_circle.xml" value="0.21851851851851853" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/activity_contact.xml" value="0.25416666666666665" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/activity_main.xml" value="0.25416666666666665" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/activity_main_preview.xml" value="0.25416666666666665" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/activity_report.xml" value="0.25416666666666665" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/activity_share.xml" value="0.25416666666666665" />
+        <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/circular_download.xml" value="0.25416666666666665" />
+        <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/circular_download_dialog.xml" value="0.264" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/downloadable_item.xml" value="0.25416666666666665" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_downloading.xml" value="0.23796296296296296" />
-        <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_downloading_item.xml" value="0.23796296296296296" />
+        <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_downloading_item.xml" value="0.264" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_history.xml" value="0.23796296296296296" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_history_item.xml" value="0.25416666666666665" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_home.xml" value="0.25416666666666665" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_login.xml" value="0.25416666666666665" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_no_record.xml" value="0.25416666666666665" />
-        <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_quality_list_dialog.xml" value="0.23796296296296296" />
+        <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_quality_list_dialog.xml" value="0.264" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_quality_list_dialog_item.xml" value="0.25416666666666665" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_status.xml" value="0.25416666666666665" />
         <entry key="..\:/PROJECTS/AndroidStudio/VidSnap/app/src/main/res/layout/fragment_status_list.xml" value="0.25416666666666665" />
diff --git a/app/build.gradle b/app/build.gradle
index f2787b5..31952e8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 31
         versionCode 8
-        versionName "3.1.1"
+        versionName "3.1.2(beta)"
         multiDexEnabled true
 
 
@@ -66,7 +66,7 @@ dependencies {
     implementation "androidx.activity:activity:1.3.1"
     implementation "androidx.fragment:fragment:1.3.6"
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -76,8 +76,9 @@ dependencies {
 
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'com.google.firebase:firebase-config:21.0.1'
-    implementation 'com.google.firebase:firebase-database:20.0.1'
+    implementation 'com.google.firebase:firebase-database:20.0.2'
 
+    //Fetch
     implementation "androidx.tonyodev.fetch2okhttp:xfetch2okhttp:3.1.6"
     implementation "androidx.tonyodev.fetch2:xfetch2:3.1.6"
 
@@ -87,6 +88,7 @@ dependencies {
 
     //Glide
     implementation 'com.github.bumptech.glide:glide:4.12.0'
+    implementation 'androidx.browser:browser:1.3.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
 
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5622217..b8aef4c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
 
     <application
         android:name=".VidSnapApp"
@@ -61,6 +60,8 @@
 
         <service android:name=".network.Downloader"/>
 
+        <receiver android:name=".utility.CancelDownloadReceiver"/>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
diff --git a/app/src/main/java/com/mugames/vidsnap/VidSnapApp.java b/app/src/main/java/com/mugames/vidsnap/VidSnapApp.java
index 116de46..a0dd55f 100644
--- a/app/src/main/java/com/mugames/vidsnap/VidSnapApp.java
+++ b/app/src/main/java/com/mugames/vidsnap/VidSnapApp.java
@@ -26,19 +26,21 @@
 
 public class VidSnapApp extends Application {
     public static final String NOTIFY_DOWNLOADING ="downloadingChannel";
+    public static final String NOTIFY_DOWNLOADER_SERVICE ="com.mugames.vidsnap.VidSnapApp.NOTIFY_DOWNLOADER_SERVICE";
     public static final String NOTIFY_DOWNLOADED ="downloadedChannel";
 
     @Override
     public void onCreate() {
         super.onCreate();
-        CreateNotificationChannel();
+        createNotificationChannel();
     }
 
-    void CreateNotificationChannel(){
+    void createNotificationChannel(){
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             List<NotificationChannel> channelList=new ArrayList<>();
-            channelList.add(new NotificationChannel(NOTIFY_DOWNLOADING,"Downloading Notification Channel", NotificationManager.IMPORTANCE_LOW));
-            channelList.add(new NotificationChannel(NOTIFY_DOWNLOADED,"Notify when downloaded", NotificationManager.IMPORTANCE_HIGH));
+            channelList.add(new NotificationChannel(NOTIFY_DOWNLOADING,"On going download", NotificationManager.IMPORTANCE_LOW));
+            channelList.add(new NotificationChannel(NOTIFY_DOWNLOADED,"Completed download", NotificationManager.IMPORTANCE_HIGH));
+            channelList.add(new NotificationChannel(NOTIFY_DOWNLOADER_SERVICE,"Downloader service indicator",NotificationManager.IMPORTANCE_LOW));
 
             NotificationManager notificationManager= (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
             notificationManager.createNotificationChannels(channelList);
diff --git a/app/src/main/java/com/mugames/vidsnap/database/History.java b/app/src/main/java/com/mugames/vidsnap/database/History.java
index b83951d..e9b76c1 100644
--- a/app/src/main/java/com/mugames/vidsnap/database/History.java
+++ b/app/src/main/java/com/mugames/vidsnap/database/History.java
@@ -20,6 +20,7 @@
 import android.net.Uri;
 import android.text.format.DateFormat;
 
+import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 import androidx.room.TypeConverters;
@@ -42,7 +43,8 @@ public class History {
     public String size;
     public String uriString;
     public String image;
-
+    @ColumnInfo(name = "source_url")
+    public String sourceUrl;
     public History() {}
 
 
@@ -53,6 +55,7 @@ public History(DownloadDetails details, Uri uri) {
         this.date = DateConverter.toDate( new Date().getTime());
         this.size = String.valueOf(details.videoSize);
         this.uriString = uri.toString();
+        sourceUrl = details.srcUrl;
         image = UtilityClass.bitmapToString(details.getThumbNail());
     }
 
diff --git a/app/src/main/java/com/mugames/vidsnap/database/HistoryDatabase.java b/app/src/main/java/com/mugames/vidsnap/database/HistoryDatabase.java
index c65f2c0..4af614a 100644
--- a/app/src/main/java/com/mugames/vidsnap/database/HistoryDatabase.java
+++ b/app/src/main/java/com/mugames/vidsnap/database/HistoryDatabase.java
@@ -17,8 +17,8 @@
 
 package com.mugames.vidsnap.database;
 
-import static com.mugames.vidsnap.ui.viewmodels.MainActivityViewModel.STATIC_CACHE;
-import static com.mugames.vidsnap.ui.viewmodels.MainActivityViewModel.db_name;
+import static com.mugames.vidsnap.storage.AppPref.STATIC_CACHE;
+import static com.mugames.vidsnap.storage.AppPref.db_name;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -36,8 +36,9 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
-@Database(entities = {History.class}, version = 3)
+@Database(entities = {History.class}, version = 4)
 public abstract class HistoryDatabase extends RoomDatabase {
 
 
@@ -49,20 +50,7 @@ public void migrate(@NonNull SupportSQLiteDatabase database) {
             database.execSQL("CREATE TABLE HISTORY_NEW (id INTEGER NOT NULL , fileName TEXT, fileType TEXT, source TEXT, date TEXT, size TEXT, uriString TEXT, image TEXT, PRIMARY KEY(id))");
             Cursor cursor = database.query("SELECT * FROM HISTORY");
             while (cursor.moveToNext()) {
-                int id = cursor.getInt(0);
-                String fileName = cursor.getString(1);
-                String fileType = cursor.getString(2);
-                String src = cursor.getString(3);
-                String date = cursor.getString(4);
-                String size = cursor.getString(5);
-                String uriString = cursor.getString(6);
-                byte[] thumbNail = cursor.getBlob(7);
-                int width = cursor.getInt(8);
-                int height = cursor.getInt(9);
-
-                fileType = fileType.replaceAll("\\.", "");
-                String thumbnailString = UtilityClass.bitmapToString(UtilityClass.bytesToBitmap(thumbNail, width, height));
-                String value = id + ",\"" + fileName + "\",\"" + fileType + "\",\"" + src + "\",\"" + date + "\",\"" + size + "\",\"" + uriString + "\",\"" + thumbnailString + "\"";
+                String value = migrateLogic1_3(cursor, 1, 2, 0);
                 database.execSQL("INSERT INTO HISTORY_NEW (id,fileName,fileType,source,date,size,uriString,image) VALUES(" + value + ")");
             }
             database.execSQL("DROP TABLE HISTORY");
@@ -70,28 +58,15 @@ public void migrate(@NonNull SupportSQLiteDatabase database) {
         }
     };
 
-    static Migration migration1_3 = new Migration(1, 3) {
+
+    static Migration migration2_3 = new Migration(2, 3) {
         @Override
         public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("CREATE TABLE HISTORY_NEW (id INTEGER NOT NULL , fileName TEXT, fileType TEXT, source TEXT, date INTEGER, size TEXT, uriString TEXT, image TEXT, PRIMARY KEY(id))");
+            database.execSQL("CREATE TABLE HISTORY_NEW (id INTEGER NOT NULL , fileName TEXT, fileType TEXT, source TEXT, date INTRGER, size TEXT, uriString TEXT, image TEXT, PRIMARY KEY(id))");
             Cursor cursor = database.query("SELECT * FROM HISTORY");
             int i = 0;
             while (cursor.moveToNext()) {
-                int id = cursor.getInt(0);
-                String fileName = cursor.getString(1);
-                String fileType = cursor.getString(2);
-                String src = cursor.getString(3);
-                String date = cursor.getString(4);
-                String size = cursor.getString(5);
-                String uriString = cursor.getString(6);
-                byte[] thumbNail = cursor.getBlob(7);
-                int width = cursor.getInt(8);
-                int height = cursor.getInt(9);
-
-                fileType = fileType.replaceAll("\\.", "");
-                String thumbnailString = UtilityClass.bitmapToString(UtilityClass.bytesToBitmap(thumbNail, width, height));
-                Long lDate = parseForDate(date, ++i);
-                String value = id + ",\"" + fileName + "\",\"" + fileType + "\",\"" + src + "\"," + lDate + ",\"" + size + "\",\"" + uriString + "\",\"" + thumbnailString + "\"";
+                String value = migrateLogic1_3(cursor, 2, 3, i++);
                 database.execSQL("INSERT INTO HISTORY_NEW (id,fileName,fileType,source,date,size,uriString,image) VALUES(" + value + ")");
             }
             database.execSQL("DROP TABLE HISTORY");
@@ -99,32 +74,40 @@ public void migrate(@NonNull SupportSQLiteDatabase database) {
         }
     };
 
-    static Migration migration2_3 = new Migration(2, 3) {
+    static Migration migration3_4 = new Migration(3, 4) {
         @Override
         public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("CREATE TABLE HISTORY_NEW (id INTEGER NOT NULL , fileName TEXT, fileType TEXT, source TEXT, date INTRGER, size TEXT, uriString TEXT, image TEXT, PRIMARY KEY(id))");
-            Cursor cursor = database.query("SELECT * FROM HISTORY");
-            int i = 0;
-            while (cursor.moveToNext()) {
-                int id = cursor.getInt(0);
-                String fileName = cursor.getString(1);
-                String fileType = cursor.getString(2);
-                String src = cursor.getString(3);
-                String date = cursor.getString(4);
-                Long lDate = parseForDate(date, i++);
-                String size = cursor.getString(5);
-                String uriString = cursor.getString(6);
-                String thumbnailString = cursor.getString(7);
-                String value = id + ",\"" + fileName + "\",\"" + fileType + "\",\"" + src + "\"," + lDate + ",\"" + size + "\",\"" + uriString + "\",\"" + thumbnailString + "\"";
-                database.execSQL("INSERT INTO HISTORY_NEW (id,fileName,fileType,source,date,size,uriString,image) VALUES(" + value + ")");
-            }
-            database.execSQL("DROP TABLE HISTORY");
-            database.execSQL("ALTER TABLE HISTORY_NEW RENAME TO HISTORY");
+            database.execSQL("Alter table history add column source_url TEXT");
         }
     };
 
+    static String migrateLogic1_3(Cursor cursor, int from, int to, int i) {
+        int id = cursor.getInt(0);
+        String fileName = cursor.getString(1);
+        String fileType = cursor.getString(2);
+        String src = cursor.getString(3);
+        String date = cursor.getString(4);
+        String size = cursor.getString(5);
+        String uriString = cursor.getString(6);
+        if (from == 1 && to == 2) {
+            byte[] thumbNail = cursor.getBlob(7);
+            int width = cursor.getInt(8);
+            int height = cursor.getInt(9);
+
+            fileType = fileType.replaceAll("\\.", "");
+            String thumbnailString = UtilityClass.bitmapToString(UtilityClass.bytesToBitmap(thumbNail, width, height));
+            return id + ",\"" + fileName + "\",\"" + fileType + "\",\"" + src + "\",\"" + date + "\",\"" + size + "\",\"" + uriString + "\",\"" + thumbnailString + "\"";
+        } else if (from == 2 && to == 3) {
+            Long lDate = parseForDate(date, i);
+            String thumbnailString = cursor.getString(7);
+
+            return id + ",\"" + fileName + "\",\"" + fileType + "\",\"" + src + "\"," + lDate + ",\"" + size + "\",\"" + uriString + "\",\"" + thumbnailString + "\"";
+        }
+        return null;
+    }
+
     private static Long parseForDate(String date, int index) {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
         try {
             Date date1 = simpleDateFormat.parse(date);
             return date1.getTime() + index;
@@ -141,7 +124,7 @@ public static HistoryDatabase getInstance(Context context) {
             synchronized (HistoryDatabase.class) {
                 if (instance == null) {
                     instance = Room.databaseBuilder(context.getApplicationContext(), HistoryDatabase.class, AppPref.getInstance(context).getCachePath(STATIC_CACHE) + db_name)
-                            .addMigrations(migration1_2, migration2_3, migration1_3)
+                            .addMigrations(migration1_2, migration2_3, migration3_4)
                             .build();
                 }
             }
diff --git a/app/src/main/java/com/mugames/vidsnap/extractor/Facebook.java b/app/src/main/java/com/mugames/vidsnap/extractor/Facebook.java
index 56ec3e1..3a59ca7 100644
--- a/app/src/main/java/com/mugames/vidsnap/extractor/Facebook.java
+++ b/app/src/main/java/com/mugames/vidsnap/extractor/Facebook.java
@@ -87,7 +87,7 @@ public void analyze(String url) {
 
     private void extractInfo() {
         url = url.replaceAll("://m.facebook\\.com/","://www.facebook.com/");
-        HttpRequest request = new HttpRequest(url,getDialogueInterface(),this::scratchWebPage);
+        HttpRequest request = new HttpRequest(url,getDialogueInterface(),response -> scratchWebPage(response.getResponse()));
         request.setType(HttpRequest.GET);
         request.setHeaders(headers);
         request.start();
@@ -98,7 +98,7 @@ void extractForceEng(){
         url = url.replaceAll("://www.facebook\\.com/","://en-gb.facebook.com/");
         HttpRequest request = new HttpRequest(url,getDialogueInterface(),response -> {
             tried_with_forceEng = true;
-            scratchWebPage(response);
+            scratchWebPage(response.getResponse());
         });
         request.setType(HttpRequest.GET);
         request.setHeaders(headers);
@@ -119,7 +119,7 @@ private void scratchWebPage(String webPage) {
 
             Object video_data = null;
 
-            if (!isNullOrEmpty(server_js_data)) {
+            if (isNonNullOrEmpty(server_js_data)) {
                 video_data = grab_video_data(new JSONObject(server_js_data).getJSONArray("instances"));
             }
 
@@ -130,12 +130,12 @@ private void scratchWebPage(String webPage) {
                     matcher = Pattern.compile(String.format("bigPipe\\.onPageletArrive\\((\\{.*?id\\s*:\\s*\\\"%s\\\".*?\\})\\);", PAGELET_REGEX)).matcher(webPage);
                     if (matcher.find()) server_js_data = matcher.group(1);
                 }
-                if (!isNullOrEmpty(server_js_data))
-                    video_data = grab_from_jsmods_instance(new JSONObject(server_js_data));
+                if (isNonNullOrEmpty(server_js_data))
+                    video_data = grabFromJSmodsInstance(new JSONObject(server_js_data));
             }
 
             if (video_data == null) {
-                video_data = grab_relay_prefetched_data_search_url(webPage);
+                video_data = grabRelayPrefetchedDataSearchUrl(webPage);
             }
 
             if(video_data == null){
@@ -202,7 +202,11 @@ void tryWithCookies(){
             trySignIn("Facebook requested you to sign-in. Without sign-in video can't be downloaded",
                     "https://www.facebook.com/login/",
                     new String[]{"https://m.facebook.com/login/save-device/?login_source=login#_=_", "https://m.facebook.com/?_rdr",
-                            "https://m.facebook.com/home.php?_rdr", "https://m.facebook.com/home.php"},
+                            "https://m.facebook.com/home.php?_rdr", "https://m.facebook.com/home.php",
+                            "https://m.facebook.com/?ref=dbl&_rdr",
+                            "https://m.facebook.com/?ref=dbl&_rdr#~!/home.php?ref=dbl",
+                            "https://m.facebook.com/?ref=dbl&_rdr#!/home.php?ref=dbl",
+                    },
                     cookies -> {
                         tryWithCookies();
                     });
@@ -211,16 +215,16 @@ void tryWithCookies(){
 
         tried_with_cookies=true;
         getDialogueInterface().show("Adding cookies...");
-        HttpRequest request = new HttpRequest(url,getDialogueInterface(), this::scratchWebPage);
+        HttpRequest request = new HttpRequest(url,getDialogueInterface(), response -> scratchWebPage(response.getResponse()));
         request.setCookies(getUserCookies());
         request.setType(HttpRequest.GET);
         request.setHeaders(headers);
         request.start();
     }
 
-    Object grab_relay_prefetched_data_search_url(String webpage){
+    Object grabRelayPrefetchedDataSearchUrl(String webpage){
         try {
-            JSONObject data = grab_relay_prefetched_data(webpage,new String[]{"\"dash_manifest\"","\"playable_url\""});
+            JSONObject data = grabRelayPrefetchedData(webpage,new String[]{"\"dash_manifest\"","\"playable_url\""});
             if(data!=null) {
                 JSONArray nodes = null;
                 try {
@@ -251,10 +255,10 @@ Object grab_relay_prefetched_data_search_url(String webpage){
                                 JSONArray ns = getArray_or_Null(UtilityClass.JSONGetter.getObj_or_Null(attachment, "all_subattachments"), "nodes");
                                 if (ns != null) {
                                     for (int l = 0; l < ns.length(); l++) {
-                                        parse_attachment(ns.getJSONObject(l), "media");
+                                        parseAttachment(ns.getJSONObject(l), "media");
                                     }
                                 }
-                                parse_attachment(attachment, "media");
+                                parseAttachment(attachment, "media");
                             } catch (JSONException e) {
                             }
                         }
@@ -266,7 +270,7 @@ Object grab_relay_prefetched_data_search_url(String webpage){
                 if (edges != null) {
                     for (int j = 0; j < edges.length(); j++) {
                         JSONObject edge = edges.getJSONObject(j);
-                        parse_attachment(edge, "node");
+                        parseAttachment(edge, "node");
                     }
                 }
 
@@ -280,7 +284,7 @@ Object grab_relay_prefetched_data_search_url(String webpage){
                     }
                     if (attachments != null) {
                         for (int j = 0; j < attachments.length(); j++) {
-                            parse_attachment(attachments.getJSONObject(j), "media");
+                            parseAttachment(attachments.getJSONObject(j), "media");
                         }
                     }
                     if (formats.mainFileURLs.isEmpty()) parse_graphql_video(video);
@@ -293,7 +297,7 @@ Object grab_relay_prefetched_data_search_url(String webpage){
         return null;
     }
     
-    String grab_relay_data(String webPage,String[] searchWords){
+    String grabRelayData(String webPage, String[] searchWords){
         Matcher m = Pattern.compile("handleWithCustomApplyEach\\(.*?,(.*)\\);").matcher(webPage);
         while (m.find()){
             Matcher m1=Pattern.compile("(\\{.*[^);]\\})\\);").matcher(Objects.requireNonNull(m.group(1)));
@@ -305,9 +309,9 @@ String grab_relay_data(String webPage,String[] searchWords){
         return null;
     }
 
-    JSONObject grab_relay_prefetched_data(String webPage,String[] filter){
-        String jsonString=grab_relay_data(webPage,filter);
-        if(!isNullOrEmpty(jsonString)) {
+    JSONObject grabRelayPrefetchedData(String webPage, String[] filter){
+        String jsonString= grabRelayData(webPage,filter);
+        if(isNonNullOrEmpty(jsonString)) {
             try {
                 JSONArray require = new JSONObject(jsonString).getJSONArray("require");
                 for (int i=0; i < require.length(); i++) {
@@ -322,7 +326,7 @@ JSONObject grab_relay_prefetched_data(String webPage,String[] filter){
         return null;
     }
 
-    void parse_attachment(JSONObject attachment,String key){
+    void parseAttachment(JSONObject attachment, String key){
 
         try {
             JSONObject media= UtilityClass.JSONGetter.getObj_or_Null(attachment,key);
@@ -335,7 +339,7 @@ void parse_attachment(JSONObject attachment,String key){
 
     void parse_graphql_video(JSONObject media){
         try {
-            String res = null;
+            String res;
             formats.thumbNailsURL.add(media.getJSONObject("thumbnailImage").getString("uri"));
 
             String title= getString_or_Null(media,"name");
@@ -344,7 +348,7 @@ void parse_graphql_video(JSONObject media){
 
             String dash_xml = getString_or_Null(media, "dash_manifest");
             if (dash_xml != null) {
-                Extract_From_dash(dash_xml);
+                extractFromDash(dash_xml);
             }
             res = media.get("width") + "x" + media.get("height");
             for (String suffix : new String[]{"", "_quality_hd"}) {
@@ -364,7 +368,7 @@ void parse_graphql_video(JSONObject media){
         }catch (JSONException e){}
     }
 
-    void Extract_From_dash(String xml){
+    void extractFromDash(String xml){
         xml=xml.replaceAll("x3C","<");
         xml=xml.replaceAll("\\\\\u003C","<");
 
@@ -412,8 +416,8 @@ void Extract_From_dash(String xml){
     }
 
 
-    Object grab_from_jsmods_instance(JSONObject js_data){
-        if(!isNullOrEmpty(String.valueOf(js_data))) {
+    Object grabFromJSmodsInstance(JSONObject js_data){
+        if(isNonNullOrEmpty(String.valueOf(js_data))) {
             try {
                 return grab_video_data(js_data.getJSONObject("jsmods").getJSONArray("instances"));
             } catch (JSONException e) {}
@@ -431,7 +435,7 @@ Object grab_video_data(JSONArray instance) {
 
                     String dash_xml= getString_or_Null(videoData,"dash_manifest");
                     if(dash_xml!=null){
-                        Extract_From_dash(dash_xml);
+                        extractFromDash(dash_xml);
                     }
 
                     for (String s:new String[]{"hd","sd"}){
@@ -459,7 +463,7 @@ Object grab_video_data(JSONArray instance) {
     }
 
 
-    boolean isNullOrEmpty(String s){
-        return s==null||s.isEmpty();
+    boolean isNonNullOrEmpty(String s){
+        return s != null && !s.isEmpty();
     }
 }
diff --git a/app/src/main/java/com/mugames/vidsnap/extractor/Instagram.java b/app/src/main/java/com/mugames/vidsnap/extractor/Instagram.java
index 158a123..fd92436 100644
--- a/app/src/main/java/com/mugames/vidsnap/extractor/Instagram.java
+++ b/app/src/main/java/com/mugames/vidsnap/extractor/Instagram.java
@@ -63,7 +63,7 @@ public void onReceivedCookies(String cookies) {
                 own_cookie = cookies;
                 HttpRequest request = new HttpRequest(url,getDialogueInterface(),response -> {
                     getDialogueInterface().show("Analysing");
-                    extractInfoShared(response);
+                    extractInfoShared(response.getResponse());
                 });
                 request.setType(HttpRequest.GET);
                 request.start();
@@ -132,7 +132,7 @@ void RequestWithCookies(String cookies) {
                     });
             return;
         }
-        HttpRequest request = new HttpRequest(httpURL,getDialogueInterface(),this::extractInfoShared);
+        HttpRequest request = new HttpRequest(httpURL,getDialogueInterface(),response -> extractInfoShared(response.getResponse()));
         request.setCookies(cookies);
         request.setType(HttpRequest.GET);
         request.start();
diff --git a/app/src/main/java/com/mugames/vidsnap/extractor/Periscope.java b/app/src/main/java/com/mugames/vidsnap/extractor/Periscope.java
index c858e8e..04bc251 100644
--- a/app/src/main/java/com/mugames/vidsnap/extractor/Periscope.java
+++ b/app/src/main/java/com/mugames/vidsnap/extractor/Periscope.java
@@ -65,7 +65,7 @@ public void extractInfo(String url) {
         HttpRequest request = new HttpRequest(String.format("https://api.periscope.tv/api/v2/accessVideoPublic?broadcast_id=%s", id),
                 extractor.getDialogueInterface(),response -> {
             try {
-                JSONObject stream = new JSONObject(response);
+                JSONObject stream = new JSONObject(response.getResponse());
                 JSONObject broadcast = stream.getJSONObject("broadcast");
                 data = extractData(broadcast);
                 ArrayList<String> video_urls = new ArrayList<>();
@@ -116,6 +116,6 @@ boolean nullOrEmpty(String s) {
 
 
     public void Download(String fileName, String path) {
-        //filled later
+        //TODO: Specific video download for periscope
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mugames/vidsnap/extractor/Twitch.java b/app/src/main/java/com/mugames/vidsnap/extractor/Twitch.java
index b910242..783035d 100644
--- a/app/src/main/java/com/mugames/vidsnap/extractor/Twitch.java
+++ b/app/src/main/java/com/mugames/vidsnap/extractor/Twitch.java
@@ -70,7 +70,7 @@ public void extractURLFromClips(String twitchURL, TwitchInfoInterface i){
         String data=String.format("{\"query\":\"{clip(slug:\\\"%s\\\"){broadcaster{displayName}createdAt curator{displayName id}durationSeconds id tiny:thumbnailURL(width:86,height:45)small:thumbnailURL(width:260,height:147)medium:thumbnailURL(width:480,height:272)title videoQualities{frameRate quality sourceURL}viewCount}}\"}",id);
         HttpRequest request = new HttpRequest("https://gql.twitch.tv/gql",dialogueInterface,response -> {
             try {
-                JSONObject clip=new JSONObject(response).getJSONObject("data").getJSONObject("clip");
+                JSONObject clip=new JSONObject(response.getResponse()).getJSONObject("data").getJSONObject("clip");
                 formats.thumbNailsURL.add(clip.getString("medium"));
                 JSONArray videoQualities =clip.getJSONArray("videoQualities");
                 formats.title= clip.getString("title");
diff --git a/app/src/main/java/com/mugames/vidsnap/extractor/Twitter.java b/app/src/main/java/com/mugames/vidsnap/extractor/Twitter.java
index a5c6e59..67df3b2 100644
--- a/app/src/main/java/com/mugames/vidsnap/extractor/Twitter.java
+++ b/app/src/main/java/com/mugames/vidsnap/extractor/Twitter.java
@@ -90,8 +90,8 @@ private void getToken() {
         getDialogueInterface().show("Getting Token");
         HttpRequest request = new HttpRequest(base_url+"guest/activate.json",getDialogueInterface(),response -> {
             try {
-                Log.d(TAG, "onReceive: " + new JSONObject(response).getString("guest_token"));
-                headers.put("x-guest-token", new JSONObject(response).getString("guest_token"));
+                Log.d(TAG, "onReceive: " + new JSONObject(response.getResponse()).getString("guest_token"));
+                headers.put("x-guest-token", new JSONObject(response.getResponse()).getString("guest_token"));
                 if (httpURL.contains("status")) extractVideo();
                 if (httpURL.contains("broadcasts")) extractBroadcasts();
 
@@ -105,7 +105,7 @@ private void getToken() {
     }
 
     void extractVideo() {
-        HttpRequest request = new HttpRequest(base_url+"statuses/show/"+tweetID+".json"+query,getDialogueInterface(),this::identifyDownloader);
+        HttpRequest request = new HttpRequest(base_url+"statuses/show/"+tweetID+".json"+query,getDialogueInterface(),response -> identifyDownloader(response.getResponse()));
         request.setType(HttpRequest.GET);
         request.setHeaders(headers);
         request.start();
@@ -180,7 +180,8 @@ private void identifyDownloader(String response){
 
     private void fromVMap(String url) {
 
-        HttpRequest request = new HttpRequest(url,getDialogueInterface(),response -> {
+        HttpRequest request = new HttpRequest(url,getDialogueInterface(),res -> {
+            String response = res.getResponse();
             Pattern pattern = Pattern.compile("(?<=<tw:videoVariants>)[\\s\\S]*(?=</tw:videoVariants>)");
             Matcher matcher = pattern.matcher(response);
             if (matcher.find()) {
@@ -258,7 +259,7 @@ String resolution(String url) {
     }
 
     void extractBroadcasts() {
-        HttpRequest request = new HttpRequest(String.format(base_url + "broadcasts/show.json?ids=%s", tweetID),getDialogueInterface(),this::parseBroadcastResponse);
+        HttpRequest request = new HttpRequest(String.format(base_url + "broadcasts/show.json?ids=%s", tweetID),getDialogueInterface(),response -> parseBroadcastResponse(response.getResponse()));
         request.setHeaders(headers);
         request.setType(HttpRequest.GET);
         request.start();
@@ -270,7 +271,8 @@ void parseBroadcastResponse(String response){
             info = extractInfo(broadcasts);
             String mediaKey = broadcasts.getString("media_key");
 
-            HttpRequest request = new HttpRequest(String.format(base_url + "live_video_stream/status/%s", mediaKey),getDialogueInterface(),response1 -> {
+            HttpRequest request = new HttpRequest(String.format(base_url + "live_video_stream/status/%s", mediaKey),getDialogueInterface(),res1 -> {
+                String response1 = res1.getResponse();
                 Pattern pattern = Pattern.compile("\\{[\\s\\S]+\\}");
                 Matcher matcher = pattern.matcher(response1);
                 matcher.find();
diff --git a/app/src/main/java/com/mugames/vidsnap/extractor/YouTube.java b/app/src/main/java/com/mugames/vidsnap/extractor/YouTube.java
index 8cca1ad..bb71471 100644
--- a/app/src/main/java/com/mugames/vidsnap/extractor/YouTube.java
+++ b/app/src/main/java/com/mugames/vidsnap/extractor/YouTube.java
@@ -76,8 +76,6 @@ public class YouTube extends Extractor {
 
     int attempt = 0;
 
-    final boolean[] gotMedia = new boolean[]{false, false};//0-audio ;1-video
-
     boolean isVideoDecrypted;
     boolean isAudioDecrypted;
 
@@ -94,7 +92,7 @@ public void analyze(String url) {
             getDialogueInterface().error("URL Seems to be wrong", null);
             return;
         }
-        HttpRequest request = new HttpRequest(get_video_Info + videoID, getDialogueInterface(), response -> videoInfo(UtilityClass.decodeHTML(response)));
+        HttpRequest request = new HttpRequest(get_video_Info + videoID, getDialogueInterface(), response -> videoInfo(UtilityClass.decodeHTML(response.getResponse())));
         request.setType(HttpRequest.GET);
         request.start();
 
@@ -133,14 +131,14 @@ public void videoInfo(String info) {
 
         getDialogueInterface().show("Downloading Player");
         if (jsFunctionName == null || jsFunctionName.isEmpty())
-            getJSFile(new JSDownloaded() {
+            fetchJSFile(new JSDownloaded() {
                 @Override
                 public void onDone() {
                     getDialogueInterface().show("Analysing data");
-                    ExtractInfo(info);
+                    extractInfo(info);
                 }
             });
-        else ExtractInfo(info);
+        else extractInfo(info);
 
     }
 
@@ -149,14 +147,17 @@ private void fetchFromWebPage() {
         String YT_INITIAL_BOUNDARY_RE = "(?:var\\s+meta|</script|\\n)";
         String YT_INITIAL_PLAYER_RESPONSE_RE = "ytInitialPlayerResponse\\s*=\\s*(\\{.+?\\})\\s*;";
         HttpRequest request = new HttpRequest("https://www.youtube.com/watch?v=" + videoID + "&bpctr=9999999999&has_verified=1", getDialogueInterface(), response -> {
-            Matcher matcher = Pattern.compile(String.format("%s\\s*%s", YT_INITIAL_PLAYER_RESPONSE_RE, YT_INITIAL_BOUNDARY_RE)).matcher(response);
+            if(response.getResponse()==null) {
+                getDialogueInterface().error("Some thing went wrong\nPlease try again", response.getException());
+            }
+            Matcher matcher = Pattern.compile(String.format("%s\\s*%s", YT_INITIAL_PLAYER_RESPONSE_RE, YT_INITIAL_BOUNDARY_RE)).matcher(response.getResponse());
             if (matcher.find()) videoInfo(matcher.group(1));
         });
         request.setType(HttpRequest.GET);
         request.start();
     }
 
-    void ExtractInfo(String decoded) {
+    void extractInfo(String decoded) {
 
         try {
             JSONObject jsonObject = new JSONObject(UtilityClass.parseQueryString(decoded));
@@ -331,17 +332,17 @@ void alternateURLs(int attempts) {
             getDialogueInterface().error("URL Seems to be wrong", null);
             return;
         }
-        HttpRequest request = new HttpRequest(dataURL[attempts], getDialogueInterface(), response -> videoInfo(UtilityClass.decodeHTML(response)));
+        HttpRequest request = new HttpRequest(dataURL[attempts], getDialogueInterface(), response -> videoInfo(UtilityClass.decodeHTML(response.getResponse())));
         request.setType(HttpRequest.GET);
         request.start();
     }
 
 
-    void getJSFile(JSDownloaded jsDownloaded) {
+    void fetchJSFile(JSDownloaded jsDownloaded) {
         ResponseCallBack responseCallBack = embedResponse -> {
             for (String i : PLAYER_REGEXS) {
                 Pattern pattern = Pattern.compile(i);
-                Matcher matcher = pattern.matcher(embedResponse);
+                Matcher matcher = pattern.matcher(embedResponse.getResponse());
                 if (matcher.find()) {
                     String player_url = matcher.group(1);
                     player_url = player_url==null?"":player_url.replaceAll("\"", "");
@@ -349,10 +350,10 @@ void getJSFile(JSDownloaded jsDownloaded) {
                     HttpRequest request = new HttpRequest(YT_URL+player_url,getDialogueInterface(),response -> {
                         for (String j : FUNCTION_REGEX) {
                             Pattern funPattern = Pattern.compile(j);
-                            Matcher funMatcher = funPattern.matcher(response);
+                            Matcher funMatcher = funPattern.matcher(response.getResponse());
                             if (funMatcher.find()) {
                                 jsFunctionName = funMatcher.group(1);
-                                jsCode = response;
+                                jsCode = response.getResponse();
                                 jsDownloaded.onDone();
                                 break;
                             }
diff --git a/app/src/main/java/com/mugames/vidsnap/extractor/status/WhatsApp.java b/app/src/main/java/com/mugames/vidsnap/extractor/status/WhatsApp.java
index 83f328e..2aa86f7 100644
--- a/app/src/main/java/com/mugames/vidsnap/extractor/status/WhatsApp.java
+++ b/app/src/main/java/com/mugames/vidsnap/extractor/status/WhatsApp.java
@@ -32,32 +32,29 @@
 
 package com.mugames.vidsnap.extractor.status;
 
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.ThumbnailUtils;
+import android.net.Uri;
 import android.os.Build;
-import android.os.CancellationSignal;
-import android.provider.MediaStore;
-import android.util.Size;
 import android.webkit.MimeTypeMap;
 
+import androidx.annotation.RequiresApi;
 import androidx.core.content.FileProvider;
+import androidx.documentfile.provider.DocumentFile;
 
 import com.mugames.vidsnap.BuildConfig;
 import com.mugames.vidsnap.extractor.Extractor;
+import com.mugames.vidsnap.storage.AppPref;
 import com.mugames.vidsnap.storage.FileUtil;
 import com.mugames.vidsnap.utility.MIMEType;
 import com.mugames.vidsnap.utility.Statics;
 
 import java.io.File;
-import java.io.IOException;
 
 
 public class WhatsApp extends Extractor {
 
-    String TAG = Statics.TAG+":WhatsApp";
-    static String WHATSAPP = "Android/media/com.whatsapp";
-    String suffixPath = File.separator + "Media" + File.separator + ".Statuses";
+    String TAG = Statics.TAG + ":WhatsApp";
+    public static final String SUFFIX_PATH = File.separator + "Media" + File.separator + ".Statuses";
+    public static final String WHATSAPP = "Android/media/com.whatsapp";
 
     public WhatsApp() {
         super("WhatsApp");
@@ -66,13 +63,33 @@ public WhatsApp() {
     @Override
     public void analyze(String url) {
         getDialogueInterface().show("Finding status...");
-        String path = FileUtil.getExternalStoragePublicDirectory(getContext(), WHATSAPP) + File.separator + "WhatsApp"+suffixPath;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            analyzeAboveR();
+        } else {
+            analyzeBelowR();
+        }
+
+    }
+
+    @RequiresApi(Build.VERSION_CODES.R)
+    void analyzeAboveR() {
+        Uri whatsappUri = AppPref.getInstance(getContext()).getWhatsAppUri();
+        DocumentFile[] statuses = DocumentFile.fromTreeUri(getContext(),whatsappUri).listFiles();
+        for (DocumentFile file : statuses) {
+            fetchDetailsOfFile(file);
+        }
+        whatsAppStatusAnalyzed();
+    }
+
+    void analyzeBelowR() {
+        String path = FileUtil.getExternalStoragePublicDirectory(getContext(), "WhatsApp") + SUFFIX_PATH;
         File directory = new File(path);
-        if (!directory.exists() || !directory.canRead() || directory.listFiles().length <= 0) {
-            path = FileUtil.getExternalStoragePublicDirectory(getContext(), "WhatsApp") + suffixPath;
-            directory = new File(path);
+        File[] files = directory.listFiles();
+        if (files != null && (!directory.exists() || !directory.canRead() || files.length <= 0)) {
+            fetchDetails(directory);
+        } else {
+            getDialogueInterface().error("WhatsApp Not installed", null);
         }
-        fetchDetails(directory);
     }
 
     void fetchDetails(File directory) {
@@ -85,17 +102,15 @@ void fetchDetails(File directory) {
     void fetchDetailsOfFile(File file) {
         String extension = MimeTypeMap.getFileExtensionFromUrl(file.getAbsolutePath());
         String type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
-        if(type!=null) {
-            String fileUir = FileProvider.getUriForFile(getContext(), BuildConfig.APPLICATION_ID+".provider",file).toString();
+        if (type != null) {
+            String fileUir = FileProvider.getUriForFile(getContext(), BuildConfig.APPLICATION_ID + ".provider", file).toString();
             if (type.equals(MIMEType.VIDEO_MP4)) {
                 formats.mainFileURLs.add(fileUir);
-//                formats.thumbNailsBitMap.add(getThumbnailBitmap(file));
                 formats.thumbNailsURL.add(fileUir);
                 formats.videoSizes.add(file.length());
                 formats.fileMime.add(MIMEType.VIDEO_MP4);
-            }else if(type.equals(MIMEType.IMAGE_JPEG)){
+            } else if (type.equals(MIMEType.IMAGE_JPEG)) {
                 formats.mainFileURLs.add(fileUir);
-//                formats.thumbNailsBitMap.add(getImageThumbnail(file));
                 formats.thumbNailsURL.add(fileUir);
                 formats.videoSizes.add(file.length());
                 formats.fileMime.add(MIMEType.IMAGE_JPEG);
@@ -104,21 +119,22 @@ void fetchDetailsOfFile(File file) {
 
     }
 
-    private Bitmap getImageThumbnail(File file){
-        return ThumbnailUtils.extractThumbnail(BitmapFactory.decodeFile(file.getAbsolutePath()),1080,1920);
-    }
-
-    private Bitmap getThumbnailBitmap(File file) {
-        Bitmap bitmap = null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            try {
-                bitmap =  ThumbnailUtils.createVideoThumbnail(file,new Size(1080,1920),new CancellationSignal());
-            } catch (IOException e) {
-                e.printStackTrace();
+    void fetchDetailsOfFile(DocumentFile file) {
+        String type = file.getType();
+        if (type != null) {
+            String fileUir = file.getUri().toString();
+            if (type.equals(MIMEType.VIDEO_MP4)) {
+                formats.mainFileURLs.add(fileUir);
+                formats.thumbNailsURL.add(fileUir);
+                formats.videoSizes.add(file.length());
+                formats.fileMime.add(MIMEType.VIDEO_MP4);
+            } else if (type.equals(MIMEType.IMAGE_JPEG)) {
+                formats.mainFileURLs.add(fileUir);
+                formats.thumbNailsURL.add(fileUir);
+                formats.videoSizes.add(file.length());
+                formats.fileMime.add(MIMEType.IMAGE_JPEG);
             }
-        }else {
-            bitmap = ThumbnailUtils.createVideoThumbnail(file.getPath(),MediaStore.Images.Thumbnails.MINI_KIND);
         }
-        return bitmap;
+
     }
 }
diff --git a/app/src/main/java/com/mugames/vidsnap/m3u8.java b/app/src/main/java/com/mugames/vidsnap/m3u8.java
index e755029..ae1eb1e 100644
--- a/app/src/main/java/com/mugames/vidsnap/m3u8.java
+++ b/app/src/main/java/com/mugames/vidsnap/m3u8.java
@@ -72,21 +72,21 @@ public void onChunkExtracted(int index, ArrayList<String> chunkURLS) {
 
     private void real_extract(int index, String url, ChunkCallback chunkCallback) {
         HttpRequest request = new HttpRequest(url, extractor.getDialogueInterface(), response -> {
-            if(response.contains("#EXT-X-FAXS-CM:")){
+            if(response.getResponse().contains("#EXT-X-FAXS-CM:")){
                 extractor.getDialogueInterface().error("Adobe Flash access can't downloaded",null);
                 return;
             }
             Pattern pattern=Pattern.compile("#EXT-X-SESSION-KEY:.*?URI=\"skd://");
-            if(pattern.matcher(response).find()){
+            if(pattern.matcher(response.getResponse()).find()){
                 extractor.getDialogueInterface().error("Apple Fair Play protected can't downloaded",null);
                 return;
             }
-            if(response.contains("#EXT-X-TARGETDURATION")){
+            if(response.getResponse().contains("#EXT-X-TARGETDURATION")){
                 //No playlist
-                extractFromMeta(index,response,url,chunkCallback);
+                extractFromMeta(index,response.getResponse(),url,chunkCallback);
             }
             else {
-                extractFromPlaylist(response,url);
+                extractFromPlaylist(response.getResponse(),url);
             }
         });
         request.setType(HttpRequest.GET);
@@ -131,7 +131,7 @@ else if(line.contains("RESOLUTION")){
                 for (String l:line.split(",")){
                     l=l.trim();
                     if(l.contains("RESOLUTION")) {
-                        extractor.formats.qualities.add(GetValue("RESOLUTION", l));
+                        extractor.formats.qualities.add(getResolution(l));
                     }
                 }
             }
@@ -240,8 +240,8 @@ String find_url(String mainURL,String line){
 
 
 
-    String GetValue(String name,String query){
-        return query.substring(name.length()+1);
+    String getResolution(String query){
+        return query.substring("RESOLUTION".length()+1);
     }
 
 
diff --git a/app/src/main/java/com/mugames/vidsnap/network/Downloader.java b/app/src/main/java/com/mugames/vidsnap/network/Downloader.java
index f4d61bc..ddf3850 100644
--- a/app/src/main/java/com/mugames/vidsnap/network/Downloader.java
+++ b/app/src/main/java/com/mugames/vidsnap/network/Downloader.java
@@ -17,14 +17,19 @@
 
 package com.mugames.vidsnap.network;
 
+import static com.mugames.vidsnap.utility.Statics.ACTION_CANCEL_DOWNLOAD;
 import static com.mugames.vidsnap.utility.Statics.ACTIVE_DOWNLOAD;
 import static com.mugames.vidsnap.utility.Statics.COMMUNICATOR;
 import static com.mugames.vidsnap.utility.Statics.DOWNLOADED;
 import static com.mugames.vidsnap.utility.Statics.DOWNLOAD_SPEED;
 import static com.mugames.vidsnap.utility.Statics.ERROR_DOWNLOADING;
 import static com.mugames.vidsnap.utility.Statics.FETCH_MESSAGE;
+import static com.mugames.vidsnap.utility.Statics.FILE_MIME;
+import static com.mugames.vidsnap.utility.Statics.ID_CANCEL_DOWNLOAD_DETAILS;
+import static com.mugames.vidsnap.utility.Statics.IS_SHARE_ONLY_DOWNLOAD;
 import static com.mugames.vidsnap.utility.Statics.OUTFILE_URI;
 import static com.mugames.vidsnap.utility.Statics.PROGRESS;
+import static com.mugames.vidsnap.utility.Statics.PROGRESS_CANCELED;
 import static com.mugames.vidsnap.utility.Statics.PROGRESS_DEFAULT;
 import static com.mugames.vidsnap.utility.Statics.PROGRESS_DONE;
 import static com.mugames.vidsnap.utility.Statics.PROGRESS_FAILED;
@@ -45,18 +50,23 @@
 import android.os.IBinder;
 import android.os.ResultReceiver;
 import android.util.Log;
+import android.webkit.MimeTypeMap;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
+import androidx.core.content.FileProvider;
 
+import com.mugames.vidsnap.BuildConfig;
+import com.mugames.vidsnap.VidSnapApp;
 import com.mugames.vidsnap.postprocessor.FFMPEG;
 import com.mugames.vidsnap.postprocessor.FFMPEGInfo;
 import com.mugames.vidsnap.postprocessor.ReflectionInterfaces;
 import com.mugames.vidsnap.R;
 import com.mugames.vidsnap.storage.AppPref;
+import com.mugames.vidsnap.utility.CancelDownloadReceiver;
 import com.mugames.vidsnap.utility.bundles.DownloadDetails;
 import com.mugames.vidsnap.storage.FileUtil;
 import com.mugames.vidsnap.utility.Statics;
@@ -70,6 +80,7 @@
 import com.tonyodev.fetch2core.FetchObserver;
 import com.tonyodev.fetch2core.MutableExtras;
 import com.tonyodev.fetch2core.Reason;
+import com.tonyodev.fetch2okhttp.OkHttpDownloader;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -77,42 +88,57 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.channels.FileChannel;
+import java.sql.Time;
+import java.util.ArrayList;
 import java.util.Random;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import okhttp3.OkHttpClient;
+
 public class Downloader extends Service {
-    String TAG = Statics.TAG + ":Downloader";
+    final String TAG = Statics.TAG + ":Downloader";
     volatile int activeDownload;
+    volatile static ArrayList<RealDownloader> downloaders = new ArrayList<>();
 
+    private static PendingIntent getActivityOpenerIntent(Context context) {
+        Intent intent = new Intent(context, MainActivity.class);
+        intent.putExtra(ACTIVE_DOWNLOAD, true);
+        return PendingIntent.getActivity(context, 10, intent, 0);
+    }
 
-    @Override
-    public void onCreate() {
-        super.onCreate();
+    public static synchronized void cancelDownload(int detailsId) {
+        for (RealDownloader downloader : downloaders) {
+            if (downloader.details.id == detailsId) {
+                downloader.cancelDownload();
+                break;
+            }
+        }
     }
 
+
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        try {
-            synchronized (Downloader.class) {
-                activeDownload += 1;
-                RealDownloader downloader = new RealDownloader(getApplicationContext(), intent, startId);
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "onStartCommand: ", e);
-            Toast.makeText(getApplicationContext(), "Download failed", Toast.LENGTH_LONG).show();
+        synchronized (Downloader.class) {
+            activeDownload += 1;
+            NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext(), VidSnapApp.NOTIFY_DOWNLOADER_SERVICE)
+                    .setPriority(NotificationCompat.PRIORITY_LOW)
+                    .setOngoing(true)
+                    .setContentTitle("Running in background")
+                    .setContentText(String.format("%s Video(s) downloading in background",activeDownload))
+                    .setSmallIcon(R.drawable.ic_notification_icon)
+                    .setContentIntent(getActivityOpenerIntent(getApplicationContext()));
+            startForeground(10, builder.build());
+            RealDownloader downloader = new RealDownloader(getApplicationContext(), intent, startId);
+            downloaders.add(downloader);
         }
 
         return START_NOT_STICKY;
     }
 
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
-
     @Nullable
     @Override
     public IBinder onBind(Intent intent) {
@@ -124,6 +150,9 @@ class RealDownloader implements FetchObserver<Download> {
         String TEMP_AUDIO_NAME = "MUaudio";
         String TEMP_RESULT_NAME = "final";
 
+        Thread currentThread;
+        boolean isCanceled = false;
+
         int PROCESS = 0;
 
         String path;
@@ -135,12 +164,13 @@ class RealDownloader implements FetchObserver<Download> {
         NotificationManagerCompat manager;
 
 
+
         DownloadDetails details;
 
         int ran;
         long file_size;
 
-        int startId;
+        final int startId;
 
         long passed = 0;
 
@@ -150,8 +180,13 @@ class RealDownloader implements FetchObserver<Download> {
 
         Timer notificationTimer;
 
-        Context context;
-        Intent intent;
+        final Context context;
+        final Intent intent;
+
+        FFMPEG ffmpegInstance;
+
+        Request request;
+        Fetch fetch;
 
         public RealDownloader(Context context, Intent intent, int startId) {
             this.context = context;
@@ -166,9 +201,9 @@ private void init() {
 
             path = AppPref.getInstance(context).getCachePath("");
 
-            TEMP_VIDEO_NAME = FileUtil.getValidFile(path, ran + "Video", "muvideo");
-            TEMP_AUDIO_NAME = FileUtil.getValidFile(path, ran + "Audio", "muaudio");
-            TEMP_RESULT_NAME = FileUtil.getValidFile(path, ran + "FullVideo", "muout");
+            TEMP_VIDEO_NAME = FileUtil.getValidFile(path, ran + "Video", "mp4");
+            TEMP_AUDIO_NAME = FileUtil.getValidFile(path, ran + "Audio", "mp3");
+            TEMP_RESULT_NAME = FileUtil.getValidFile(path, ran + "FullVideo", "mp4");
 
             details = intent.getParcelableExtra(COMMUNICATOR);
 
@@ -177,21 +212,23 @@ private void init() {
             file_size = details.videoSize;
             PROCESS = PROGRESS_UPDATE;
 
-            Intent intent = new Intent(context, MainActivity.class);
-            intent.putExtra(ACTIVE_DOWNLOAD, true);
-            PendingIntent downloading_PendingIntent = PendingIntent.getActivity(getBaseContext(), 10, intent, 0);
+
+            Intent cancelIntent = new Intent(context, CancelDownloadReceiver.class);
+            cancelIntent.putExtra(ID_CANCEL_DOWNLOAD_DETAILS, details.id);
+
+            PendingIntent cancelPendingIntent = PendingIntent.getBroadcast(context, ran, cancelIntent, PendingIntent.FLAG_ONE_SHOT);
+
 
             builder = new NotificationCompat.Builder(context, NOTIFY_DOWNLOADING);
             builder.setPriority(NotificationCompat.PRIORITY_LOW)
                     .setOngoing(true)
+                    .addAction(R.drawable.ic_cancel, "Cancel", cancelPendingIntent)
                     .setProgress(100, 0, false)
                     .setSmallIcon(R.drawable.ic_notification_icon)
-                    .setContentIntent(downloading_PendingIntent);
-
-            startForeground(ran, builder.build());
-
+                    .setContentIntent(getActivityOpenerIntent(context));
 
-            new Thread(() -> {
+            manager.notify(ran,builder.build());
+            currentThread = new Thread(() -> {
 
                 builder.setContentTitle("Downloading " + details.fileName + details.fileType);
 
@@ -206,18 +243,34 @@ private void init() {
                 }
 
 
-            }).start();
+            });
+            currentThread.start();
+        }
+
+        public void cancelDownload() {
+            isCanceled = true;
+            fetch.remove(request.getId());
+            new Thread(() -> FileUtil.deleteFile(TEMP_AUDIO_NAME, null)).start();
+            new Thread(() -> FileUtil.deleteFile(TEMP_VIDEO_NAME, null)).start();
+            if (ffmpegInstance != null) {
+                ffmpegInstance.interrupt();
+                Log.e(TAG, "cancelDownload: " + ffmpegInstance.getInfo().localOutputPath);
+                new Thread(() -> FileUtil.deleteFile(ffmpegInstance.getInfo().localOutputPath, null)).start();
+            }
+            removeDownloader();
+            sendBundle(PROGRESS_CANCELED, null);
+            currentThread.interrupt();
         }
 
         void downloadChunk(FFMPEG ffmpeg) {
             AtomicInteger got = new AtomicInteger();
-            final Timer notifyTimer = notifyProgress();
+            notificationTimer = notifyProgress();
             ffmpeg.setExecuteCallback(session -> {
                 Bundle progressData = new Bundle();
                 onDoneDownload(ffmpeg.getInfo().localOutputPath, ffmpeg.getInfo().localOutputMime);
                 progressData.putInt(PROGRESS, 100);
                 sendBundle(PROGRESS_UPDATE_MERGING, progressData);
-                notifyTimer.cancel();
+                notificationTimer.cancel();
             });
 
             ffmpeg.downloadHLS(log -> {
@@ -272,25 +325,24 @@ private FFMPEG initFFMPEG(ReflectionInterfaces.SOLoadCallbacks soLoadCallbacks)
 
         synchronized void onDownloadFailed(Bundle data) {
             sendBundle(PROGRESS_FAILED, data);
+            removeDownloader();
+        }
+
+        synchronized void removeDownloader() {
             manager.cancel(ran);
             activeDownload -= 1;
+            notificationTimer.cancel();
+            downloaders.remove(this);
             if (activeDownload == 0)
                 stopForeground(true);
         }
 
         synchronized void onDoneDownload(String finalPath, String finalMime) {
+            if (isCanceled) return;
             if (finalPath == null) finalPath = TEMP_VIDEO_NAME;
             if (finalMime == null) finalMime = details.fileMime;
             copyVideoToDestination(finalPath, finalMime);
-            Bundle bundle = new Bundle();
-            bundle.putString(OUTFILE_URI, outputUri.toString());
-
-            sendBundle(PROGRESS_DONE, bundle);
-            manager.cancel(ran);
-            activeDownload -= 1;
-            Log.d(TAG, "onDoneDownload: " + activeDownload);
-            if (activeDownload == 0)
-                stopForeground(true);
+            removeDownloader();
         }
 
         void mergeFiles(FFMPEG ffmpeg) {
@@ -320,9 +372,22 @@ void mergeFiles(FFMPEG ffmpeg) {
         }
 
         void copyVideoToDestination(String localFile, String localMime) {
+            Bundle bundle = new Bundle();
+            if (details.isShareOnlyDownload) {
+                bundle.putString(
+                        OUTFILE_URI,
+                        FileProvider.getUriForFile(
+                                context,
+                                BuildConfig.APPLICATION_ID + ".provider",
+                                new File(localFile)).toString()
+                );
+                bundle.putBoolean(IS_SHARE_ONLY_DOWNLOAD, true);
+                bundle.putString(FILE_MIME, localMime);
+                sendBundle(PROGRESS_DONE, bundle);
+                return;
+            }
             outputUri = FileUtil.pathToNewUri(context, details.pathUri, details.fileName, localMime);
             try {
-
                 FileChannel inChannel = new FileInputStream(localFile).getChannel();
                 FileChannel outChannel;
 
@@ -339,14 +404,14 @@ void copyVideoToDestination(String localFile, String localMime) {
                 Log.e(TAG, "copyVideoToDestination: ", e);
                 sendErrorBundle(e.toString());
             }
-            new Thread(() -> FileUtil.deleteFile(localFile, null)).start();
-            new Thread(() -> FileUtil.deleteFile(TEMP_AUDIO_NAME, null)).start();
-            new Thread(() -> FileUtil.deleteFile(TEMP_VIDEO_NAME, null)).start();
+            bundle.putString(OUTFILE_URI, outputUri.toString());
+            sendBundle(PROGRESS_DONE, bundle);
         }
 
-        ReflectionInterfaces.SOLoadCallbacks mergeSOCallback = new ReflectionInterfaces.SOLoadCallbacks() {
+        final ReflectionInterfaces.SOLoadCallbacks mergeSOCallback = new ReflectionInterfaces.SOLoadCallbacks() {
             @Override
             public void onSOLoadingSuccess(FFMPEG ffmpeg) {
+                ffmpegInstance = ffmpeg;
                 mergeFiles(ffmpeg);
             }
 
@@ -356,10 +421,11 @@ public void onSOLoadingFailed(Exception e) {
             }
         };
 
-        ReflectionInterfaces.SOLoadCallbacks hlsSoLoadCallbacks = new ReflectionInterfaces.SOLoadCallbacks() {
+        final ReflectionInterfaces.SOLoadCallbacks hlsSoLoadCallbacks = new ReflectionInterfaces.SOLoadCallbacks() {
             @Override
-            public void onSOLoadingSuccess(FFMPEG ffmpegInstance) {
-                downloadChunk(ffmpegInstance);
+            public void onSOLoadingSuccess(FFMPEG ffmpeg) {
+                ffmpegInstance = ffmpeg;
+                downloadChunk(ffmpeg);
             }
 
             @Override
@@ -373,17 +439,16 @@ void download(String url, String outPath, int whatDownloading) {
             notificationTimer = notifyProgress();
 
             FetchConfiguration fetchConfiguration = new FetchConfiguration.Builder(context)
-                    .setHttpDownloader(new HttpUrlConnectionDownloader(com.tonyodev.fetch2core.Downloader.FileDownloaderType.PARALLEL))
+                    .setHttpDownloader(getOkHttpDownloader())
                     .setDownloadConcurrentLimit(3)
                     .enableRetryOnNetworkGain(true)
                     .build();
 
-            Fetch fetch = Fetch.Impl.getInstance(fetchConfiguration);
-
+            fetch = Fetch.Impl.getInstance(fetchConfiguration);
 
             url = url.replace("http://", "https://");
 
-            Request request = new Request(url, outPath);
+            request = new Request(url, outPath);
             MutableExtras extra = new MutableExtras();
             extra.putInt(PROGRESS, whatDownloading);
             request.setExtras(extra);
@@ -427,7 +492,9 @@ public void run() {
             return timer;
         }
 
-        void sendBundle(int resultCode, Bundle progressData) {
+        void sendBundle(int resultCode, @Nullable Bundle progressData) {
+            if (progressData != null)
+                progressData.putBoolean(IS_SHARE_ONLY_DOWNLOAD, details.isShareOnlyDownload);
             Log.d(TAG, "UpdateUI: " + resultCode);
             receiver.send(resultCode, progressData);
         }
@@ -439,16 +506,24 @@ public void onChanged(Download download, @NonNull Reason reason) {
             } else if (download.getDownloadedBytesPerSecond() != -1) {
                 notificationVal = download.getProgress();
                 passed = download.getDownloaded();
-                speed = download.getDownloadedBytesPerSecond()/2;
+                speed = download.getDownloadedBytesPerSecond() / 2;
                 uiSpeed();
             } else if (reason == Reason.DOWNLOAD_ERROR) {
                 sendErrorBundle(String.valueOf(download.getError()));
                 Log.e(TAG, "onChanged: " + download.getError());
-            } else if(reason != Reason.DOWNLOAD_PROGRESS_CHANGED) {
+            } else if (reason != Reason.DOWNLOAD_PROGRESS_CHANGED) {
                 Bundle bundle = new Bundle();
                 bundle.putString(FETCH_MESSAGE, reason.toString());
                 sendBundle(PROGRESS_DEFAULT, bundle);
             }
         }
+
+        private OkHttpDownloader getOkHttpDownloader() {
+            OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                    .readTimeout(20000, TimeUnit.MILLISECONDS)
+                    .connectTimeout(20000, TimeUnit.MILLISECONDS)
+                    .build();
+            return new OkHttpDownloader(okHttpClient, com.tonyodev.fetch2core.Downloader.FileDownloaderType.PARALLEL);
+        }
     }
 }
diff --git a/app/src/main/java/com/mugames/vidsnap/network/HttpRequest.java b/app/src/main/java/com/mugames/vidsnap/network/HttpRequest.java
index 2ea1f4e..e82808b 100644
--- a/app/src/main/java/com/mugames/vidsnap/network/HttpRequest.java
+++ b/app/src/main/java/com/mugames/vidsnap/network/HttpRequest.java
@@ -103,8 +103,6 @@ public void start(){
 
                 }
 
-//            if(user_agent!=null)
-//                httpsURLConnection.setRequestProperty("User-Agent",user_agent);
 
                 httpsURLConnection.setRequestProperty("Accept-Language", "en-GB");
                 httpsURLConnection.setRequestProperty("Content-Language", "en-GB");
@@ -140,12 +138,12 @@ public void start(){
                 }
 
                 stream.close();
-                callBack.onReceive(outputStream.toString());
+                callBack.onReceive(new Response(outputStream.toString()));
 
             } catch (IOException e) {
                 e.printStackTrace();
                 if(info_url.toString().contains("youtube") || (info_url.toString().contains("instagram") && !headers.contains("User-Agent")))
-                    callBack.onReceive(null);
+                    callBack.onReceive(new Response(e));
                 else {
                     dialogueInterface.error("Internal error occurred",e);
                 }
diff --git a/app/src/main/java/com/mugames/vidsnap/network/Response.java b/app/src/main/java/com/mugames/vidsnap/network/Response.java
new file mode 100644
index 0000000..19f65bd
--- /dev/null
+++ b/app/src/main/java/com/mugames/vidsnap/network/Response.java
@@ -0,0 +1,46 @@
+/*
+ *  This file is part of VidSnap.
+ *
+ *  VidSnap is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *  VidSnap is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  You should have received a copy of the GNU General Public License
+ *  along with VidSnap.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.mugames.vidsnap.network;
+
+public class Response {
+    String response;
+    Exception exception;
+
+    public Response(Exception exception) {
+        this.exception = exception;
+    }
+
+    public Response(String response) {
+        this.response = response;
+    }
+
+    public String getResponse() {
+        return response;
+    }
+
+    public void setResponse(String response) {
+        this.response = response;
+    }
+
+    public Exception getException() {
+        return exception;
+    }
+
+    public void setException(Exception exception) {
+        this.exception = exception;
+    }
+}
diff --git a/app/src/main/java/com/mugames/vidsnap/postprocessor/FFMPEG.java b/app/src/main/java/com/mugames/vidsnap/postprocessor/FFMPEG.java
index 71e0300..e20f171 100644
--- a/app/src/main/java/com/mugames/vidsnap/postprocessor/FFMPEG.java
+++ b/app/src/main/java/com/mugames/vidsnap/postprocessor/FFMPEG.java
@@ -40,7 +40,7 @@
 import java.nio.channels.FileChannel;
 
 import static com.mugames.vidsnap.utility.Statics.TAG;
-import static com.mugames.vidsnap.ui.viewmodels.MainActivityViewModel.LIBRARY_PATH;
+import static com.mugames.vidsnap.storage.AppPref.LIBRARY_PATH;
 
 public class FFMPEG {
     public static String jniPath;
@@ -75,7 +75,7 @@ public FFMPEG(FFMPEGInfo ffmpegInfo, Context context, ReflectionInterfaces.SOLoa
         String libsPath = AppPref.getInstance(context).getCachePath(LIBRARY_PATH);
         if(jniPath==null) jniPath = libsPath + File.separator + "jni" + File.separator;
 
-        if(!FileUtil.isFileExists(jniPath)) {
+        if(FileUtil.isFileNotExists(jniPath)) {
             new Thread(()->{
                 try {
                     FileUtil.unzip(new File(libsPath, "lib.zip"), new File(libsPath), () -> {
@@ -229,4 +229,8 @@ public void downloadHLS(LogCallback logCallback){
     public FFMPEGInfo getInfo() {
         return info;
     }
+
+    public void interrupt(){
+        FFmpegKit.cancel();
+    }
 }
diff --git a/app/src/main/java/com/mugames/vidsnap/storage/AppPref.java b/app/src/main/java/com/mugames/vidsnap/storage/AppPref.java
index 1704940..9c9b4af 100644
--- a/app/src/main/java/com/mugames/vidsnap/storage/AppPref.java
+++ b/app/src/main/java/com/mugames/vidsnap/storage/AppPref.java
@@ -50,10 +50,16 @@
  * Helper class to access shared preferences
  */
 public class AppPref {
+
+    public static final String STATIC_CACHE = ".historyDB";
+    public static final String DYNAMIC_CACHE = ".essential";
+    public static final String LIBRARY_PATH = "libs";
+    public static final String db_name = "historyCache";
+
     private static volatile AppPref instance;
 
-    SharedPreferences sharedPreferences;
-    Context context;
+    final SharedPreferences sharedPreferences;
+    final Context context;
 
     String TAG = Statics.TAG+":AppPref";
 
@@ -134,4 +140,16 @@ public String getCachePath(String folderName) {
         return context.getExternalFilesDirs(folderName)[index] + "/";
     }
 
+    public void setWhatsAppUri(Intent intent){
+        Uri uri = intent.getData();
+        int flag = intent.getFlags() & Intent.FLAG_GRANT_READ_URI_PERMISSION;
+        context.getContentResolver().takePersistableUriPermission(uri,flag);
+        setStringValue(R.string.whatsappUri,uri.toString());
+    }
+
+    public Uri getWhatsAppUri() {
+        String uri = getStringValue(R.string.whatsappUri,null);
+        if(uri==null) return null;
+        return Uri.parse(uri);
+    }
 }
diff --git a/app/src/main/java/com/mugames/vidsnap/storage/FileUtil.java b/app/src/main/java/com/mugames/vidsnap/storage/FileUtil.java
index 80e3518..63ee557 100644
--- a/app/src/main/java/com/mugames/vidsnap/storage/FileUtil.java
+++ b/app/src/main/java/com/mugames/vidsnap/storage/FileUtil.java
@@ -213,6 +213,7 @@ private static String getVolumePostR(String volumeID, Context context) {
      * Can't be used to write. Only for string purpose
      */
     public static String getExternalStoragePublicDirectory(Context context, @Nullable String type) {
+        type = type==null?"":type;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             StorageManager manager = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE);
 
@@ -303,8 +304,8 @@ public static String getValidFile(String path, String name, String extension) {
     }
 
 
-    public static boolean isFileExists(String fileDirectory) {
-        return new File(fileDirectory).exists();
+    public static boolean isFileNotExists(String fileDirectory) {
+        return !new File(fileDirectory).exists();
     }
 
     /*-----------------------------------NOTE-------------------------------------------------*
@@ -471,10 +472,10 @@ public static void copyFile(Context context, Uri src, Uri dest, FileStreamCallba
 
     /**
      *
-     * @param context
-     * @param parentUri
-     * @param fileName
-     * @param mimeType
+     * @param context application context
+     * @param parentUri parent directory's uri
+     * @param fileName current filename without extensions
+     * @param mimeType mime type of current file
      * @return New uri for a file eg. if file exist name will be file(1)
      */
     public static Uri pathToNewUri(Context context, Uri parentUri, String fileName, String mimeType){
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/activities/MainActivity.java b/app/src/main/java/com/mugames/vidsnap/ui/activities/MainActivity.java
index 6e365ff..ff0480d 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/activities/MainActivity.java
@@ -34,7 +34,6 @@
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -44,7 +43,6 @@
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
@@ -55,13 +53,13 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.navigation.NavigationView;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
+import com.mugames.vidsnap.CircularProgressDialog;
 import com.mugames.vidsnap.database.History;
 import com.mugames.vidsnap.database.HistoryDatabase;
 import com.mugames.vidsnap.firebase.FirebaseCallBacks;
@@ -102,9 +100,17 @@
 
 import static com.mugames.vidsnap.utility.Statics.ACTIVE_DOWNLOAD;
 import static com.mugames.vidsnap.utility.Statics.COMMUNICATOR;
+import static com.mugames.vidsnap.utility.Statics.FETCH_MESSAGE;
+import static com.mugames.vidsnap.utility.Statics.FILE_MIME;
+import static com.mugames.vidsnap.utility.Statics.OUTFILE_URI;
+import static com.mugames.vidsnap.utility.Statics.PROGRESS;
+import static com.mugames.vidsnap.utility.Statics.PROGRESS_UPDATE_AUDIO;
+import static com.mugames.vidsnap.utility.Statics.PROGRESS_UPDATE_MERGING;
+import static com.mugames.vidsnap.utility.Statics.PROGRESS_UPDATE_VIDEO;
 import static com.mugames.vidsnap.utility.Statics.REQUEST_WRITE;
-import static com.mugames.vidsnap.ui.viewmodels.MainActivityViewModel.LIBRARY_PATH;
+import static com.mugames.vidsnap.storage.AppPref.LIBRARY_PATH;
 import static com.mugames.vidsnap.ui.viewmodels.VideoFragmentViewModel.URL_KEY;
+import static com.mugames.vidsnap.utility.Statics.RESULT_CODE;
 
 public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener,
         Toolbar.OnMenuItemClickListener, FetchObserver<Download>, UtilityInterface.DialogueInterface, UtilityInterface.LoginHelper {
@@ -125,6 +131,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     private NavigationView navigationView;
     private StorageSwitcher storageSwitcher;
     private ActivityResultLauncher<Intent> locationResultLauncher;
+    private ActivityResultLauncher<Intent> shareResultLauncher;
 
     MainActivityViewModel activityViewModel;
 
@@ -164,11 +171,17 @@ else if (theme.equals(themes[2]))
                     public void onActivityResult(ActivityResult result) {
                         if (result.getResultCode() == Activity.RESULT_OK) {
                             setPath(result.getData());
+                        }else {
+                            activityViewModel.tempDetails.clear();
                         }
                     }
                 }
         );
 
+        shareResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            activityViewModel.deleteSharedFile();
+        });
+
 
         drawer = findViewById(R.id.drawer_layout);
 
@@ -205,7 +218,7 @@ public void onReceiveData(boolean isUpdateAvailable, String v, boolean isForced,
         dialog = new PopUpDialog(this);
 
 
-        if (!activityViewModel.isAgree()) {
+        if (activityViewModel.isNotAgreed()) {
             new Terms(this).show();
             intent = getIntent();
             setIntent(null);
@@ -213,14 +226,19 @@ public void onReceiveData(boolean isUpdateAvailable, String v, boolean isForced,
             gotIntent(getIntent());
         }
 
+        if(activityViewModel.isProgressDialogVisible()){
+            dialog.show(activityViewModel.getProgressDialogText());
+        }
 
+        addShareOnlyListener();
     }
 
+
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
 
-        if (!activityViewModel.isAgree()) {
+        if (activityViewModel.isNotAgreed()) {
             this.intent = intent;
             return;
         }
@@ -336,7 +354,7 @@ public void replaceFragment(Fragment fragment, String tag) {
         boolean isRunning = manager.popBackStackImmediate(tag, 0);
         Fragment runningFragment = manager.findFragmentByTag(tag);
 
-        if(runningFragment instanceof StatusFragment && !(fragment instanceof StatusFragment))
+        if(isInstanceof(runningFragment,fragment,StatusFragment.class))
             manager.popBackStack();
 
 
@@ -346,25 +364,6 @@ public void replaceFragment(Fragment fragment, String tag) {
             transaction.replace(R.id.fragment_container, fragment, tag).commit();
 
         } else if (runningFragment != null) {
-//            if (isInstanceof(runningFragment,fragment,VideoFragment.class)) {
-//                VideoFragment videoFragment = ((VideoFragment) runningFragment);
-//                videoFragment.link = ((VideoFragment) fragment).link;
-//                if(videoFragment.urlBox==null){
-//                    manager.popBackStack();
-//                    replaceFragment(fragment,tag);
-//                    return;
-//                }
-//                else videoFragment.Update();
-//            } else if (isInstanceof(runningFragment,fragment,DownloadFragment.class)) {
-//                DownloadFragment downloadFragment = (DownloadFragment) runningFragment;
-//                DownloadFragment dataFragment = (DownloadFragment) fragment;
-//                if(downloadFragment.recyclerView == null) {
-//                    manager.popBackStack();
-//                    replaceFragment(fragment,tag);
-//                    return;
-//                }
-//                else downloadFragment.setArrayList(dataFragment.list, dataFragment.DownloadReceiver);
-//            }
             transaction.show(runningFragment).commit();
             if (isInstanceof(runningFragment, fragment, VideoFragment.class)) {
                 ((VideoFragment) runningFragment).startProcess(fragment.getArguments() != null ? fragment.getArguments().getString(URL_KEY) : null);
@@ -430,9 +429,17 @@ public void setupBadge(Integer size) {
         }
     }
 
+    void safeDismissPopUp(){
+        if(dialog!=null)
+            dialog.dismiss();
+    }
+
     @Override
     protected void onDestroy() {
-        dialog.dismiss();
+        safeDismissPopUp();
+        if(circularProgressDialog!=null) circularProgressDialog.dismiss();
+        circularProgressDialog = null;
+        dialog = null;
         super.onDestroy();
     }
 
@@ -448,13 +455,15 @@ public boolean onMenuItemClick(MenuItem item) {
 
     @Override
     public void show(String text) {
+        activityViewModel.setProgressDialogState(true,text);
+        if(dialog==null) dialog = new PopUpDialog(this);
         dialog.show(text);
     }
 
     @Override
     public void error(String reason, Exception e) {
-        if (dialog != null)
-            dialog.dismiss();
+        safeDismissPopUp();
+//        activityViewModel.setProgressDialogState(true,reason);
         Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
 
         try {
@@ -494,7 +503,8 @@ public void error(String reason, Exception e) {
 
     @Override
     public void dismiss() {
-        dialog.dismiss();
+        activityViewModel.setProgressDialogState(false,null);
+        safeDismissPopUp();
     }
 
 
@@ -514,7 +524,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
                 download(null);
             } else {
                 Toast.makeText(this, "Sorry We can't download", Toast.LENGTH_SHORT).show();
-                activityViewModel.getDownloadDetailsList().clear();
+                activityViewModel.tempDetails.clear();
             }
         }
     }
@@ -525,12 +535,7 @@ private void openDirectoryChooser() {
         MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(this);
         dialogBuilder.setTitle("Download Path");
 
-        DialogInterface.OnClickListener positiveListener = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                storageSwitcher.pick(locationResultLauncher);
-            }
-        };
+        DialogInterface.OnClickListener positiveListener = (dialog, which) -> storageSwitcher.pick(locationResultLauncher);
 
         dialogBuilder.setCancelable(false);
         //TODO Support for Android 12
@@ -601,7 +606,7 @@ public void download(ArrayList<DownloadDetails> details) {
         }
         // Skip this for loop if you use static module loading of FFmpeg-kit
         for (DownloadDetails d : activityViewModel.tempDetails)
-            if ((d.audioURL != null || d.chunkUrl != null) && !FileUtil.isFileExists(AppPref.getInstance(this).getCachePath(LIBRARY_PATH) + "lib.zip")) {
+            if ((d.audioURL != null || d.chunkUrl != null) && FileUtil.isFileNotExists(AppPref.getInstance(this).getCachePath(LIBRARY_PATH) + "lib.zip")) {
                 fetchSOFiles();
                 return;
             }
@@ -645,7 +650,6 @@ public void onScanCompleted(String s, Uri uri) {
     private void fetchSOFiles() {
         final String abi = Build.SUPPORTED_ABIS[0];
         dialog.show("Preparing download");
-
         HashMap<String, String> abiHashMap = new HashMap<>();
         abiHashMap.put("armeabi-v7a", "https://raw.githubusercontent.com/Udhayarajan/SOserver/master/armeabi-v7a.zip");
         abiHashMap.put("arm64-v8a", "https://raw.githubusercontent.com/Udhayarajan/SOserver/master/arm64-v8a.zip");
@@ -658,57 +662,44 @@ private void fetchSOFiles() {
 
 
     private void downloadAdditionalModule(long size, String url) {
-        dialog.dismiss();
-        MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(this);
-        dialogBuilder.setTitle("Additional required");
-        dialogBuilder.setMessage(String.format("Additional file (%s) needed to be download to use %s downloader. Would you like to download it ?", UtilityClass.formatFileSize(size, false), activityViewModel.tempDetails.get(0).src));
-        dialogBuilder.setPositiveButton("Download", (dialog, which) -> {
+        safeDismissPopUp();
+        if(!activityViewModel.isDownloadingSOFile()){
+            MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(this);
+            dialogBuilder.setTitle("Additional required");
+            dialogBuilder.setMessage(String.format("Additional file (%s) needed to be download to use %s downloader. Would you like to download it ?", UtilityClass.formatFileSize(size, false), activityViewModel.tempDetails.get(0).src));
+            dialogBuilder.setPositiveButton("Download", (dialog, which) -> {
+                addDownloadListener();
+                activityViewModel.downloadSO(url, moduleDownloadCallback);
+            });
+            dialogBuilder.setNegativeButton("Leave", (dialog, which) -> {
+                Toast.makeText(MainActivity.this, "Download aborted", Toast.LENGTH_SHORT).show();
+                activityViewModel.tempDetails.clear();
+            });
+            dialogBuilder.create().show();
+        }else {
             addDownloadListener();
-            activityViewModel.downloadSO(url, moduleDownloadCallback);
-        });
-        dialogBuilder.setNegativeButton("Leave", (dialog, which) -> {
-            Toast.makeText(MainActivity.this, "Download aborted", Toast.LENGTH_SHORT).show();
-            activityViewModel.tempDetails.clear();
-        });
-        dialogBuilder.create().show();
-
+        }
     }
 
     UtilityInterface.ModuleDownloadCallback moduleDownloadCallback = new UtilityInterface.ModuleDownloadCallback() {
         @Override
         public void onDownloadEnded() {
-            externalPackageAlertDialog.dismiss();
+            circularProgressDialog.dismiss();
+            circularProgressDialog = null;
             download(null);
         }
     };
 
-    AlertDialog externalPackageAlertDialog;
+    CircularProgressDialog circularProgressDialog;
 
     private void addDownloadListener() {
-        MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(this);
-        dialogBuilder.setCancelable(false);
-        View view = getLayoutInflater().inflate(R.layout.module_download_dialogue, null);
-        dialogBuilder.setView(view);
-        TextView statusView = view.findViewById(R.id.module_status);
-        ProgressBar progressBar = view.findViewById(R.id.module_bar);
-        TextView percentageView = view.findViewById(R.id.module_progress);
-        activityViewModel.getDownloadStatusLiveData().observe(this, new Observer<String>() {
-            @Override
-            public void onChanged(String s) {
-                statusView.setText(s);
-            }
+        circularProgressDialog = new CircularProgressDialog(this);
+        activityViewModel.getDownloadProgressLiveData().observe(this, integer -> {
+            if(circularProgressDialog!=null) circularProgressDialog.setProgress(integer);
         });
-        activityViewModel.getDownloadProgressLiveData().observe(this, new Observer<Integer>() {
-            @Override
-            public void onChanged(Integer integer) {
-                progressBar.setProgress(integer);
-                percentageView.setText(integer + "%");
-            }
+        activityViewModel.getDownloadStatusLiveData().observe(this,s -> {
+            if(circularProgressDialog!=null) circularProgressDialog.setStatusTxt(s);
         });
-
-        externalPackageAlertDialog = dialogBuilder.create();
-        externalPackageAlertDialog.show();
-
     }
 
     boolean isValidDownloadPath() {
@@ -724,10 +715,12 @@ boolean isValidDownloadPath() {
 
 
     private void realDownload() {
-        dialog.dismiss();
-
+        safeDismissPopUp();
         for (DownloadDetails details:activityViewModel.tempDetails) {
             Intent download = detailsToIntent(details);
+            if(details.isShareOnlyDownload){
+                addShareOnlyListener();
+            }
             ContextCompat.startForegroundService(this, download);
         }
 
@@ -765,29 +758,16 @@ Intent detailsToIntent(DownloadDetails details) {
     public void signInNeeded(String reason, String loginURL, String[] loginDoneUrl, int cookiesKey, UtilityInterface.LoginIdentifier identifier) {
 
         runOnUiThread(() -> {
-            dialog.dismiss();
+            safeDismissPopUp();
             MaterialAlertDialogBuilder dialog = new MaterialAlertDialogBuilder(this)
                     .setTitle("Seems to be Private Video!")
                     .setCancelable(false)
                     .setMessage(reason)
-                    .setPositiveButton("Sign-in", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            openWebPage(loginURL, loginDoneUrl, null, new UtilityInterface.CookiesInterface() {
-                                @Override
-                                public void onReceivedCookies(String cookies) {
-                                    setStringValue(cookiesKey, cookies);
-                                    identifier.loggedIn(cookies);
-                                }
-                            });
-                        }
-                    })
-                    .setNegativeButton("No,Thanks", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            error("URL invalid or Login Permission Dined", null);
-                        }
-                    });
+                    .setPositiveButton("Sign-in", (dialog1, which) -> openWebPage(loginURL, loginDoneUrl, null, cookies -> {
+                        setStringValue(cookiesKey, cookies);
+                        identifier.loggedIn(cookies);
+                    }))
+                    .setNegativeButton("No,Thanks", (dialog12, which) -> error("URL invalid or Login Permission Dined", null));
             dialog.show();
         });
     }
@@ -828,13 +808,12 @@ public void setTouchCallback(TouchCallback touchCallback) {
     public void clearHistory(ConfigurationCallback configurationCallback) {
         MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
         builder.setTitle("Warning")
-                .setMessage("Downloads list will be cleared by clearing cache.")
+                .setMessage("Download history will be cleared upon clearing cache.")
                 .setPositiveButton("Clear", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         setStringValue(R.string.key_clear_history_cache, null);
                         new Thread(() -> HistoryDatabase.getInstance(getApplication()).historyDao().deleteTable()).start();
-//                        FileUtil.deleteFile(activityViewModel.pref.getCachePath(STATIC_CACHE));
                         configurationCallback.onProcessDone();
                     }
                 })
@@ -857,14 +836,44 @@ public void onReceivedCookies(String cookies) {
     public void logOutFB(ConfigurationCallback configurationCallback) {
         openWebPage("https://www.facebook.com/help/contact/logout?id=260749603972907",
                 new String[]{"https://www.facebook.com/help/contact/260749603972907", "https://m.facebook.com/help/contact/260749603972907"}, getStringValue(R.string.key_facebook, null),
-                new UtilityInterface.CookiesInterface() {
-                    @Override
-                    public void onReceivedCookies(String cookies) {
-                        Toast.makeText(MainActivity.this, "Logout Successful", Toast.LENGTH_SHORT).show();
-                        configurationCallback.onProcessDone();
-                    }
+                cookies -> {
+                    Toast.makeText(MainActivity.this, "Logout Successful", Toast.LENGTH_SHORT).show();
+                    configurationCallback.onProcessDone();
                 });
     }
 
+    public void updateShareDownloadProgress(int progress, String msg){
+        if(circularProgressDialog ==null) return;
+        circularProgressDialog.setProgress(progress);
+        Log.e(TAG, "updateShareDownloadProgress: "+msg );
+        circularProgressDialog.setStatusTxt(msg);
+    }
 
+    public void shareDownloadedVideo(Bundle resultData) {
+        if(circularProgressDialog!=null)circularProgressDialog.dismiss();
+        circularProgressDialog = null;
+        activityViewModel.setTempResultBundle(resultData);
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType(resultData.getString(FILE_MIME));
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        intent.putExtra(Intent.EXTRA_STREAM, Uri.parse(resultData.getString(OUTFILE_URI)));
+        shareResultLauncher.launch(Intent.createChooser(intent, "Select Social Media"));
+    }
+
+    private void addShareOnlyListener() {
+        int id = activityViewModel.shareOnlyDownloadStatus();
+        if(id == MainActivityViewModel.NO_SHARE_ONLY_FILES_DOWNLOADING){
+            return;
+        }
+        circularProgressDialog = new CircularProgressDialog(this);
+        ((DownloadReceiver)DownloadDetails.findDetails(id).receiver).getResultBundle().observe(this,bundle -> {
+            String msg;
+            int resultCode = bundle.getInt(RESULT_CODE);
+            if (resultCode == PROGRESS_UPDATE_AUDIO) msg="Downloading Audio";
+            else if (resultCode == PROGRESS_UPDATE_VIDEO) msg="Downloading Video";
+            else if (resultCode == PROGRESS_UPDATE_MERGING) msg="Merging";
+            else msg = bundle.getString(FETCH_MESSAGE);
+            updateShareDownloadProgress(bundle.getInt(PROGRESS),msg);
+        });
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/adapters/DownloadAdapter.java b/app/src/main/java/com/mugames/vidsnap/ui/adapters/DownloadAdapter.java
index cd3737c..4de55a1 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/adapters/DownloadAdapter.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/adapters/DownloadAdapter.java
@@ -20,6 +20,8 @@
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -27,12 +29,14 @@
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 import com.mugames.vidsnap.R;
+import com.mugames.vidsnap.network.Downloader;
 import com.mugames.vidsnap.utility.bundles.DownloadDetails;
 import com.mugames.vidsnap.utility.DownloadReceiver;
 import com.mugames.vidsnap.utility.Statics;
@@ -46,16 +50,12 @@ public class DownloadAdapter extends ListAdapter<DownloadDetails, DownloadAdapte
 
     String TAG = Statics.TAG + ":DownloadAdapter";
 
-    MainActivityViewModel activityViewModel;
-    DownloadViewModel viewModel;
-    Fragment fragment;
+    final Fragment fragment;
 
 
-    public DownloadAdapter(MainActivityViewModel activityViewModel, DownloadViewModel downloadViewModel, Fragment fragment) {
+    public DownloadAdapter(Fragment fragment) {
         super(DIFF_CALLBACK);
         this.fragment = fragment;
-        viewModel = downloadViewModel;
-        this.activityViewModel = activityViewModel;
     }
 
     private static final @NonNull
@@ -84,32 +84,33 @@ public void onBindViewHolder(@NonNull DownloadViewHolder holder, int position) {
         DownloadDetails details = getItem(position);
         holder.downloadText.setText(details.fileName+"."+ details.fileType);
 
+        holder.cancelButton.setOnClickListener(v-> Downloader.cancelDownload(getItem(position).id));
+
         Glide.with(fragment).asBitmap().load(details.getThumbNail()).into(holder.thumbNailView);
 
-        ((DownloadReceiver) details.receiver).getResultBundle().observe(fragment, new Observer<Bundle>() {
-            @Override
-            public void onChanged(Bundle bundle) {
-                viewModel.process(bundle);
-                viewModel.getDownloadProgress().observe(fragment, s -> holder.sizeText.setText(s));
-                viewModel.getProgressPercentage().observe(fragment, s -> holder.progressText.setText(s));
-                viewModel.getSpeed().observe(fragment, s -> holder.speedText.setText(s));
-                viewModel.getStatus().observe(fragment, s -> holder.statusText.setText(s));
-                viewModel.getVal().observe(fragment, holder.progressBar::setProgress);
-            }
+        DownloadViewModel viewModel = new DownloadViewModel();
+
+        ((DownloadReceiver) details.receiver).getResultBundle().observe(fragment, bundle -> {
+            viewModel.process(bundle);
+            viewModel.getDownloadProgress().observe(fragment, holder.sizeText::setText);
+            viewModel.getProgressPercentage().observe(fragment, holder.progressText::setText);
+            viewModel.getSpeed().observe(fragment, holder.speedText::setText);
+            viewModel.getStatus().observe(fragment, holder.statusText::setText);
+            viewModel.getVal().observe(fragment, holder.progressBar::setProgress);
         });
     }
 
 
     static class DownloadViewHolder extends RecyclerView.ViewHolder {
 
-        TextView downloadText;
-        public TextView speedText;
+        final TextView downloadText;
+        public final TextView speedText;
         public final ProgressBar progressBar;
-        public ImageView thumbNailView;
-        public TextView sizeText;
-        public TextView progressText;
-        public TextView statusText;
-
+        public final ImageView thumbNailView;
+        public final TextView sizeText;
+        public final TextView progressText;
+        public final TextView statusText;
+        public final ImageButton cancelButton;
 
         DownloadViewHolder(LayoutInflater layoutInflater, ViewGroup parent) {
             super(layoutInflater.inflate(R.layout.fragment_downloading_item, parent, false));
@@ -121,6 +122,7 @@ static class DownloadViewHolder extends RecyclerView.ViewHolder {
             thumbNailView = itemView.findViewById(R.id.download_thumb);
             progressText = itemView.findViewById(R.id.download_progress_text);
             statusText = itemView.findViewById(R.id.download_status);
+            cancelButton = itemView.findViewById(R.id.download_cancel);
         }
 
 
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/adapters/DownloadableAdapter.java b/app/src/main/java/com/mugames/vidsnap/ui/adapters/DownloadableAdapter.java
index 2d9b9ee..82195bb 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/adapters/DownloadableAdapter.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/adapters/DownloadableAdapter.java
@@ -50,11 +50,11 @@
 public class DownloadableAdapter extends RecyclerView.Adapter<DownloadableAdapter.ViewHolder> {
 
 
-    Formats formats;
-    Fragment fragment;
+    final Formats formats;
+    final Fragment fragment;
 
-    ArrayList<Integer> selected;
-    MutableLiveData<ArrayList<Integer>> selectedList;
+    final ArrayList<Integer> selected;
+    final MutableLiveData<ArrayList<Integer>> selectedList;
     public boolean selectionStarted;
 
     public DownloadableAdapter(Fragment fragment, Formats formats) {
@@ -131,7 +131,7 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         });
     }
 
-    OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(true) {
+    final OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(true) {
         @Override
         public void handleOnBackPressed() {
             if(selectionStarted) {
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/fragments/DownloadFragment.java b/app/src/main/java/com/mugames/vidsnap/ui/fragments/DownloadFragment.java
index be4ba9e..d3e7c7e 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/fragments/DownloadFragment.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/fragments/DownloadFragment.java
@@ -54,7 +54,6 @@ public class DownloadFragment extends Fragment {
 
 
     MainActivityViewModel activityViewModel;
-    DownloadViewModel downloadViewModel;
 
 
     public DownloadFragment() {
@@ -78,8 +77,6 @@ public View onCreateView(@NotNull LayoutInflater inflater, ViewGroup container,
 
         View view;
         activityViewModel = new ViewModelProvider(getActivity(),ViewModelProvider.AndroidViewModelFactory.getInstance(getActivity().getApplication())).get(MainActivityViewModel.class);
-        downloadViewModel = new ViewModelProvider(this).get(DownloadViewModel.class);
-
 
         view = inflater.inflate(R.layout.fragment_downloading, container, false);
 
@@ -88,7 +85,7 @@ public View onCreateView(@NotNull LayoutInflater inflater, ViewGroup container,
 
         recyclerView = view.findViewById(R.id.download_recyclerView);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        adapter = new DownloadAdapter(activityViewModel, downloadViewModel, this);
+        adapter = new DownloadAdapter( this);
 
         activityViewModel.getDownloadDetailsLiveData().observe(getViewLifecycleOwner(), new Observer<ArrayList<DownloadDetails>>() {
             @Override
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/fragments/HistoryFragment.java b/app/src/main/java/com/mugames/vidsnap/ui/fragments/HistoryFragment.java
index e7da859..64636ec 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/fragments/HistoryFragment.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/fragments/HistoryFragment.java
@@ -80,21 +80,6 @@ public void onChanged(List<History> histories) {
                 recyclerView.setAdapter(adapter);
             }
         });
-//        historyViewModel.getAllValues().observe(getViewLifecycleOwner(), new Observer<List<History>>() {
-//            @Override
-//            public void onChanged(List<History> histories) {
-////                if(!histories.isEmpty()){
-////
-////                }else {
-////                    FragmentManager manager = getActivity().getSupportFragmentManager();
-////                    FragmentTransaction trans = manager.beginTransaction();
-////                    trans.remove(HistoryFragment.this );
-////                    trans.commit();
-////                    manager.popBackStack();
-////                    ((MainActivity)getActivity()).replaceFragment(NoRecordFragment.newInstance("There is no download done yet"),NoRecordFragment.class.getName());
-////                }
-//            }
-//        });
         return view;
     }
 
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/fragments/LoginFragment.java b/app/src/main/java/com/mugames/vidsnap/ui/fragments/LoginFragment.java
index fac15e8..3216e25 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/fragments/LoginFragment.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/fragments/LoginFragment.java
@@ -18,9 +18,6 @@
 package com.mugames.vidsnap.ui.fragments;
 
 import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,10 +27,13 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import androidx.fragment.app.Fragment;
+
 import com.mugames.vidsnap.R;
 import com.mugames.vidsnap.utility.Statics;
 import com.mugames.vidsnap.utility.UtilityInterface;
 
+import java.util.HashMap;
 
 
 /**
@@ -53,6 +53,8 @@ public class LoginFragment extends Fragment {
     UtilityInterface.CookiesInterface cookiesInterface;
     String cookies;
 
+    HashMap<String,String> headers = new HashMap<>();
+
     public LoginFragment() {
         // Required empty public constructor
     }
@@ -69,6 +71,8 @@ public static LoginFragment newInstance(String url, String[] loginDoneUrls, Stri
         return fragment;
     }
 
+
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -87,7 +91,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         webView.setWebViewClient(new CustomWebClient());
         WebSettings webSettings=webView.getSettings();
         webSettings.setJavaScriptEnabled(true);
-        webView.loadUrl(mUrl);
+        if(mUrl.contains("instagram") || mUrl.contains("facebook") || mUrl.contains("fb.com")) {
+            webSettings.setUserAgentString("Mozilla/5.0 (Linux; U; Android 2.2; en-gb; VidSnap Build/FRF50) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1");
+            headers.put("HTTP_X-Requested-With","com.android.chrome");
+            webView.loadUrl(mUrl,headers);
+        }else webView.loadUrl(mUrl);
         return view;
     }
 
@@ -98,9 +106,8 @@ public void onPageFinished(WebView view, String url) {
             super.onPageFinished(view, url);
             Log.d(TAG, "onPageFinished: " + url);
             if (isFinalUrl(url) && !signedIn) {
-                Log.d(TAG, "onPageFinished: InstagramSigned in");
+                Log.d(TAG, "onPageFinished: Website Signed in");
                 String cookies = CookieManager.getInstance().getCookie(url);
-                Log.d(TAG, "All the cookies in a string:" + cookies);
                 while (webView.canGoBack())
                     webView.goBack();
                 cookiesInterface.onReceivedCookies(cookies);
@@ -108,6 +115,7 @@ public void onPageFinished(WebView view, String url) {
             }
         }
 
+
         boolean isFinalUrl(String url){
             for (String tURL: loginDoneUrls) {
                 if(tURL.equals(url)) return true;
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/fragments/QualityFragment.java b/app/src/main/java/com/mugames/vidsnap/ui/fragments/QualityFragment.java
index 55259c3..addb0b4 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/fragments/QualityFragment.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/fragments/QualityFragment.java
@@ -92,20 +92,25 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         qualityAdapter adapter = new qualityAdapter(qualityList.size(), qualityList, sizesList);
 
         recyclerView.setAdapter(adapter);
-        Button download = view.findViewById(R.id.download);
+        Button download_mp_4 = view.findViewById(R.id.download_mp4);
+        Button download_mp_3 = view.findViewById(R.id.download_mp3);
+        Button share = view.findViewById(R.id.share);
 
         ImageView imageView = view.findViewById(R.id.thumbnail_img);
         imageView.setImageBitmap(thumbNail);
         editText = view.findViewById(R.id.edit_name);
 
-        download.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                callback.onDownloadButtonPressed(editText.getText().toString());
-                QualityFragment.this.dismiss();
-            }
+        download_mp_4.setOnClickListener(v -> {
+              callback.onDownloadMP4ButtonPressed(editText.getText().toString());
+            QualityFragment.this.dismiss();
         });
 
+        download_mp_3.setOnClickListener(v->{
+            callback.onDownloadMP3ButtonPressed(editText.getText().toString());
+        });
+        share.setOnClickListener(v -> {
+            callback.onShareButtonPressed(editText.getText().toString());
+        });
     }
 
 
@@ -114,10 +119,10 @@ public void setName(String name) {
         editText.setText(name);
     }
 
-    @Override
-    public int getTheme() {
-        return R.style.CustomBottomSheetDialog;
-    }
+//    @Override
+//    public int getTheme() {
+//        return R.style.CustomBottomSheetDialog;
+//    }
 
     private class ViewHolder extends RecyclerView.ViewHolder {
 
@@ -159,14 +164,8 @@ public void onBindViewHolder(ViewHolder holder, int position) {
             holder.qualityLabel.setText(mQualities.get(position));
             holder.sizeText.setText(String.format("%s MB", mSizes.get(position)));
 
-            View.OnClickListener listener = new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    itemCheckChanged(v);
-                }
-            };
 
-            holder.itemView.setOnClickListener(listener);
+            holder.itemView.setOnClickListener(this::itemCheckChanged);
 
             if (radioButtons.size() == 0) {
                 holder.radioButton.setChecked(true);
@@ -174,7 +173,7 @@ public void onClick(View v) {
                 selectedItem = 0;
             } else holder.radioButton.setChecked(false);
 
-            holder.radioButton.setOnClickListener(listener);
+            holder.radioButton.setOnClickListener(this::itemCheckChanged);
 
             Object test = null;
 
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/fragments/StatusFragment.java b/app/src/main/java/com/mugames/vidsnap/ui/fragments/StatusFragment.java
index ef0a860..6bb344a 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/fragments/StatusFragment.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/fragments/StatusFragment.java
@@ -20,6 +20,7 @@
 
 import static com.mugames.vidsnap.utility.Statics.TAG;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -34,12 +35,15 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
+import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.os.Environment;
+import android.os.storage.StorageManager;
+import android.provider.DocumentsContract;
 import android.provider.OpenableColumns;
 import android.provider.Settings;
 import android.util.Log;
@@ -58,13 +62,16 @@
 import com.bumptech.glide.request.FutureTarget;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.mugames.vidsnap.R;
+import com.mugames.vidsnap.extractor.status.WhatsApp;
 import com.mugames.vidsnap.storage.AppPref;
+import com.mugames.vidsnap.storage.FileUtil;
 import com.mugames.vidsnap.utility.bundles.DownloadDetails;
 import com.mugames.vidsnap.utility.UtilityInterface;
 import com.mugames.vidsnap.ui.activities.MainActivity;
 import com.mugames.vidsnap.ui.adapters.DownloadableAdapter;
 import com.mugames.vidsnap.ui.viewmodels.StatusFragmentViewModel;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.concurrent.ExecutionException;
 
@@ -116,11 +123,11 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             permissionLauncher = registerForActivityResult(
                     new ActivityResultContracts.StartActivityForResult(),
                     result -> {
-                        if (Environment.isExternalStorageManager())
+                        if(result.getResultCode()== Activity.RESULT_OK){
                             viewModel.searchForStatus(null, (MainActivity) getActivity());
-                        else {
-                            Toast.makeText(getContext(), "Permission Denied", Toast.LENGTH_SHORT).show();
-                            socialMediaSpinner.setSelection(0);
+                            if (result.getData() != null) {
+                                AppPref.getInstance(requireContext()).setWhatsAppUri(result.getData());
+                            }
                         }
                     }
             );
@@ -174,10 +181,10 @@ public void onItemSelected(AdapterView<?> adapterView, View view, int position,
 
     void checkPermissionForWhatsApp() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (!Environment.isExternalStorageManager())
+            if (AppPref.getInstance(requireContext()).getWhatsAppUri()==null)
                 getPermissionRandAbove();
             else viewModel.searchForStatus(null, (MainActivity) getActivity());
-        } else if (ContextCompat.checkSelfPermission(getContext(), READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED)
+        } else if (ContextCompat.checkSelfPermission(requireContext(), READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED)
             permissionResult.launch(READ_EXTERNAL_STORAGE);
         else viewModel.searchForStatus(null, (MainActivity) getActivity());
     }
@@ -185,14 +192,14 @@ void checkPermissionForWhatsApp() {
 
     @RequiresApi(api = Build.VERSION_CODES.R)
     private void getPermissionRandAbove() {
-        Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
-        intent.addCategory(Intent.CATEGORY_DEFAULT);
-        intent.setData(Uri.parse(String.format("package:%s", getContext().getPackageName())));
-        MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(getContext());
-        dialogBuilder.setMessage("Your device version requires special storage permission to access WhatsApp's folder. Allow us to proceed towards Status Saving")
+        Intent intent = ((StorageManager)requireContext().getSystemService(Context.STORAGE_SERVICE)).getPrimaryStorageVolume().createOpenDocumentTreeIntent();
+        Uri uri = DocumentsContract.buildDocumentUri("com.android.externalstorage.documents","primary:"+WhatsApp.WHATSAPP+"/WhatsApp/"+WhatsApp.SUFFIX_PATH);
+        intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI,uri);
+        MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(requireContext());
+        dialogBuilder.setMessage("Your device version requires special storage permission to access WhatsApp's folder. Allow us to proceed towards Status Saving\n\nClick USE THIS FOLDER->ALLOW from prompt")
                 .setTitle("Permission Required!")
-                .setPositiveButton("Allow", (dialogInterface, i) -> permissionLauncher.launch(intent))
-                .setNegativeButton("Deny", (dialogInterface, i) -> {
+                .setPositiveButton("Open", (dialogInterface, i) -> permissionLauncher.launch(intent))
+                .setNegativeButton("Cancel", (dialogInterface, i) -> {
                     Toast.makeText(getContext(), "Permission Denied", Toast.LENGTH_SHORT).show();
                     socialMediaSpinner.setSelection(0);
                 })
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/fragments/VideoFragment.java b/app/src/main/java/com/mugames/vidsnap/ui/fragments/VideoFragment.java
index 324aee4..17c327a 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/fragments/VideoFragment.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/fragments/VideoFragment.java
@@ -43,8 +43,10 @@
 import com.bumptech.glide.request.FutureTarget;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.mugames.vidsnap.storage.AppPref;
+import com.mugames.vidsnap.utility.MIMEType;
 import com.mugames.vidsnap.utility.UtilityClass;
 import com.mugames.vidsnap.ui.viewmodels.VideoFragmentViewModel;
 import com.mugames.vidsnap.ui.activities.MainActivity;
@@ -71,15 +73,13 @@ public class VideoFragment extends Fragment implements
 
     String TAG = Statics.TAG + ":VideoFragment";
 
+
     MainActivity activity;
 
     Button analysis;
     EditText urlBox;
     Button button;
 
-    DownloadDetails details;
-    Formats formats;
-
 
     RecyclerView list;
     DownloadableAdapter adapter;
@@ -92,6 +92,7 @@ public class VideoFragment extends Fragment implements
 
     VideoFragmentViewModel viewModel;
 
+
     private QualityFragment dialogFragment = null;
 
     public static VideoFragment newInstance(String link) {
@@ -147,6 +148,8 @@ public void onClick(View v) {
                 hideKeyboard(v);
         });
 
+        viewModel.updateActivityReference(activity);
+
         if (link != null) startProcess(link);
         return view;
 
@@ -154,13 +157,10 @@ public void onClick(View v) {
 
     public void startProcess(String link) {
         urlBox.setText(link);
-        if (dialogFragment != null)
-            dialogFragment.dismiss();
-
-        dialogFragment = null;
+        safeDismissBottomSheet();
         if (viewModel.onClickAnalysis(urlBox.getText().toString(), (MainActivity) getActivity()) == null)
             unLockAnalysis();
-        else linkFor(link);
+        else setCrashCauseLink(link); // Only if it is valid URL it reach here
     }
 
     private void hideKeyboard(View v) {
@@ -174,15 +174,20 @@ private void hideKeyboard(View v) {
         }
     }
 
+    void safeDismissBottomSheet() {
+        try {
+            dialogFragment.dismiss();
+        } catch (IllegalArgumentException | NullPointerException e) {
+            Log.e(TAG, "safeDismissBottomSheet: ",e );
+        }
+        dialogFragment = null;
+    }
 
-    void linkFor(String link) {
-        size = 0;
-        if (dialogFragment != null && dialogFragment.isVisible()) dialogFragment.dismiss();
 
+    void setCrashCauseLink(String link) {
         Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("TAG");
         if (fragment != null)
             ((QualityFragment) fragment).dismiss();
-
         FirebaseCrashlytics.getInstance().setCustomKey("URL", link);
     }
 
@@ -229,22 +234,22 @@ void resetMultiVideoList() {
 
 
     void actionForSOLOFile() {
-        details = new DownloadDetails();
-        formats = viewModel.getFormats();
+        Formats formats = viewModel.getFormats();
 
         dialogFragment = QualityFragment.newInstance(formats.qualities, formats.videoSizeInString);
         dialogFragment.setRequired(this);
 
-        Glide.with(getContext())
+        Glide.with(requireContext())
                 .asBitmap()
                 .load(Uri.parse(formats.thumbNailsURL.get(0)))
                 .into(new CustomTarget<Bitmap>() {
                     @Override
                     public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
-                        details.setThumbNail(getContext(), resource);
+                        viewModel.getDownloadDetails().setThumbNail(getContext(), resource);
                         dialogFragment.setThumbNail(resource);
                         if (!isPaused)
                             dialogFragment.show(activity.getSupportFragmentManager(), "TAG");
+
                     }
 
                     @Override
@@ -259,24 +264,25 @@ public void onLoadCleared(@Nullable Drawable placeholder) {
     public void onPause() {
         super.onPause();
         isPaused = true;
-        if (dialogFragment != null)
-            dialogFragment.dismiss();
+        safeDismissBottomSheet();
     }
 
     @Override
     public void onResume() {
         super.onResume();
         isPaused = false;
-        if (dialogFragment != null) {
-            dialogFragment.show(activity.getSupportFragmentManager(), "TAG");
-        }
+        try {
+            if (viewModel.getFormats() != null && !viewModel.getFormats().isMultipleFile()) {
+                if (dialogFragment == null) actionForSOLOFile();
+                else dialogFragment.show(activity.getSupportFragmentManager(), "TAG");
+            }
+        } catch (IllegalStateException e) {}
 
     }
 
     @Override
     public void onDestroy() {
-        dialogFragment.dismiss();
-        dialogFragment = null;
+        safeDismissBottomSheet();
         super.onDestroy();
     }
 
@@ -326,20 +332,67 @@ public void actionForMOREFile() {
 
     }
 
-    @Override
-    public void onDownloadButtonPressed(String fileName) {
+    void updateUiOnDownloadPressed(){
+        viewModel.getDownloadDetails().srcUrl = urlBox.getText().toString();
+        safeDismissBottomSheet();
         dialogFragment = null;
         urlBox.setText("");
+    }
 
+    @Override
+    public void onDownloadMP4ButtonPressed(String fileName) {
+        updateUiOnDownloadPressed();
+        downloadVideo(fileName,false);
+
+    }
+
+    void downloadVideo(String fileName, boolean isOnlyShare){
+        viewModel.nullifyFormats();
         ArrayList<DownloadDetails> downloadDetails = new ArrayList<>();
         fileName = removeStuffFromName(fileName);
-        details.fileName = fileName.split("\\.")[0];
-        downloadDetails.add(details);
+        viewModel.getDownloadDetails().isShareOnlyDownload = isOnlyShare;
+        viewModel.getDownloadDetails().fileName = fileName.split("\\.")[0];
+        downloadDetails.add(viewModel.getDownloadDetails());
         activity.download(downloadDetails);
     }
 
+    @Override
+    public void onDownloadMP3ButtonPressed(String fileName) {
+        updateUiOnDownloadPressed();
+        ArrayList<DownloadDetails> downloadDetails = new ArrayList<>();
+        if(!viewModel.getFormats().audioURLs.isEmpty()){
+            fileName = removeStuffFromName(fileName+"_mp3 version");
+            viewModel.getDownloadDetails().fileName = fileName.split("\\.")[0];
+            viewModel.getDownloadDetails().fileType = "mp3";
+            viewModel.getDownloadDetails().fileMime = viewModel.getDownloadDetails().mimeAudio;
+            viewModel.getDownloadDetails().audioURL = null;
+            viewModel.getDownloadDetails().videoSize = viewModel.getDownloadDetails().audioSize;
+            viewModel.getDownloadDetails().fileMime = MIMEType.AUDIO_MP4;
+            viewModel.getDownloadDetails().videoURL = viewModel.getFormats().audioURLs.get(0);
+            downloadDetails.add(viewModel.getDownloadDetails());
+            activity.download(downloadDetails);
+        }else {
+            new MaterialAlertDialogBuilder(requireContext())
+                    .setTitle("Under Construction")
+                    .setMessage("Mp3 feature other than YouTube is currently under development.\nStay tuned, cheers")
+                    .setPositiveButton("Good Job!",null)
+                    .setCancelable(true)
+                    .show();
+        }
+        viewModel.nullifyFormats();
+
+    }
+
+    @Override
+    public void onShareButtonPressed(String fileName) {
+        updateUiOnDownloadPressed();
+        downloadVideo(fileName,true);
+    }
+
     @Override
     public void onSelectedItem(int position, QualityFragment qualityFragment) {
+        DownloadDetails details = viewModel.getDownloadDetails();
+        Formats formats = viewModel.getFormats();
         try {
             details.chunkUrl = formats.chunkUrlList.get(position);
             details.chunkCount = formats.manifest.get(position).size();
@@ -359,6 +412,7 @@ public void onSelectedItem(int position, QualityFragment qualityFragment) {
         details.videoSize = formats.videoSizes.get(position);
         try {
             details.audioURL = formats.audioURLs.get(0);
+            details.audioSize = formats.audioSizes.get(0);
         } catch (IndexOutOfBoundsException e) {
             details.audioURL = null;
         }
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/DownloadViewModel.java b/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/DownloadViewModel.java
index cc96d1d..d150b7a 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/DownloadViewModel.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/DownloadViewModel.java
@@ -38,18 +38,16 @@
 import static com.mugames.vidsnap.utility.Statics.TOTAL_SIZE;
 import static com.mugames.vidsnap.utility.UtilityClass.formatFileSize;
 
-public class DownloadViewModel extends AndroidViewModel {
+public class DownloadViewModel{
 
-    MutableLiveData<String> downloadProgress = new MutableLiveData<>();
-    MutableLiveData<String> progressPercentage = new MutableLiveData<>();
-    MutableLiveData<String> speed = new MutableLiveData<>();
-    MutableLiveData<String> status = new MutableLiveData<>();
+    final MutableLiveData<String> downloadProgress = new MutableLiveData<>();
+    final MutableLiveData<String> progressPercentage = new MutableLiveData<>();
+    final MutableLiveData<String> speed = new MutableLiveData<>();
+    final MutableLiveData<String> status = new MutableLiveData<>();
 
-    MutableLiveData<Integer> valStr = new MutableLiveData<>();
+    final MutableLiveData<Integer> valStr = new MutableLiveData<>();
 
-    public DownloadViewModel(@NonNull @NotNull Application application) {
-        super(application);
-    }
+    public DownloadViewModel() { }
 
     public LiveData<String> getDownloadProgress() {
         return downloadProgress;
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/MainActivityViewModel.java b/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/MainActivityViewModel.java
index e1bb805..be64a67 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/MainActivityViewModel.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/MainActivityViewModel.java
@@ -18,6 +18,7 @@
 package com.mugames.vidsnap.ui.viewmodels;
 
 import static com.mugames.vidsnap.firebase.FirebaseCallBacks.UpdateCallbacks;
+import static com.mugames.vidsnap.utility.Statics.OUTFILE_URI;
 
 import android.app.Application;
 import android.app.DownloadManager;
@@ -27,6 +28,7 @@
 import android.content.IntentFilter;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Bundle;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -37,6 +39,7 @@
 import com.mugames.vidsnap.firebase.FirebaseManager;
 import com.mugames.vidsnap.R;
 import com.mugames.vidsnap.storage.AppPref;
+import com.mugames.vidsnap.storage.FileUtil;
 import com.mugames.vidsnap.utility.bundles.DownloadDetails;
 import com.mugames.vidsnap.utility.DownloadReceiver;
 import com.mugames.vidsnap.utility.Statics;
@@ -53,13 +56,6 @@ public class MainActivityViewModel extends AndroidViewModel implements UtilityIn
     String TAG = Statics.TAG + "MainActivityViewModel";
 
 
-
-    public static final String STATIC_CACHE = ".historyDB";
-    public static final String DYNAMIC_CACHE = ".essential";
-    public static final String LIBRARY_PATH = "libs";
-
-    public static final String db_name = "historyCache";
-
     public FirebaseManager firebaseManager;
 
     public ArrayList<DownloadDetails> tempDetails = new ArrayList<>();
@@ -74,15 +70,17 @@ public class MainActivityViewModel extends AndroidViewModel implements UtilityIn
     public static final ArrayList<DownloadDetails> downloadDetailsList = new ArrayList<>();
     MutableLiveData<ArrayList<DownloadDetails>> downloadDetailsMutableLiveData = new MutableLiveData<>();
 
-
+    boolean isProgressDialogVisible;
+    String progressDialogText;
+    private Bundle tempResultBundle;
 
     Random random = new Random();
 
     public MainActivityViewModel(@NonNull @NotNull Application application) {
         super(application);
         firebaseManager = FirebaseManager.getInstance(application);
-        for (DownloadDetails details :downloadDetailsList) {
-            ((DownloadReceiver)details.receiver).setCallback(this);
+        for (DownloadDetails details : downloadDetailsList) {
+            ((DownloadReceiver) details.receiver).setCallback(this);
         }
         activeDownload.setValue(downloadDetailsList.size());
     }
@@ -130,18 +128,18 @@ public LiveData<ArrayList<DownloadDetails>> getDownloadDetailsLiveData() {
         return downloadDetailsMutableLiveData;
     }
 
-    public boolean isAgree() {
-        return AppPref.getInstance(getApplication()).getBooleanValue(R.string.key_terms_con, false);
+    public boolean isNotAgreed() {
+        return !AppPref.getInstance(getApplication()).getBooleanValue(R.string.key_terms_con, false);
     }
 
     public ArrayList<DownloadDetails> getDownloadDetailsList() {
         return downloadDetailsList;
     }
 
-    public int getUniqueDownloadId(){
+    public int getUniqueDownloadId() {
         int ran = random.nextInt();
         for (DownloadDetails details : tempDetails) {
-            while (ran==details.id) ran =random.nextInt();
+            while (ran == details.id) ran = random.nextInt();
         }
         return ran;
     }
@@ -154,24 +152,40 @@ public void onDownloadCompleted(int id) {
 
     DownloadManager downloadManager;
     long downloadId;
-    boolean downloading = true;
+    private boolean downloading = false;
 
     UtilityInterface.ModuleDownloadCallback moduleDownloadCallback;
 
     public void downloadSO(String url, UtilityInterface.ModuleDownloadCallback callback) {
+        downloading = true;
         moduleDownloadCallback = callback;
         downloadManager = (DownloadManager) getApplication().getSystemService(Context.DOWNLOAD_SERVICE);
         getApplication().registerReceiver(onComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
 
         Uri uri = Uri.parse(url);
         DownloadManager.Request request = new DownloadManager.Request(uri);
-//        request.setDestinationInExternalFilesDir(getApplication(), LIBRARY_PATH, "lib.zip");
-        request.setDestinationUri(Uri.fromFile(new File(AppPref.getInstance(getApplication()).getCachePath(LIBRARY_PATH)+"lib.zip")));
+        request.setDestinationUri(Uri.fromFile(new File(AppPref.getInstance(getApplication()).getCachePath(AppPref.LIBRARY_PATH) + "lib.zip")));
         downloadId = downloadManager.enqueue(request);
 
         downloadValues();
     }
 
+    public boolean isProgressDialogVisible() {
+        return isProgressDialogVisible;
+    }
+
+    public String getProgressDialogText() {
+        return progressDialogText;
+    }
+
+    public void setProgressDialogState(boolean isVisible, String text) {
+        isProgressDialogVisible = isVisible;
+        progressDialogText = text;
+    }
+
+    public boolean isDownloadingSOFile() {
+        return downloading;
+    }
 
     private void downloadValues() {
         new Thread(() -> {
@@ -234,10 +248,40 @@ public LiveData<String> getDownloadStatusLiveData() {
     BroadcastReceiver onComplete = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            Log.e(TAG, "onReceive: Download completed" );
+            Log.e(TAG, "onReceive: Download completed");
             downloadProgressLiveData.postValue(100);
             downloading = false;
             moduleDownloadCallback.onDownloadEnded();
         }
     };
+
+    public Bundle getTempResultBundle() {
+        return tempResultBundle;
+    }
+
+    public void setTempResultBundle(Bundle tempResultBundle) {
+        this.tempResultBundle = tempResultBundle;
+    }
+
+    public void deleteSharedFile() {
+        Uri uri = Uri.parse(tempResultBundle.getString(OUTFILE_URI));
+        FileUtil.deleteFile(
+                getApplication().getExternalFilesDir(null) + File.separator + uri.getLastPathSegment(),
+                null
+        );
+    }
+
+    public void setDownloadingSOFile(boolean downloadingSOFile) {
+        this.downloading = downloadingSOFile;
+    }
+
+    public static final int NO_SHARE_ONLY_FILES_DOWNLOADING = -1;
+
+    public int shareOnlyDownloadStatus() {
+        for (DownloadDetails details :
+                downloadDetailsList) {
+            if (details.isShareOnlyDownload) return details.id;
+        }
+        return NO_SHARE_ONLY_FILES_DOWNLOADING;
+    }
 }
diff --git a/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/VideoFragmentViewModel.java b/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/VideoFragmentViewModel.java
index 3a247e3..817915a 100644
--- a/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/VideoFragmentViewModel.java
+++ b/app/src/main/java/com/mugames/vidsnap/ui/viewmodels/VideoFragmentViewModel.java
@@ -10,6 +10,7 @@
 import com.mugames.vidsnap.extractor.Twitter;
 import com.mugames.vidsnap.extractor.YouTube;
 import com.mugames.vidsnap.extractor.Extractor;
+import com.mugames.vidsnap.utility.bundles.DownloadDetails;
 import com.mugames.vidsnap.utility.bundles.Formats;
 import com.mugames.vidsnap.utility.UtilityInterface;
 import com.mugames.vidsnap.ui.activities.MainActivity;
@@ -23,10 +24,13 @@ public class VideoFragmentViewModel extends AndroidViewModel implements UtilityI
 
     public static final String URL_KEY = "com.mugames.vidsnap.ui.ViewModels.VideoFragmentViewModel.URL_KEY";
 
+
     ArrayList<Integer> selected = new ArrayList<>();
     UtilityInterface.AnalyzeUICallback analyzeUICallback;
 
     Formats formats;
+    DownloadDetails details;
+    Extractor extractor;
 
     public VideoFragmentViewModel(@NonNull @NotNull Application application) {
         super(application);
@@ -34,7 +38,7 @@ public VideoFragmentViewModel(@NonNull @NotNull Application application) {
     
     
     public Extractor onClickAnalysis(String url,MainActivity activity){
-        Extractor extractor;
+        formats = new Formats();
         if (url.contains("youtu")) {
             extractor = new YouTube();
         } else if (url.contains("instagram")) {
@@ -49,10 +53,9 @@ public Extractor onClickAnalysis(String url,MainActivity activity){
         }
         if(extractor!=null) {
             extractor.setContext(getApplication());
-            extractor.setLoginHelper(activity);
-            extractor.setDialogueInterface(activity);
             extractor.setAnalyzeCallback(this);
             extractor.setLink(url);
+            updateActivityReference(activity);
             extractor.start();
         }
         return extractor;
@@ -72,6 +75,21 @@ public Formats getFormats() {
         return formats;
     }
 
+    public void nullifyFormats(){
+        formats = null;
+    }
+
+    public DownloadDetails getDownloadDetails(){
+        if (details==null) details = new DownloadDetails();
+        return details;
+    }
+
+    public void updateActivityReference(MainActivity activity){
+        if(extractor==null) return;
+        extractor.setLoginHelper(activity);
+        extractor.setDialogueInterface(activity);
+    }
+
 
     public void setAnalyzeUICallback(UtilityInterface.AnalyzeUICallback analyzeUICallback) {
         this.analyzeUICallback = analyzeUICallback;
diff --git a/app/src/main/java/com/mugames/vidsnap/utility/DownloadReceiver.java b/app/src/main/java/com/mugames/vidsnap/utility/DownloadReceiver.java
index 3d9d3c0..38a3e9f 100644
--- a/app/src/main/java/com/mugames/vidsnap/utility/DownloadReceiver.java
+++ b/app/src/main/java/com/mugames/vidsnap/utility/DownloadReceiver.java
@@ -18,9 +18,13 @@
 package com.mugames.vidsnap.utility;
 
 import static com.mugames.vidsnap.utility.Statics.ERROR_DOWNLOADING;
+import static com.mugames.vidsnap.utility.Statics.IS_SHARE_ONLY_DOWNLOAD;
 import static com.mugames.vidsnap.utility.Statics.OUTFILE_URI;
+import static com.mugames.vidsnap.utility.Statics.PROGRESS;
+import static com.mugames.vidsnap.utility.Statics.PROGRESS_CANCELED;
 import static com.mugames.vidsnap.utility.Statics.PROGRESS_DONE;
 import static com.mugames.vidsnap.utility.Statics.PROGRESS_FAILED;
+import static com.mugames.vidsnap.utility.Statics.PROGRESS_UPDATE;
 import static com.mugames.vidsnap.utility.Statics.RESULT_CODE;
 import static com.mugames.vidsnap.utility.UtilityInterface.DownloadCallback;
 
@@ -32,6 +36,7 @@
 import android.os.Handler;
 import android.os.Parcelable;
 import android.os.ResultReceiver;
+import android.util.Log;
 import android.webkit.MimeTypeMap;
 
 import androidx.core.app.NotificationCompat;
@@ -56,21 +61,21 @@
  */
 public class DownloadReceiver extends ResultReceiver implements Parcelable {
 
-    String TAG = Statics.TAG + ":DownloadReceiver";
-    Context context;
+    final String TAG = Statics.TAG + ":DownloadReceiver";
+    final Context context;
     UtilityInterface.DialogueInterface dialogInterface;
 
-    MutableLiveData<Bundle> resultBundle = new MutableLiveData<>();
+    final MutableLiveData<Bundle> resultBundle = new MutableLiveData<>();
 
 
-    int id;
+    final int id;
     DownloadCallback callback;
 
     public DownloadReceiver(Handler handler, Context context, UtilityInterface.DialogueInterface dialogueInterface, int id, DownloadCallback callback) {
         super(handler);
         this.context = context.getApplicationContext();
         this.callback = callback;
-        this.dialogInterface =dialogueInterface;
+        this.dialogInterface = dialogueInterface;
         this.id = id;
     }
 
@@ -81,14 +86,7 @@ public void setDialogInterface(UtilityInterface.DialogueInterface dialogInterfac
     public void setCallback(DownloadCallback callback) {
         this.callback = callback;
     }
-    //    public void viewHolderToUI(DownloadViewHolder viewHolder) {
-//        this.progressBar = viewHolder.progressBar;
-//        this.progressText = viewHolder.progressText;
-//        this.speedText = viewHolder.speedText;
-//        this.downloadText = viewHolder.sizeText;
-//        this.statusText = viewHolder.statusText;
-//        this.card = viewHolder.itemView;
-//    }
+
 
     public LiveData<Bundle> getResultBundle() {
         return resultBundle;
@@ -98,7 +96,13 @@ public LiveData<Bundle> getResultBundle() {
     protected void onReceiveResult(int resultCode, Bundle resultData) {
         super.onReceiveResult(resultCode, resultData);
 
-        resultData.putInt(RESULT_CODE,resultCode);
+        if (resultCode == PROGRESS_CANCELED) {
+            DownloadDetails.findDetails(id).deleteThumbnail();
+            cancelDownload();
+            return;
+        }
+
+        resultData.putInt(RESULT_CODE, resultCode);
 
         resultBundle.setValue(resultData);
 
@@ -107,16 +111,19 @@ protected void onReceiveResult(int resultCode, Bundle resultData) {
             return;
         }
         if (resultCode == PROGRESS_DONE) {
-            Uri outputUri = Uri.parse(resultData.getString(OUTFILE_URI, null));
-            DownloadDetails details = DownloadDetails.findDetails(id);
-            if(details==null) return;
-            File file = new File(FileUtil.uriToPath(context,outputUri));
-            details.fileName = file.getName().split("\\.")[0];
-            details.fileType = file.getName().split("\\.")[1];
-            details.fileMime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(details.fileType);
-            scan(outputUri.toString());
+            if (!resultData.getBoolean(IS_SHARE_ONLY_DOWNLOAD)) {
+                Uri outputUri = Uri.parse(resultData.getString(OUTFILE_URI, null));
+                DownloadDetails details = DownloadDetails.findDetails(id);
+                File file = new File(FileUtil.uriToPath(context, outputUri));
+                details.fileName = file.getName().split("\\.")[0];
+                details.fileType = file.getName().split("\\.")[1];
+                details.fileMime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(details.fileType);
+                scan(outputUri.toString());
+            } else {
+                callback.onDownloadCompleted(id);
+                ((MainActivity) dialogInterface).shareDownloadedVideo(resultData);
+            }
         }
-
     }
 
     void scan(String fileUri) {
@@ -125,7 +132,6 @@ void scan(String fileUri) {
 
     void notificationSetup(Uri uri) {
         DownloadDetails details = DownloadDetails.findDetails(id);
-        if(details==null) return;
         History history = new History(details, uri);
 
 
@@ -140,7 +146,7 @@ void notificationSetup(Uri uri) {
         PendingIntent pendingIntent = PendingIntent.getActivity(context, 10, play_Intent, 0);
         builder.setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setContentTitle("Download Completed")
-                .setContentText(details.fileName + details.fileType)
+                .setContentText(details.fileName + "." + details.fileType)
                 .setSmallIcon(R.drawable.ic_notification_icon)
                 .setAutoCancel(true)
                 .setContentIntent(pendingIntent);
@@ -156,28 +162,36 @@ synchronized void addItemToDB(History history) {
         pref.setStringValue(R.string.key_clear_history_cache, "Cache is there");
     }
 
+    void cancelDownload() {
+        callback.onDownloadCompleted(id);
+    }
+
     void notificationFailed(Bundle resultData) {
         DownloadDetails details = DownloadDetails.findDetails(id);
+        details.deleteThumbnail();
+
+        String failReason;
+        if(resultData.getString(ERROR_DOWNLOADING).contains("REQUEST_NOT_SUCCESSFUL"))
+            failReason = "Download Link expired/broken. It cannot be resumed";
+        else failReason = "Sorry!! for inconvenience try changing name and re-download or change download location";
 
-        Intent play_Intent = new Intent(context, MainActivity.class);
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(details.srcUrl));
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context, VidSnapApp.NOTIFY_DOWNLOADED);
         NotificationManagerCompat managerCompat = NotificationManagerCompat.from(context);
 
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 10, play_Intent, 0);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 110, browserIntent, 0);
         builder.setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setContentTitle("Download Failed")
-                .setContentText(details.fileName + details.fileType)
+                .setContentText(details.fileName + "." + details.fileType)
                 .setSmallIcon(R.drawable.ic_notification_icon)
                 .setAutoCancel(true)
                 .setContentIntent(pendingIntent);
         managerCompat.notify(new Random().nextInt(), builder.build());
-        dialogInterface.error("Sorry!! for inconvenience try changing name and re-download or change download location",
+        dialogInterface.error(failReason,
                 new Exception(resultData.getString(ERROR_DOWNLOADING)));
         callback.onDownloadCompleted(id);
     }
 
 
-
-
 }
diff --git a/app/src/main/java/com/mugames/vidsnap/utility/Statics.java b/app/src/main/java/com/mugames/vidsnap/utility/Statics.java
index 5061ab8..17d1860 100644
--- a/app/src/main/java/com/mugames/vidsnap/utility/Statics.java
+++ b/app/src/main/java/com/mugames/vidsnap/utility/Statics.java
@@ -25,14 +25,18 @@ public class Statics {
     public static final String DOWNLOAD_SPEED = "dSpeed";
     public static final String ERROR_DOWNLOADING="ERROR";
     public static final String OUTFILE_URI="uriOpUri";
+    public static final String IS_SHARE_ONLY_DOWNLOAD="com.mugames.vidsnap.IS_SHARE_ONLY_DOWNLOAD";
+    public static final String FILE_MIME="com.mugames.vidsnap.MIME";
     public static final String ACTIVE_DOWNLOAD = "Download on progress";
     public static final String FETCH_MESSAGE = "messages from fetch";
+    public static final String TEMP_BUNDLE = "com.mugames.vidsnap.TEMP_BUNDLE";
 
     public static final String RESULT_CODE = "com.mugames.vidsnap.resultCode";
 
     public static final int PROGRESS_UPDATE = 5432;
     public static final int PROGRESS_DONE = 5458;
     public static final int PROGRESS_FAILED = 5756;
+    public static final int PROGRESS_CANCELED = 5113;
     public static final int PROGRESS_UPDATE_MERGING = 1678;
     public static final int PROGRESS_UPDATE_AUDIO = 1456;
     public static final int PROGRESS_UPDATE_VIDEO = 7896;
@@ -40,6 +44,9 @@ public class Statics {
     public static final int REQUEST_WRITE = 1248;
     public static final int REQUEST_STATUS = 4987;
 
+    public static final String ACTION_CANCEL_DOWNLOAD = "com.mugames.vidsnap.Statics.ACTION_CANCEL_DOWNLOAD";
+    public static final String ID_CANCEL_DOWNLOAD_DETAILS = "com.mugames.vidsnap.Statics.ID_CANCEL_DOWNLOAD_DETAILS";
+
     public static final String COMMUNICATOR = "communicator";
 
 
diff --git a/app/src/main/java/com/mugames/vidsnap/utility/UtilityInterface.java b/app/src/main/java/com/mugames/vidsnap/utility/UtilityInterface.java
index a034fa2..a2f0b22 100644
--- a/app/src/main/java/com/mugames/vidsnap/utility/UtilityInterface.java
+++ b/app/src/main/java/com/mugames/vidsnap/utility/UtilityInterface.java
@@ -21,13 +21,16 @@
 import android.os.Bundle;
 import android.view.MotionEvent;
 
+import com.mugames.vidsnap.network.Response;
 import com.mugames.vidsnap.utility.bundles.Formats;
 import com.mugames.vidsnap.ui.fragments.QualityFragment;
 
 
 public interface UtilityInterface {
     interface DownloadUICallBack {
-        void onDownloadButtonPressed(String fileName);
+        void onDownloadMP4ButtonPressed(String fileName);
+        void onDownloadMP3ButtonPressed(String fileName);
+        void onShareButtonPressed(String fileName);
 
         void onSelectedItem(int position, QualityFragment qualityFragment);
     }
@@ -45,7 +48,7 @@ interface MiniExecutorCallBack {
     }
 
     interface ResponseCallBack {
-        void onReceive(String response);
+        void onReceive(Response response);
     }
 
     interface SignNotifier {
diff --git a/app/src/main/java/com/mugames/vidsnap/utility/bundles/DownloadDetails.java b/app/src/main/java/com/mugames/vidsnap/utility/bundles/DownloadDetails.java
index 8d71d39..6e5beef 100644
--- a/app/src/main/java/com/mugames/vidsnap/utility/bundles/DownloadDetails.java
+++ b/app/src/main/java/com/mugames/vidsnap/utility/bundles/DownloadDetails.java
@@ -27,11 +27,14 @@
 import android.os.ResultReceiver;
 
 
+import androidx.annotation.NonNull;
+
 import com.mugames.vidsnap.storage.FileUtil;
 import com.mugames.vidsnap.storage.AppPref;
 import com.mugames.vidsnap.utility.DownloadReceiver;
 import com.mugames.vidsnap.utility.UtilityClass;
-import com.mugames.vidsnap.ui.viewmodels.MainActivityViewModel;
+
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.Random;
@@ -47,8 +50,9 @@ public class DownloadDetails implements Parcelable {
     public Uri pathUri;
     public String fileName;
     public String fileType;
-    public String originalUrl;
+    public String srcUrl;
     public String src;
+    public int videoQualityIndex;
 
     public String videoURL;
     public String audioURL;
@@ -68,8 +72,11 @@ public class DownloadDetails implements Parcelable {
 
     public ResultReceiver receiver;
 
+    public boolean isShareOnlyDownload;
+
 
-    public DownloadDetails() {}
+    public DownloadDetails() {
+    }
 
     protected DownloadDetails(Parcel in) {
         id = in.readInt();
@@ -77,8 +84,9 @@ protected DownloadDetails(Parcel in) {
         pathUri = Uri.parse(in.readString());
         fileName = in.readString();
         fileType = in.readString();
-        originalUrl = in.readString();
+        srcUrl = in.readString();
         src = in.readString();
+        videoQualityIndex = in.readInt();
 
         videoURL = in.readString();
         audioURL = in.readString();
@@ -97,6 +105,8 @@ protected DownloadDetails(Parcel in) {
         thumbHeight = in.readInt();
 
         receiver = in.readParcelable(DownloadReceiver.class.getClassLoader());
+
+        isShareOnlyDownload = in.readByte() != 0;
     }
 
     @Override
@@ -106,8 +116,9 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(pathUri.toString());
         dest.writeString(fileName);
         dest.writeString(fileType);
-        dest.writeString(originalUrl);
+        dest.writeString(srcUrl);
         dest.writeString(src);
+        dest.writeInt(videoQualityIndex);
 
         dest.writeString(videoURL);
         dest.writeString(audioURL);
@@ -125,7 +136,9 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(thumbWidth);
         dest.writeInt(thumbHeight);
 
-        dest.writeParcelable(receiver,flags);
+        dest.writeParcelable(receiver, flags);
+
+        dest.writeByte((byte) (isShareOnlyDownload ? 1 : 0));
     }
 
     @Override
@@ -146,27 +159,28 @@ public DownloadDetails[] newArray(int size) {
     };
 
     public Bitmap getThumbNail() {
-        return UtilityClass.bytesToBitmap(FileUtil.loadImage(thumbNailPath.getPath()),thumbWidth,thumbHeight);
+        return UtilityClass.bytesToBitmap(FileUtil.loadImage(thumbNailPath.getPath()), thumbWidth, thumbHeight);
     }
 
     public void setThumbNail(Context context, Bitmap resource) {
         Random random = new Random();
-        String path = FileUtil.getValidFile(AppPref.getInstance(context).getCachePath(MainActivityViewModel.DYNAMIC_CACHE), String.valueOf(random.nextLong()),"jpg");
-        FileUtil.saveFile(path,UtilityClass.bitmapToBytes(resource),null);
+        String path = FileUtil.getValidFile(AppPref.getInstance(context).getCachePath(AppPref.DYNAMIC_CACHE), String.valueOf(random.nextLong()), "jpg");
+        FileUtil.saveFile(path, UtilityClass.bitmapToBytes(resource), null);
         thumbNailPath = Uri.fromFile(new File(path));
         thumbWidth = resource.getWidth();
         thumbHeight = resource.getHeight();
     }
 
     public void deleteThumbnail() {
-        FileUtil.deleteFile(thumbNailPath.getPath(),null);
+        FileUtil.deleteFile(thumbNailPath.getPath(), null);
     }
 
+    @NonNull
     public static DownloadDetails findDetails(int id) {
         for (DownloadDetails details :
                 downloadDetailsList) {
             if (details.id == id) return details;
         }
-        return null;
+        throw new IllegalArgumentException("id: "+id+" has no details");
     }
 }
diff --git a/app/src/main/res/drawable/circular_progressbar.xml b/app/src/main/res/drawable/circular_progressbar.xml
new file mode 100644
index 0000000..a38f1e3
--- /dev/null
+++ b/app/src/main/res/drawable/circular_progressbar.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  This file is part of VidSnap.
+  ~
+  ~  VidSnap is free software: you can redistribute it and/or modify
+  ~  it under the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation, either version 3 of the License, or
+  ~  any later version.
+  ~  VidSnap is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~  GNU General Public License for more details.
+  ~  You should have received a copy of the GNU General Public License
+  ~  along with VidSnap.  If not, see <https://www.gnu.org/licenses/>.
+  ~
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:shape="ring"
+            android:thicknessRatio="16"
+            android:useLevel="false">
+            <solid android:color="#DDD"/>
+        </shape>
+    </item>
+    <item>
+        <rotate android:fromDegrees="270" android:toDegrees="270">
+            <shape
+                android:shape="ring"
+                android:thicknessRatio="16"
+                android:useLevel="true">
+                <solid android:color="?attr/colorAccent"/>
+            </shape>
+        </rotate>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_downloading_item.xml b/app/src/main/res/layout/fragment_downloading_item.xml
index 7257804..b7e144b 100644
--- a/app/src/main/res/layout/fragment_downloading_item.xml
+++ b/app/src/main/res/layout/fragment_downloading_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~  This file is part of VidSnap.
   ~
   ~  VidSnap is free software: you can redistribute it and/or modify
@@ -16,65 +15,41 @@
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:cardCornerRadius="15dp"
+    android:layout_margin="8dp"
     android:elevation="6dp"
-    android:layout_margin="8dp">
+    app:cardCornerRadius="15dp">
 
     <LinearLayout
-        android:background="@color/list_color"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/list_color"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/download_thumb"
             android:layout_width="152dp"
-            android:layout_height="97dp"
-            android:contentDescription="TODO"
+            android:layout_height="100dp"
             android:padding="10dp" />
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:paddingRight="8dp">
+            android:paddingHorizontal="8dp">
 
             <TextView
                 android:id="@+id/download_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="middle"
-                android:text="-----"
+                android:singleLine="true"
                 android:textSize="18sp"
-                android:singleLine="true" />
-
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:id="@+id/download_status"
-                    android:text="---"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:layout_weight="1"
-                    android:gravity="left"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
-
-                <TextView
-                    android:id="@+id/download_progress_text"
-                    android:layout_width="wrap_content"
-                    android:layout_weight="0"
-                    android:layout_height="wrap_content"
-                    android:gravity="right"
-                    android:text="--- %" />
-
-            </LinearLayout>
+                tools:text="-----" />
 
 
             <LinearLayout
@@ -82,11 +57,61 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <ProgressBar
-                    android:id="@+id/download_progress"
-                    style="?android:progressBarStyleHorizontal"
+
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:id="@+id/download_status"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:ellipsize="end"
+                                android:gravity="start"
+                                android:maxLines="1"
+                                tools:text="sdffffffffffffffffffsdffffffffsdfsdfdfsdf" />
+
+                            <TextView
+                                android:id="@+id/download_progress_text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0"
+                                android:gravity="end"
+                                tools:text="--- %" />
+
+                        </LinearLayout>
+
+                        <ProgressBar
+                            android:id="@+id/download_progress"
+                            style="?android:progressBarStyleHorizontal"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical" />
+                    </LinearLayout>
+
+                    <ImageButton
+                        android:id="@+id/download_cancel"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="0"
+                        android:src="@drawable/ic_cancel" />
+
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -98,15 +123,15 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="-- --/s" />
+                        tools:text="-- --/s" />
 
                     <TextView
                         android:id="@+id/download_size"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="right"
-                        android:text="-- MB/-- MB" />
+                        android:gravity="end"
+                        tools:text="-- MB/-- MB" />
                 </LinearLayout>
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_quality_list_dialog.xml b/app/src/main/res/layout/fragment_quality_list_dialog.xml
index 7c77343..f04f825 100644
--- a/app/src/main/res/layout/fragment_quality_list_dialog.xml
+++ b/app/src/main/res/layout/fragment_quality_list_dialog.xml
@@ -15,11 +15,13 @@
   ~
   -->
 
-<LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
+    app:layout_behavior="@string/bottom_sheet_behavior"
     tools:showIn="bottomSheet">
     <LinearLayout
         android:orientation="horizontal"
@@ -42,10 +44,10 @@
             <EditText
                 android:maxLines="1"
                 android:inputType="text"
+                android:hint="Video Name..."
                 android:id="@+id/edit_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
-
         </LinearLayout>
 
     </LinearLayout>
@@ -68,11 +70,31 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <LinearLayout
+            android:layout_marginHorizontal="8dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/download_mp4"
+                android:layout_width="match_parent"
+                android:text="Download MP4"
+                android:textAllCaps="false"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"/>
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/download_mp3"
+                android:layout_width="match_parent"
+                android:text="Download MP3"
+                android:textAllCaps="false"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"/>
+        </LinearLayout>
         <com.google.android.material.button.MaterialButton
-            android:id="@+id/download"
+            android:id="@+id/share"
             android:layout_width="match_parent"
-            android:text="Download"
+            android:text="Share"
             android:textAllCaps="false"
             android:layout_height="wrap_content"/>
     </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d352727..2b5dae5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,6 +56,7 @@
     <string name="signature_title">Your signature</string>
     <string name="reply_title">Default reply action</string>
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="whatsappUri">whatsapp_uri</string>
 
     <string-array name="social_media_type">
         <item>--Select--</item>
diff --git a/build.gradle b/build.gradle
index f3bd9f4..9d9b0d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/ffmpeg-kit-android-lib/build.gradle b/ffmpeg-kit-android-lib/build.gradle
index be16d8d..cc599ab 100644
--- a/ffmpeg-kit-android-lib/build.gradle
+++ b/ffmpeg-kit-android-lib/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 240440
-        versionName "4.4"
         project.archivesBaseName = "ffmpeg-kit"
         consumerProguardFiles 'proguard-rules.pro'
     }