Update WhatsApp Folder Location.

bumped version to 4.6 Signed-off-by: GauthamAsir <gauthamnadar12@gmail.com>
GauthamAsir · Jun 4, 2021 · e372607 · e372607
1 parent a28e886
commit e372607
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 81 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/dictionaries/Mellow.xml b/.idea/dictionaries/Mellow.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 4
-        versionName "4.5"
+        versionName "4.6"
         Date date = new Date()
         String d = date.format('_ddMMYYYY')
         setProperty("archivesBaseName", "WhatsApp_Status_Downloader_v$versionName$d")

diff --git a/app/src/main/java/a/gautham/statusdownloader/Fragments/ImageFragment.java b/app/src/main/java/a/gautham/statusdownloader/Fragments/ImageFragment.java
@@ -77,58 +77,67 @@ private void getStatus() {
 
         if (Common.STATUS_DIRECTORY.exists()) {
 
-            new Thread(() -> {
-                File[] statusFiles;
-                statusFiles = Common.STATUS_DIRECTORY.listFiles();
-                imagesList.clear();
+            execute(Common.STATUS_DIRECTORY);
 
-                if (statusFiles != null && statusFiles.length > 0) {
+        } else if (Common.STATUS_DIRECTORY_NEW.exists()) {
 
-                    Arrays.sort(statusFiles);
-                    for (File file : statusFiles) {
-                        Status status = new Status(file, file.getName(), file.getAbsolutePath());
+            execute(Common.STATUS_DIRECTORY_NEW);
 
-                        if (!status.isVideo() && status.getTitle().endsWith(".jpg")) {
-                            imagesList.add(status);
-                        }
+        } else {
+            messageTextView.setVisibility(View.VISIBLE);
+            messageTextView.setText(R.string.cant_find_whatsapp_dir);
+            Toast.makeText(getActivity(), getString(R.string.cant_find_whatsapp_dir), Toast.LENGTH_SHORT).show();
+            swipeRefreshLayout.setRefreshing(false);
+        }
 
-                    }
+    }
+
+    private void execute(File wAFolder) {
+        new Thread(() -> {
+            File[] statusFiles;
+            statusFiles = wAFolder.listFiles();
+            imagesList.clear();
 
-                    handler.post(() -> {
+            if (statusFiles != null && statusFiles.length > 0) {
 
-                        if (imagesList.size() <= 0) {
-                            messageTextView.setVisibility(View.VISIBLE);
-                            messageTextView.setText(R.string.no_files_found);
-                        } else {
-                            messageTextView.setVisibility(View.GONE);
-                            messageTextView.setText("");
-                        }
+                Arrays.sort(statusFiles);
+                for (File file : statusFiles) {
+                    Status status = new Status(file, file.getName(), file.getAbsolutePath());
 
-                        imageAdapter = new ImageAdapter(imagesList, container);
-                        recyclerView.setAdapter(imageAdapter);
-                        imageAdapter.notifyDataSetChanged();
-                        progressBar.setVisibility(View.GONE);
-                    });
+                    if (!status.isVideo() && status.getTitle().endsWith(".jpg")) {
+                        imagesList.add(status);
+                    }
+
+                }
 
-                } else {
+                handler.post(() -> {
 
-                    handler.post(() -> {
-                        progressBar.setVisibility(View.GONE);
+                    if (imagesList.size() <= 0) {
                         messageTextView.setVisibility(View.VISIBLE);
                         messageTextView.setText(R.string.no_files_found);
-                        Toast.makeText(getActivity(), getString(R.string.no_files_found), Toast.LENGTH_SHORT).show();
-                    });
+                    } else {
+                        messageTextView.setVisibility(View.GONE);
+                        messageTextView.setText("");
+                    }
 
-                }
-                swipeRefreshLayout.setRefreshing(false);
-            }).start();
+                    imageAdapter = new ImageAdapter(imagesList, container);
+                    recyclerView.setAdapter(imageAdapter);
+                    imageAdapter.notifyDataSetChanged();
+                    progressBar.setVisibility(View.GONE);
+                });
 
-        } else {
-            messageTextView.setVisibility(View.VISIBLE);
-            messageTextView.setText(R.string.cant_find_whatsapp_dir);
-            Toast.makeText(getActivity(), getString(R.string.cant_find_whatsapp_dir), Toast.LENGTH_SHORT).show();
-            swipeRefreshLayout.setRefreshing(false);
-        }
+            } else {
+
+                handler.post(() -> {
+                    progressBar.setVisibility(View.GONE);
+                    messageTextView.setVisibility(View.VISIBLE);
+                    messageTextView.setText(R.string.no_files_found);
+                    Toast.makeText(getActivity(), getString(R.string.no_files_found), Toast.LENGTH_SHORT).show();
+                });
 
+            }
+            swipeRefreshLayout.setRefreshing(false);
+        }).start();
     }
+
 }
diff --git a/app/src/main/java/a/gautham/statusdownloader/Fragments/VideoFragment.java b/app/src/main/java/a/gautham/statusdownloader/Fragments/VideoFragment.java
@@ -77,58 +77,66 @@ private void getStatus() {
 
         if (Common.STATUS_DIRECTORY.exists()) {
 
-            new Thread(() -> {
-                File[] statusFiles = Common.STATUS_DIRECTORY.listFiles();
-                videoList.clear();
+            execute(Common.STATUS_DIRECTORY);
 
-                if (statusFiles != null && statusFiles.length > 0) {
+        } else if (Common.STATUS_DIRECTORY_NEW.exists()) {
 
-                    Arrays.sort(statusFiles);
-                    for (File file : statusFiles) {
-                        Status status = new Status(file, file.getName(), file.getAbsolutePath());
+            execute(Common.STATUS_DIRECTORY_NEW);
 
-                        if (status.isVideo()) {
-                            videoList.add(status);
-                        }
+        } else {
+            messageTextView.setVisibility(View.VISIBLE);
+            messageTextView.setText(R.string.cant_find_whatsapp_dir);
+            Toast.makeText(getActivity(), getString(R.string.cant_find_whatsapp_dir), Toast.LENGTH_SHORT).show();
+            swipeRefreshLayout.setRefreshing(false);
+        }
 
-                    }
+    }
+
+    private void execute(File waFolder) {
+        new Thread(() -> {
+            File[] statusFiles = waFolder.listFiles();
+            videoList.clear();
 
-                    handler.post(() -> {
+            if (statusFiles != null && statusFiles.length > 0) {
 
-                        if (videoList.size() <= 0) {
-                            messageTextView.setVisibility(View.VISIBLE);
-                            messageTextView.setText(R.string.no_files_found);
-                        } else {
-                            messageTextView.setVisibility(View.GONE);
-                            messageTextView.setText("");
-                        }
+                Arrays.sort(statusFiles);
+                for (File file : statusFiles) {
+                    Status status = new Status(file, file.getName(), file.getAbsolutePath());
+
+                    if (status.isVideo()) {
+                        videoList.add(status);
+                    }
 
-                        videoAdapter = new VideoAdapter(videoList, container);
-                        recyclerView.setAdapter(videoAdapter);
-                        videoAdapter.notifyDataSetChanged();
-                        progressBar.setVisibility(View.GONE);
-                    });
+                }
 
-                } else {
+                handler.post(() -> {
 
-                    handler.post(() -> {
-                        progressBar.setVisibility(View.GONE);
+                    if (videoList.size() <= 0) {
                         messageTextView.setVisibility(View.VISIBLE);
                         messageTextView.setText(R.string.no_files_found);
-                        Toast.makeText(getActivity(), getString(R.string.no_files_found), Toast.LENGTH_SHORT).show();
-                    });
+                    } else {
+                        messageTextView.setVisibility(View.GONE);
+                        messageTextView.setText("");
+                    }
 
-                }
-                swipeRefreshLayout.setRefreshing(false);
-            }).start();
+                    videoAdapter = new VideoAdapter(videoList, container);
+                    recyclerView.setAdapter(videoAdapter);
+                    videoAdapter.notifyDataSetChanged();
+                    progressBar.setVisibility(View.GONE);
+                });
 
-        } else {
-            messageTextView.setVisibility(View.VISIBLE);
-            messageTextView.setText(R.string.cant_find_whatsapp_dir);
-            Toast.makeText(getActivity(), getString(R.string.cant_find_whatsapp_dir), Toast.LENGTH_SHORT).show();
-            swipeRefreshLayout.setRefreshing(false);
-        }
+            } else {
 
+                handler.post(() -> {
+                    progressBar.setVisibility(View.GONE);
+                    messageTextView.setVisibility(View.VISIBLE);
+                    messageTextView.setText(R.string.no_files_found);
+                    Toast.makeText(getActivity(), getString(R.string.no_files_found), Toast.LENGTH_SHORT).show();
+                });
+
+            }
+            swipeRefreshLayout.setRefreshing(false);
+        }).start();
     }
 
 }
diff --git a/app/src/main/java/a/gautham/statusdownloader/Utils/Common.java b/app/src/main/java/a/gautham/statusdownloader/Utils/Common.java
@@ -40,6 +40,9 @@ public class Common {
     public static final File STATUS_DIRECTORY = new File(Environment.getExternalStorageDirectory() +
             File.separator + "WhatsApp/Media/.Statuses");
 
+    public static final File STATUS_DIRECTORY_NEW = new File(Environment.getExternalStorageDirectory() +
+            File.separator + "Android/media/com.whatsapp/WhatsApp/Media/.Statuses");
+
     public static String APP_DIR;
 
     public static void copyFile(Status status, Context context, RelativeLayout container) {