From 1c113e54726ae0ffe2d4c4253ec59d9dfc6c49ed Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 20 Sep 2016 20:21:50 +0200
Subject: [PATCH] if force 16:9 ratio is not forced, try taking 4:3

---
 app/src/main/java/com/simplemobiletools/camera/Preview.java | 3 ++-
 app/src/main/res/values/strings.xml                         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/simplemobiletools/camera/Preview.java b/app/src/main/java/com/simplemobiletools/camera/Preview.java
index ffa9ff5d..ac060fd4 100644
--- a/app/src/main/java/com/simplemobiletools/camera/Preview.java
+++ b/app/src/main/java/com/simplemobiletools/camera/Preview.java
@@ -324,7 +324,7 @@ public class Preview extends ViewGroup
         Collections.sort(sizes, new SizesComparator());
         Camera.Size maxSize = sizes.get(0);
         for (Camera.Size size : sizes) {
-            final boolean isProperRatio = !mForceAspectRatio || isProperRatio(size);
+            final boolean isProperRatio = isProperRatio(size);
             final boolean isProperResolution = isProperResolution(size, maxResolution);
             if (isProperResolution && isProperRatio) {
                 maxSize = size;
@@ -369,6 +369,7 @@ public class Preview extends ViewGroup
         float wantedRatio = (float) 3 / 4;
         if (mForceAspectRatio || mIsVideoMode)
             wantedRatio = (float) 9 / 16;
+
         final float diff = Math.abs(currRatio - wantedRatio);
         return diff < RATIO_TOLERANCE;
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e4c0b6d..bc0114e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
     <string name="dark_theme">Dark theme</string>
     <string name="use_dcim_folder">Store media in the default DCIM folder</string>
     <string name="focus_before_capture">Refocus before capture</string>
-    <string name="force_ratio">Force 16:9 ratio</string>
+    <string name="force_ratio">Use 16:9 ratio</string>
     <string name="max_photo_size">Photo resolution limit</string>
     <string name="max_video_size">Video resolution limit</string>
     <string name="no_limit">none</string>