Add setting for resize image

6 files changed, 16 insertions, 4 deletions

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2578e219..3b5dbbbd 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -92,6 +92,8 @@
     <string name="setting_notify_on_unfavorited_title">あんふぁぼ通知</string>
     <string name="setting_notify_on_unfavorited_summary_on">有効</string>
     <string name="setting_notify_on_unfavorited_summary_off">無効</string>
+    <string name="setting_resize_post_image">画像のリサイズ</string>
+    <string name="setting_resize_post_image_summary">投稿する大きな画像を圧縮</string>
     <string name="setting_timelines_title">タイムライン取得件数</string>
     <string name="setting_timelines_summary_format">更新時に新しいツイートを%s件取得する</string>
     <string name="setting_timelines_dialog_title">取得件数の設定</string>
diff --git a/res/values/keys.xml b/res/values/keys.xml
index 2a0d0411..b3a3a3be 100644
--- a/res/values/keys.xml
+++ b/res/values/keys.xml
@@ -48,4 +48,5 @@
     <string name="key_page_list_visibility">pageListVisibility</string>
     <string name="key_page_list_position">pageListPosition</string>
     <string name="key_setting_extend_status_url">extendStatusURL</string>
+    <string name="key_setting_resize_post_image">resizePostImage</string>
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c0272dc5..587c63ab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -89,6 +89,8 @@
     <string name="setting_safe_mode_title">Safe mode</string>
     <string name="setting_safe_mode_summary_on">Show confirm dialog</string>
     <string name="setting_safe_mode_summary_off">No confirmation</string>
+    <string name="setting_resize_post_image">Resize image</string>
+    <string name="setting_resize_post_image_summary">Compress large image for tweet</string>
     <string name="setting_notify_on_unfavorited_title">On unfavorited</string>
     <string name="setting_notify_on_unfavorited_summary_on">Notify</string>
     <string name="setting_notify_on_unfavorited_summary_off">No Notice</string>
diff --git a/res/xml/setting.xml b/res/xml/setting.xml
index 74a5ea4b..30cd6d68 100644
--- a/res/xml/setting.xml
+++ b/res/xml/setting.xml
@@ -69,6 +69,11 @@
             android:key="@string/key_setting_show_confirm_dialog"
             android:defaultValue="true"/>
         <SwitchPreference
+            android:title="@string/setting_resize_post_image"
+            android:summary="@string/setting_resize_post_image_summary"
+            android:key="@string/key_setting_resize_post_image"
+            android:defaultValue="true"/>
+        <SwitchPreference
             android:title="@string/setting_notify_on_unfavorited_title"
             android:summaryOn="@string/setting_notify_on_unfavorited_summary_on"
             android:summaryOff="@string/setting_notify_on_unfavorited_summary_off"
diff --git a/src/net/lacolaco/smileessence/twitter/TwitterApi.java b/src/net/lacolaco/smileessence/twitter/TwitterApi.java
index 7bcdbf66..fb642801 100644
--- a/src/net/lacolaco/smileessence/twitter/TwitterApi.java
+++ b/src/net/lacolaco/smileessence/twitter/TwitterApi.java
@@ -36,6 +36,7 @@ public class TwitterApi
 
     // ------------------------------ FIELDS ------------------------------
 
+    public static final int MEDIA_SIZE_LIMIT = 2 * 1024 * 1024;
     private final String token;
     private final String tokenSecret;
 
diff --git a/src/net/lacolaco/smileessence/twitter/task/TweetTask.java b/src/net/lacolaco/smileessence/twitter/task/TweetTask.java
index b97ed738..9f769dc7 100644
--- a/src/net/lacolaco/smileessence/twitter/task/TweetTask.java
+++ b/src/net/lacolaco/smileessence/twitter/task/TweetTask.java
@@ -34,6 +34,8 @@ import net.lacolaco.smileessence.data.StatusCache;
 import net.lacolaco.smileessence.logging.Logger;
 import net.lacolaco.smileessence.notification.NotificationType;
 import net.lacolaco.smileessence.notification.Notificator;
+import net.lacolaco.smileessence.preference.UserPreferenceHelper;
+import net.lacolaco.smileessence.twitter.TwitterApi;
 import twitter4j.Status;
 import twitter4j.StatusUpdate;
 import twitter4j.Twitter;
@@ -48,8 +50,6 @@ public class TweetTask extends TwitterTask<Status>
 
     // ------------------------------ FIELDS ------------------------------
 
-    private static final int MEDIA_SIZE_LIMIT = 2 * 1024 * 1024;
-
     private final StatusUpdate update;
     private final String mediaPath;
     private final Activity activity;
@@ -75,7 +75,8 @@ public class TweetTask extends TwitterTask<Status>
     public File getMediaFile()
     {
         File file = new File(mediaPath);
-        if(file.length() >= MEDIA_SIZE_LIMIT)
+        boolean resizeFlag = new UserPreferenceHelper(activity).getValue(R.string.key_setting_resize_post_image, false);
+        if(file.length() >= TwitterApi.MEDIA_SIZE_LIMIT && resizeFlag)
         {
             BitmapFactory.Options opt = new BitmapFactory.Options();
             opt.inJustDecodeBounds = true; //decoder is not return bitmap but set option
@@ -86,7 +87,7 @@ public class TweetTask extends TwitterTask<Status>
             try
             {
                 fos = new FileOutputStream(compressedFile);
-                float ratio = (float) file.length() / (float) MEDIA_SIZE_LIMIT;
+                float ratio = (float) file.length() / (float) TwitterApi.MEDIA_SIZE_LIMIT;
                 BitmapFactory.Options resizeOpt = new BitmapFactory.Options();
                 resizeOpt.inPurgeable = true;
                 resizeOpt.inSampleSize = (int) Math.ceil(ratio);