Version 3.3.1

suragch · Sep 11, 2021 · e227efa · e227efa
1 parent 485a099
commit e227efa
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 32 deletions.
diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_4_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_4_aar.xml
diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_1_0_aar.xml
diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_2_0_4.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_2_0_4.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "net.studymongolian.chimee"
         minSdkVersion 14
         targetSdkVersion 30
-        versionCode 32
-        versionName "3.3.0"
+        versionCode 33
+        versionName "3.3.1"
     }
 
     buildTypes {
@@ -25,6 +25,6 @@ dependencies {
     testImplementation 'junit:junit:4.13.1'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     implementation 'net.studymongolian:mongol-library:2.1.0'
 }
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 32,
-      "versionName": "3.3.0",
+      "versionCode": 33,
+      "versionName": "3.3.1",
       "outputFile": "app-release.apk"
     }
   ]

diff --git a/app/src/main/java/net/studymongolian/chimee/FileUtils.java b/app/src/main/java/net/studymongolian/chimee/FileUtils.java
@@ -25,6 +25,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -344,8 +345,23 @@ private static boolean saveBitmapToCacheDir(Context context, Bitmap bitmap) {
             File cachePath = new File(context.getCacheDir(), TEMP_CACHE_SUBDIR);
             //noinspection ResultOfMethodCallIgnored
             cachePath.mkdirs();
-            FileOutputStream stream =
-                    new FileOutputStream(cachePath + File.separator + TEMP_CACHE_FILENAME);
+            String filename = cachePath + File.separator + TEMP_CACHE_FILENAME;
+
+            // Delete the old file.
+            // Some users complain of the previous message getting sent. At least in one case this
+            // apparently happened when the user's storage was full. Hopefully deleting the old
+            // message will at least prevent resending an old image.
+            File oldFile = new File(filename);
+            if (oldFile.exists()) {
+                boolean successfullyDeleted = oldFile.delete();
+                if (!successfullyDeleted) {
+                    Log.e("Chimee", "The old message image existed but couldn't be deleted.");
+                    return false;
+                }
+            }
+
+            // Save new file
+            FileOutputStream stream = new FileOutputStream(filename);
             bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
             stream.close();
         } catch (IOException e) {

diff --git a/app/src/main/java/net/studymongolian/chimee/MainActivity.java b/app/src/main/java/net/studymongolian/chimee/MainActivity.java
@@ -244,16 +244,13 @@ public boolean onMenuItemClick(MongolMenuItem item) {
             }
             return true;
         }
-
-
     };
 
     private void openColorChooserDialog() {
         int bgColor = getInputWindowBackgroundColor();
         int fgColor = getSelectedTextColor();
         DialogFragment dialog = ColorChooserDialogFragment.newInstance(bgColor, fgColor);
         dialog.show(getSupportFragmentManager(), "ColorChooserDialogFragment");
-
     }
 
     private int getInputWindowBackgroundColor() {