remove camera

4 files changed, 6 insertions, 135 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
index 43e54399..4b411d1d 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
@@ -71,25 +71,15 @@ public class MainActivity extends Activity implements Application.OnCurrentAccou
     // ------------------------------ FIELDS ------------------------------
 
     public static final int REQUEST_GET_PICTURE_FROM_GALLERY = 11;
-    public static final int REQUEST_GET_PICTURE_FROM_CAMERA = 12;
     private static final int REQUEST_MANAGE_ACCOUNT = 13;
     private static final int REQUEST_WRITE_EXTERNAL_STORAGE_PERMISSION = 14;
     private ViewPager viewPager;
     private ImageView currentAccountIconImageView;
     private PageListAdapter pagerAdapter;
     private TwitterStream stream;
-    private Uri cameraTempFilePath;
     private UserStreamListener userStreamListener;
     private final UIObserverBundle currentUserBundle = new UIObserverBundle();
 
-    public Uri getCameraTempFilePath() {
-        return cameraTempFilePath;
-    }
-
-    public void setCameraTempFilePath(Uri cameraTempFilePath) {
-        this.cameraTempFilePath = cameraTempFilePath;
-    }
-
     public boolean isStreaming() {
         return userStreamListener != null && userStreamListener.isConnected();
     }
@@ -180,17 +170,14 @@ public class MainActivity extends Activity implements Application.OnCurrentAccou
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
-            case REQUEST_MANAGE_ACCOUNT: {
+            case REQUEST_MANAGE_ACCOUNT:
                 if (resultCode == RESULT_CANCELED && Application.getInstance().getCurrentAccount() == null) {
                     forceFinish();
                 }
                 break;
-            }
             case REQUEST_GET_PICTURE_FROM_GALLERY:
-            case REQUEST_GET_PICTURE_FROM_CAMERA: {
                 getImageUri(requestCode, resultCode, data);
                 break;
-            }
         }
     }
 
@@ -388,13 +375,7 @@ public class MainActivity extends Activity implements Application.OnCurrentAccou
             finish();
             return;
         }
-        Uri uri;
-        if (requestCode == REQUEST_GET_PICTURE_FROM_GALLERY) {
-            uri = data.getData();
-        } else {
-            uri = getCameraTempFilePath();
-        }
-        openPostPageWithImage(uri);
+        openPostPageWithImage(data.getData());
     }
 
     private void startStream() {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectImageDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectImageDialogFragment.java
deleted file mode 100644
index 891fadf3..00000000
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectImageDialogFragment.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2012-2014 lacolaco.net
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package net.lacolaco.smileessence.view.dialog;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.ContentValues;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.MediaStore;
-import net.lacolaco.smileessence.R;
-import net.lacolaco.smileessence.activity.MainActivity;
-import net.lacolaco.smileessence.command.Command;
-import net.lacolaco.smileessence.util.IntentUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SelectImageDialogFragment extends MenuDialogFragment {
-
-    // ------------------------ OVERRIDE METHODS ------------------------
-
-    @Override //TODO
-    protected List<Command> getMenuCommands() {
-        Activity activity = getActivity();
-        List<Command> commands = new ArrayList<>();
-        commands.add(new Command(activity) {
-            @Override
-            public boolean execute() {
-                startGallery();
-                return true;
-            }
-
-            @Override
-            public String getText() {
-                return activity.getString(R.string.command_select_image_from_gallery);
-            }
-        });
-        commands.add(new Command(activity) {
-            @Override
-            public boolean execute() {
-                startCamera();
-                return true;
-            }
-
-            @Override
-            public String getText() {
-                return activity.getString(R.string.command_select_image_from_camera);
-            }
-        });
-        return commands;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        Dialog dialog = super.onCreateDialog(savedInstanceState);
-        dialog.setTitle(R.string.dialog_title_select_image);
-        return dialog;
-    }
-
-    // -------------------------- OTHER METHODS --------------------------
-
-    private void startCamera() {
-        MainActivity activity = (MainActivity) getActivity();
-        ContentValues values = new ContentValues();
-        String filename = System.currentTimeMillis() + ".jpg";
-        values.put(MediaStore.MediaColumns.TITLE, filename);
-        values.put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg");
-
-        // Uriを取得して覚えておく、Intentにも保存先として渡す
-        Uri tempFilePath = activity.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
-        activity.setCameraTempFilePath(tempFilePath);
-        Intent intent = new Intent();
-        intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, tempFilePath);
-        IntentUtils.startActivityForResultIfFound(activity, intent, MainActivity.REQUEST_GET_PICTURE_FROM_CAMERA);
-    }
-
-    private void startGallery() {
-        Intent intent = new Intent(Intent.ACTION_PICK);
-        intent.setType("image/*");
-        IntentUtils.startActivityForResultIfFound(getActivity(), intent, MainActivity.REQUEST_GET_PICTURE_FROM_GALLERY);
-    }
-}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.java
index 109a69d7..9fe3cac1 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.java
@@ -49,8 +49,6 @@ import net.lacolaco.smileessence.util.BitmapThumbnailTask;
 import net.lacolaco.smileessence.util.IntentUtils;
 import net.lacolaco.smileessence.util.SystemServiceHelper;
 import net.lacolaco.smileessence.util.UIHandler;
-import net.lacolaco.smileessence.view.DialogHelper;
-import net.lacolaco.smileessence.view.dialog.SelectImageDialogFragment;
 import net.lacolaco.smileessence.viewmodel.StatusViewModel;
 
 import java.io.File;
@@ -307,8 +305,10 @@ public class PostFragment extends PageFragment implements TextWatcher, View.OnFo
     private void setImage() {
         setStateFromView();
         SystemServiceHelper.hideIM(getActivity(), editText);
-        SelectImageDialogFragment selectImageDialogFragment = new SelectImageDialogFragment();
-        DialogHelper.showDialog(getActivity(), selectImageDialogFragment);
+
+        Intent intent = new Intent(Intent.ACTION_PICK);
+        intent.setType("image/*");
+        IntentUtils.startActivityForResultIfFound(getActivity(), intent, MainActivity.REQUEST_GET_PICTURE_FROM_GALLERY);
     }
 
     private void setStateFromView() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b2a74e0f..d4300031 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,7 +102,6 @@
     <string name="dialog_title_add">Add</string>
     <string name="dialog_title_edit">Edit</string>
     <string name="dialog_confirm_finish_app">OK to close?</string>
-    <string name="dialog_title_select_image">Select image</string>
     <string name="dialog_title_select_search_query">Select search query</string>
     <string name="dialog_confirm_commands">Execute, OK?</string>
     <string name="dialog_confirm_clear_account">Are you sure you want to remove this account @%s?</string>
@@ -170,8 +169,6 @@
     <string name="command_status_open_in_browser">Open in browser</string>
     <string name="command_status_open_talk_view">Show this talk</string>
     <string name="command_status_add_to_reply">Add to reply</string>
-    <string name="command_select_image_from_gallery">From gallery</string>
-    <string name="command_select_image_from_camera">From camera</string>
     <string name="command_search_on_twitter">Search on Twitter</string>
     <string name="notice_error_get_user_timeline">Failed to get user timeline</string>
     <string name="notice_error_get_list">Failed to get list timeline</string>