From 9fb8dbc732f47a328931e4da075634549d2965b1 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Thu, 28 May 2020 04:53:56 +0300
Subject: [PATCH] app: all external references are now called Husky to not
 conflict with Tusky files

---
 app/src/main/java/com/keylesspalace/tusky/MainActivity.kt     | 2 +-
 .../main/java/com/keylesspalace/tusky/ViewMediaActivity.kt    | 2 +-
 .../keylesspalace/tusky/components/compose/MediaUploader.kt   | 2 +-
 app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.kt  | 2 +-
 .../java/com/keylesspalace/tusky/util/SaveTootHelper.java     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index 402ad6ca..33696148 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -208,7 +208,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                 }
 
         // Flush old media that was cached for sharing
-        deleteStaleCachedMedia(applicationContext.getExternalFilesDir("Tusky"))
+        deleteStaleCachedMedia(applicationContext.getExternalFilesDir("Husky"))
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.kt b/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.kt
index 447c0590..f7c226e9 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.kt
@@ -245,7 +245,7 @@ class ViewMediaActivity : BaseActivity(), ViewImageFragment.PhotoActionsListener
     }
 
     private fun shareMedia() {
-        val directory = applicationContext.getExternalFilesDir("Tusky")
+        val directory = applicationContext.getExternalFilesDir("Husky")
         if (directory == null || !(directory.exists())) {
             Log.e(TAG, "Error obtaining directory to save temporary media.")
             return
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
index 0d3b42f3..214dd02b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
@@ -47,7 +47,7 @@ sealed class UploadEvent {
 fun createNewImageFile(context: Context): File {
     // Create an image file name
     val randomId = randomAlphanumericString(12)
-    val imageFileName = "Tusky_${randomId}_"
+    val imageFileName = "Husky_${randomId}_"
     val storageDir = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
     return File.createTempFile(
             imageFileName, /* prefix */
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.kt b/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.kt
index 43f05e9c..a943f5f5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.kt
@@ -36,7 +36,7 @@ import java.util.Locale
  * Helper methods for obtaining and resizing media files
  */
 private const val TAG = "MediaUtils"
-private const val MEDIA_TEMP_PREFIX = "Tusky_Share_Media"
+private const val MEDIA_TEMP_PREFIX = "Husky_Share_Media"
 const val MEDIA_SIZE_UNKNOWN = -1L
 
 /**
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/SaveTootHelper.java b/app/src/main/java/com/keylesspalace/tusky/util/SaveTootHelper.java
index 96c53685..161364a5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/SaveTootHelper.java
+++ b/app/src/main/java/com/keylesspalace/tusky/util/SaveTootHelper.java
@@ -129,7 +129,7 @@ public final class SaveTootHelper {
     private List<String> saveMedia(@NonNull List<String> mediaUris,
                                    @Nullable List<String> existingUris) {
 
-        File directory = context.getExternalFilesDir("Tusky");
+        File directory = context.getExternalFilesDir("Husky");
 
         if (directory == null || !(directory.exists())) {
             Log.e(TAG, "Error obtaining directory to save media.");
@@ -158,7 +158,7 @@ public final class SaveTootHelper {
             String mimeType = contentResolver.getType(uri);
             MimeTypeMap map = MimeTypeMap.getSingleton();
             String fileExtension = map.getExtensionFromMimeType(mimeType);
-            String filename = String.format("Tusky_Draft_Media_%s.%s", timeStamp, fileExtension);
+            String filename = String.format("Husky_Draft_Media_%s.%s", timeStamp, fileExtension);
             File file = new File(directory, filename);
             filesSoFar.add(file);
             boolean copied = IOUtils.copyToFile(contentResolver, uri, file);