End of video 8

Author: benjakuben

.idea/workspace.xml

@@ -43,7 +43,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (resultCode == RESULT_OK) {
-            if (requestCode == REQUEST_TAKE_PHOTO) {
+            if (requestCode == REQUEST_TAKE_PHOTO || requestCode == REQUEST_PICK_PHOTO) {
+                if (data != null) {
+                    mMediaUri = data.getData();
+                }
+
                 Intent intent = new Intent(this, ViewImageActivity.class);
                 intent.setData(mMediaUri);
                 startActivity(intent);
@@ -92,7 +96,9 @@ void takeVideo() {
 
     @OnClick(R.id.pickPhoto)
     void pickPhoto() {
-
+        Intent pickPhotoIntent = new Intent(Intent.ACTION_GET_CONTENT);
+        pickPhotoIntent.setType("image/*");
+        startActivityForResult(pickPhotoIntent, REQUEST_PICK_PHOTO);
     }
 
     @OnClick(R.id.pickVideo)