From 20306d096afcbd38719809c39e6c7d0e8e089cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=E1=BA=A7n=20Anh?= <trantuananh1996@gmail.com>
Date: Fri, 15 Jun 2018 12:28:56 +0700
Subject: [PATCH 01/16] Update README.md

---
 README.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 569468f..e6e5817 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,4 @@
-#Notice
--Picker.Builder(Context,Listener) has been replaced with (Context,Listener,themeResId) and it's highely recommended to use the new constructor
-
--``` onPickedSuccessfully(String[] paths)``` has been replaced with ``` onPickedSuccessfully(ArrayList<ImageEntry> images)```
-
--The sample in google play and screenshots are out-of-date , will update them on 1.2 or 1.3 version
-
+Base on yazeed44 lib with lots of change and fix
 MultiImagePicker
 ================
 

From 5b2300445c14d0ff4a032ce133f9a7dc6e169a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=E1=BA=A7n=20Anh?= <trantuananh1996@gmail.com>
Date: Tue, 1 Oct 2019 17:10:12 +0700
Subject: [PATCH 02/16] Update

---
 app/build.gradle                              |   27 +-
 app/src/main/AndroidManifest.xml              |    2 +-
 .../multiimagepicker/Application.java         |    6 +
 .../multiimagepicker/MainActivity.java        |   14 +-
 app/src/main/res/layout/activity_main.xml     |    4 +-
 build.gradle                                  |   35 +-
 gradle.properties                             |    2 +
 gradle/wrapper/gradle-wrapper.properties      |    2 +-
 imagepicker/build.gradle                      |   63 +-
 .../net/yazeed44/library/ApplicationTest.java |    1 -
 imagepicker/src/main/AndroidManifest.xml      |   39 +-
 .../src/main/java/com/android/mms/LogTag.java |  135 +
 .../mms/exif/ByteBufferInputStream.java       |   48 +
 .../mms/exif/CountedDataInputStream.java      |  136 +
 .../java/com/android/mms/exif/ExifData.java   |  350 +++
 .../com/android/mms/exif/ExifInterface.java   | 2416 +++++++++++++++++
 .../mms/exif/ExifInvalidFormatException.java  |   23 +
 .../com/android/mms/exif/ExifModifier.java    |  197 ++
 .../android/mms/exif/ExifOutputStream.java    |  520 ++++
 .../java/com/android/mms/exif/ExifParser.java |  918 +++++++
 .../java/com/android/mms/exif/ExifReader.java |   94 +
 .../java/com/android/mms/exif/ExifTag.java    | 1011 +++++++
 .../java/com/android/mms/exif/IfdData.java    |  152 ++
 .../main/java/com/android/mms/exif/IfdId.java |   31 +
 .../java/com/android/mms/exif/JpegHeader.java |   39 +
 .../mms/exif/OrderedDataOutputStream.java     |   56 +
 .../java/com/android/mms/exif/Rational.java   |   91 +
 .../cwac/cam2/AbstractCameraActivity.java     |  813 ++++++
 .../cwac/cam2/AbstractImageProcessor.java     |   40 +
 .../commonsware/cwac/cam2/CameraActivity.java |  341 +++
 .../cwac/cam2/CameraConfigurator.java         |   22 +
 .../cwac/cam2/CameraConstraints.java          |  511 ++++
 .../cwac/cam2/CameraController.java           |  510 ++++
 .../cwac/cam2/CameraDescriptor.java           |   49 +
 .../commonsware/cwac/cam2/CameraEngine.java   |  439 +++
 .../commonsware/cwac/cam2/CameraFragment.java |  723 +++++
 .../commonsware/cwac/cam2/CameraPlugin.java   |   55 +
 .../cwac/cam2/CameraSelectionCriteria.java    |  109 +
 .../commonsware/cwac/cam2/CameraSession.java  |  128 +
 .../cwac/cam2/CameraTwoConfigurator.java      |   57 +
 .../cwac/cam2/CameraTwoEngine.java            |  924 +++++++
 .../com/commonsware/cwac/cam2/CameraView.java |  231 ++
 .../com/commonsware/cwac/cam2/ChronoType.java |   27 +
 .../cwac/cam2/ClassicCameraConfigurator.java  |   46 +
 .../cwac/cam2/ClassicCameraEngine.java        |  643 +++++
 .../cwac/cam2/ConfirmationFragment.java       |  152 ++
 .../commonsware/cwac/cam2/ErrorConstants.java |   85 +
 .../com/commonsware/cwac/cam2/Facing.java     |   26 +
 .../com/commonsware/cwac/cam2/FlashMode.java  |   85 +
 .../com/commonsware/cwac/cam2/FocusMode.java  |   19 +
 .../commonsware/cwac/cam2/ImageContext.java   |  270 ++
 .../commonsware/cwac/cam2/ImageProcessor.java |   39 +
 .../com/commonsware/cwac/cam2/JPEGWriter.java |  115 +
 .../cwac/cam2/OrientationLockMode.java        |   40 +
 .../cwac/cam2/PictureTransaction.java         |  127 +
 .../cwac/cam2/ReverseChronometer.java         |   75 +
 .../cwac/cam2/RuleOfThirdsOverlay.java        |   59 +
 .../cam2/SimpleCameraTwoConfigurator.java     |   33 +
 .../cam2/SimpleClassicCameraConfigurator.java |   27 +
 .../cwac/cam2/VideoRecorderActivity.java      |  182 ++
 .../cwac/cam2/VideoTransaction.java           |   76 +
 .../com/commonsware/cwac/cam2/ZoomStyle.java  |   21 +
 .../cwac/cam2/plugin/FlashModePlugin.java     |  119 +
 .../cwac/cam2/plugin/FocusModePlugin.java     |  215 ++
 .../cwac/cam2/plugin/OrientationPlugin.java   |  273 ++
 .../cwac/cam2/plugin/SizeAndFormatPlugin.java |  164 ++
 .../com/commonsware/cwac/cam2/util/Size.java  |  152 ++
 .../com/commonsware/cwac/cam2/util/Utils.java |  195 ++
 .../imagepicker/{util => data}/Events.java    |   28 +-
 .../{ => data}/model/AlbumEntry.java          |   13 +-
 .../imagepicker/data/model/ImageEntry.java    |  596 ++++
 .../imagepicker/model/ImageEntry.java         |   99 -
 .../imagepicker/ui/PickerActivity.java        |  474 ++--
 .../imagepicker/ui/SpacesItemDecoration.java  |    8 +-
 .../imagepicker/ui/SquareFrameLayout.java     |    3 +-
 .../ui/{ => album}/AlbumsAdapter.java         |   61 +-
 .../ui/{ => album}/AlbumsFragment.java        |   68 +-
 .../ui/imagePreview/ImagePreviewActivity.java |  117 +
 .../ui/imagePreview/ImagePreviewAdapter.java  |  171 ++
 .../{ => photo}/ImagesThumbnailAdapter.java   |   53 +-
 .../{ => photo}/ImagesThumbnailFragment.java  |   46 +-
 .../{ => photoPager}/ImagePagerAdapter.java   |   35 +-
 .../{ => photoPager}/ImagesPagerFragment.java |   55 +-
 .../imagepicker/util/CameraSupport.java       |    6 +-
 .../imagepicker/util/CommonUtils.java         |  203 ++
 .../util/LoadingAlbumsRequest.java            |   12 +-
 .../util/LocaleContextWrapper.java            |   43 +
 .../imagepicker/util/LocaleHelper.java        |  124 +
 .../imagepicker/util/OfflineSpiceService.java |    6 +-
 .../net/yazeed44/imagepicker/util/Picker.java |   96 +-
 .../net/yazeed44/imagepicker/util/UIUtil.java |  289 ++
 .../net/yazeed44/imagepicker/util/Util.java   |   66 +-
 .../src/main/res/anim/cwac_cam2_fade_in.xml   |   11 +
 .../src/main/res/anim/cwac_cam2_fade_out.xml  |   11 +
 imagepicker/src/main/res/anim/down_out.xml    |    8 +
 imagepicker/src/main/res/anim/fade_in.xml     |    7 +
 imagepicker/src/main/res/anim/fade_out.xml    |    7 +
 .../src/main/res/anim/slide_down_enter.xml    |   14 +
 .../src/main/res/anim/slide_left_exit.xml     |   14 +
 .../src/main/res/anim/slide_right_exit.xml    |   15 +
 .../src/main/res/anim/slide_up_enter.xml      |   14 +
 imagepicker/src/main/res/anim/up_in.xml       |    8 +
 .../main/res/color/white_text_selector.xml    |    5 +
 .../cwac_cam2_ic_action_facing.png            |  Bin 0 -> 870 bytes
 .../cwac_cam2_ic_action_settings.png          |  Bin 0 -> 453 bytes
 .../cwac_cam2_ic_check_white.png              |  Bin 0 -> 181 bytes
 .../res/drawable-hdpi/cwac_cam2_ic_close.png  |  Bin 0 -> 207 bytes
 .../cwac_cam2_ic_close_white.png              |  Bin 0 -> 221 bytes
 .../drawable-hdpi/cwac_cam2_ic_flash_auto.png |  Bin 0 -> 370 bytes
 .../drawable-hdpi/cwac_cam2_ic_flash_off.png  |  Bin 0 -> 285 bytes
 .../drawable-hdpi/cwac_cam2_ic_flash_on.png   |  Bin 0 -> 199 bytes
 .../cwac_cam2_ic_refresh_white.png            |  Bin 0 -> 387 bytes
 .../cwac_cam2_ic_remove_red_eye.png           |  Bin 0 -> 470 bytes
 .../res/drawable-hdpi/cwac_cam2_ic_stop.png   |  Bin 0 -> 91 bytes
 .../cwac_cam2_ic_switch_camera.png            |  Bin 0 -> 219 bytes
 .../drawable-hdpi/cwac_cam2_ic_videocam.png   |  Bin 0 -> 169 bytes
 .../drawable-hdpi/ic_action_camera_white.png  |  Bin 647 -> 0 bytes
 .../src/main/res/drawable-hdpi/ic_video.png   |  Bin 0 -> 368 bytes
 .../cwac_cam2_ic_action_facing.png            |  Bin 0 -> 596 bytes
 .../cwac_cam2_ic_action_settings.png          |  Bin 0 -> 322 bytes
 .../cwac_cam2_ic_check_white.png              |  Bin 0 -> 137 bytes
 .../res/drawable-mdpi/cwac_cam2_ic_close.png  |  Bin 0 -> 164 bytes
 .../cwac_cam2_ic_close_white.png              |  Bin 0 -> 175 bytes
 .../drawable-mdpi/cwac_cam2_ic_flash_auto.png |  Bin 0 -> 256 bytes
 .../drawable-mdpi/cwac_cam2_ic_flash_off.png  |  Bin 0 -> 208 bytes
 .../drawable-mdpi/cwac_cam2_ic_flash_on.png   |  Bin 0 -> 155 bytes
 .../cwac_cam2_ic_refresh_white.png            |  Bin 0 -> 254 bytes
 .../cwac_cam2_ic_remove_red_eye.png           |  Bin 0 -> 309 bytes
 .../res/drawable-mdpi/cwac_cam2_ic_stop.png   |  Bin 0 -> 82 bytes
 .../cwac_cam2_ic_switch_camera.png            |  Bin 0 -> 164 bytes
 .../drawable-mdpi/cwac_cam2_ic_videocam.png   |  Bin 0 -> 127 bytes
 .../drawable-mdpi/ic_action_camera_white.png  |  Bin 428 -> 0 bytes
 .../src/main/res/drawable-mdpi/ic_video.png   |  Bin 0 -> 270 bytes
 .../cwac_cam2_ic_action_facing.png            |  Bin 0 -> 1120 bytes
 .../cwac_cam2_ic_action_settings.png          |  Bin 0 -> 557 bytes
 .../cwac_cam2_ic_check_white.png              |  Bin 0 -> 199 bytes
 .../res/drawable-xhdpi/cwac_cam2_ic_close.png |  Bin 0 -> 235 bytes
 .../cwac_cam2_ic_close_white.png              |  Bin 0 -> 257 bytes
 .../cwac_cam2_ic_flash_auto.png               |  Bin 0 -> 450 bytes
 .../drawable-xhdpi/cwac_cam2_ic_flash_off.png |  Bin 0 -> 311 bytes
 .../drawable-xhdpi/cwac_cam2_ic_flash_on.png  |  Bin 0 -> 224 bytes
 .../cwac_cam2_ic_refresh_white.png            |  Bin 0 -> 509 bytes
 .../cwac_cam2_ic_remove_red_eye.png           |  Bin 0 -> 593 bytes
 .../res/drawable-xhdpi/cwac_cam2_ic_stop.png  |  Bin 0 -> 99 bytes
 .../cwac_cam2_ic_switch_camera.png            |  Bin 0 -> 228 bytes
 .../drawable-xhdpi/cwac_cam2_ic_videocam.png  |  Bin 0 -> 171 bytes
 .../drawable-xhdpi/ic_action_camera_white.png |  Bin 851 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_video.png  |  Bin 0 -> 457 bytes
 .../cwac_cam2_ic_action_facing.png            |  Bin 0 -> 1717 bytes
 .../cwac_cam2_ic_action_settings.png          |  Bin 0 -> 827 bytes
 .../cwac_cam2_ic_check_white.png              |  Bin 0 -> 276 bytes
 .../drawable-xxhdpi/cwac_cam2_ic_close.png    |  Bin 0 -> 309 bytes
 .../cwac_cam2_ic_close_white.png              |  Bin 0 -> 347 bytes
 .../cwac_cam2_ic_flash_auto.png               |  Bin 0 -> 638 bytes
 .../cwac_cam2_ic_flash_off.png                |  Bin 0 -> 435 bytes
 .../drawable-xxhdpi/cwac_cam2_ic_flash_on.png |  Bin 0 -> 294 bytes
 .../cwac_cam2_ic_refresh_white.png            |  Bin 0 -> 734 bytes
 .../cwac_cam2_ic_remove_red_eye.png           |  Bin 0 -> 868 bytes
 .../res/drawable-xxhdpi/cwac_cam2_ic_stop.png |  Bin 0 -> 111 bytes
 .../cwac_cam2_ic_switch_camera.png            |  Bin 0 -> 314 bytes
 .../drawable-xxhdpi/cwac_cam2_ic_videocam.png |  Bin 0 -> 224 bytes
 .../ic_action_camera_white.png                |  Bin 1202 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_video.png |  Bin 0 -> 708 bytes
 .../ic_action_camera_white.png                |  Bin 1675 -> 0 bytes
 .../res/drawable/btn_round_green_disable.xml  |    6 +
 .../res/drawable/btn_round_green_enable.xml   |    6 +
 .../res/drawable/btn_round_green_selector.xml |    5 +
 .../src/main/res/drawable/check_green.xml     |    5 +
 .../main/res/drawable/checkbox_checktor.xml   |    5 +
 .../main/res/drawable/checkbox_selector.xml   |    5 +
 ...> cwac_cam2_action_bar_bg_translucent.xml} |    6 +-
 .../cwac_cam2_action_bar_bg_transparent.xml   |    7 +
 .../drawable/cwac_cam2_ic_action_camera.xml   |   12 +
 .../res/drawable/ic_action_camera_white.xml   |   12 +
 .../drawable/ic_rotate_left_white_24dp.xml    |    3 +
 .../drawable/ic_rotate_right_white_24dp.xml   |    4 +
 .../main/res/drawable/image_placeholder.xml   |   12 +
 .../src/main/res/drawable/item_divider.xml    |    5 +
 .../src/main/res/drawable/radio_button.xml    |    5 +
 .../main/res/layout/activity_album_pick.xml   |   43 +
 .../main/res/layout/activity_photo_pick.xml   |   45 +
 .../src/main/res/layout/activity_pick.xml     |   46 +-
 .../src/main/res/layout/activity_preview.xml  |   40 +
 .../main/res/layout/cwac_cam2_fragment.xml    |  103 +
 .../src/main/res/layout/element_album.xml     |    6 +-
 .../src/main/res/layout/element_image.xml     |    5 +-
 .../main/res/layout/element_image_preview.xml |   46 +
 .../main/res/layout/fragment_album_browse.xml |    4 +-
 .../main/res/layout/fragment_image_browse.xml |    6 +-
 .../main/res/layout/fragment_image_pager.xml  |    5 +-
 .../src/main/res/layout/layout_loading.xml    |   30 +
 .../src/main/res/menu/cwac_cam2_confirm.xml   |   11 +
 .../src/main/res/mipmap-xhdpi/ic_back.png     |  Bin 0 -> 344 bytes
 .../src/main/res/mipmap-xhdpi/ic_camera.png   |  Bin 0 -> 799 bytes
 .../src/main/res/mipmap-xxhdpi/ic_arrow.png   |  Bin 0 -> 191 bytes
 .../src/main/res/mipmap-xxhdpi/ic_check.png   |  Bin 0 -> 171 bytes
 .../src/main/res/mipmap-xxhdpi/ic_checked.png |  Bin 0 -> 366 bytes
 .../main/res/mipmap-xxhdpi/ic_placeholder.png |  Bin 0 -> 1041 bytes
 .../res/mipmap-xxhdpi/ic_radio_button.png     |  Bin 0 -> 1102 bytes
 .../src/main/res/values-ar/strings.xml        |    1 -
 .../src/main/res/values-en/strings.xml        |   41 +
 .../src/main/res/values-ko/strings.xml        |    1 -
 .../src/main/res/values-land/dimens.xml       |    4 -
 .../src/main/res/values-pt/strings.xml        |    1 -
 .../src/main/res/values-vi/strings.xml        |   52 +
 .../src/main/res/values-w820dp/dimens.xml     |    1 -
 imagepicker/src/main/res/values/colors.xml    |   32 +-
 imagepicker/src/main/res/values/dimens.xml    |   26 +-
 imagepicker/src/main/res/values/strings.xml   |   46 +-
 imagepicker/src/main/res/values/styles.xml    |   29 +-
 210 files changed, 17470 insertions(+), 667 deletions(-)
 create mode 100644 app/src/main/java/net/yazeed44/multiimagepicker/Application.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/LogTag.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/ByteBufferInputStream.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifData.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifInvalidFormatException.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifParser.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifReader.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifTag.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/IfdData.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/IfdId.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/JpegHeader.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/OrderedDataOutputStream.java
 create mode 100644 imagepicker/src/main/java/com/android/mms/exif/Rational.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractImageProcessor.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraActivity.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConfigurator.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConstraints.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraController.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraDescriptor.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraPlugin.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSelectionCriteria.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoConfigurator.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraView.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ChronoType.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraConfigurator.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ConfirmationFragment.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ErrorConstants.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/Facing.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/FlashMode.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/FocusMode.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageProcessor.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/JPEGWriter.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/OrientationLockMode.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/RuleOfThirdsOverlay.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleCameraTwoConfigurator.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleClassicCameraConfigurator.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoRecorderActivity.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoTransaction.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ZoomStyle.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FlashModePlugin.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FocusModePlugin.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/OrientationPlugin.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/SizeAndFormatPlugin.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Size.java
 create mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Utils.java
 rename imagepicker/src/main/java/net/yazeed44/imagepicker/{util => data}/Events.java (71%)
 rename imagepicker/src/main/java/net/yazeed44/imagepicker/{ => data}/model/AlbumEntry.java (63%)
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
 delete mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/model/ImageEntry.java
 rename imagepicker/src/main/java/net/yazeed44/imagepicker/ui/{ => album}/AlbumsAdapter.java (61%)
 rename imagepicker/src/main/java/net/yazeed44/imagepicker/ui/{ => album}/AlbumsFragment.java (73%)
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
 rename imagepicker/src/main/java/net/yazeed44/imagepicker/ui/{ => photo}/ImagesThumbnailAdapter.java (77%)
 rename imagepicker/src/main/java/net/yazeed44/imagepicker/ui/{ => photo}/ImagesThumbnailFragment.java (54%)
 rename imagepicker/src/main/java/net/yazeed44/imagepicker/ui/{ => photoPager}/ImagePagerAdapter.java (55%)
 rename imagepicker/src/main/java/net/yazeed44/imagepicker/ui/{ => photoPager}/ImagesPagerFragment.java (71%)
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/util/CommonUtils.java
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/util/LocaleContextWrapper.java
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/util/LocaleHelper.java
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/util/UIUtil.java
 create mode 100644 imagepicker/src/main/res/anim/cwac_cam2_fade_in.xml
 create mode 100644 imagepicker/src/main/res/anim/cwac_cam2_fade_out.xml
 create mode 100644 imagepicker/src/main/res/anim/down_out.xml
 create mode 100644 imagepicker/src/main/res/anim/fade_in.xml
 create mode 100644 imagepicker/src/main/res/anim/fade_out.xml
 create mode 100644 imagepicker/src/main/res/anim/slide_down_enter.xml
 create mode 100644 imagepicker/src/main/res/anim/slide_left_exit.xml
 create mode 100644 imagepicker/src/main/res/anim/slide_right_exit.xml
 create mode 100644 imagepicker/src/main/res/anim/slide_up_enter.xml
 create mode 100644 imagepicker/src/main/res/anim/up_in.xml
 create mode 100644 imagepicker/src/main/res/color/white_text_selector.xml
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_action_facing.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_action_settings.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_check_white.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_close.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_close_white.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_flash_auto.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_flash_off.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_flash_on.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_refresh_white.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_remove_red_eye.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_stop.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_switch_camera.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_videocam.png
 delete mode 100644 imagepicker/src/main/res/drawable-hdpi/ic_action_camera_white.png
 create mode 100644 imagepicker/src/main/res/drawable-hdpi/ic_video.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_action_facing.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_action_settings.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_check_white.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_close.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_close_white.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_flash_auto.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_flash_off.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_flash_on.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_refresh_white.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_remove_red_eye.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_stop.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_switch_camera.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_videocam.png
 delete mode 100644 imagepicker/src/main/res/drawable-mdpi/ic_action_camera_white.png
 create mode 100644 imagepicker/src/main/res/drawable-mdpi/ic_video.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_action_facing.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_action_settings.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_check_white.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_close.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_close_white.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_flash_auto.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_flash_off.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_flash_on.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_refresh_white.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_remove_red_eye.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_stop.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_switch_camera.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_videocam.png
 delete mode 100644 imagepicker/src/main/res/drawable-xhdpi/ic_action_camera_white.png
 create mode 100644 imagepicker/src/main/res/drawable-xhdpi/ic_video.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_action_facing.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_action_settings.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_check_white.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_close.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_close_white.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_flash_auto.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_flash_off.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_flash_on.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_refresh_white.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_remove_red_eye.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_stop.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_switch_camera.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_videocam.png
 delete mode 100644 imagepicker/src/main/res/drawable-xxhdpi/ic_action_camera_white.png
 create mode 100644 imagepicker/src/main/res/drawable-xxhdpi/ic_video.png
 delete mode 100644 imagepicker/src/main/res/drawable-xxxhdpi/ic_action_camera_white.png
 create mode 100644 imagepicker/src/main/res/drawable/btn_round_green_disable.xml
 create mode 100644 imagepicker/src/main/res/drawable/btn_round_green_enable.xml
 create mode 100644 imagepicker/src/main/res/drawable/btn_round_green_selector.xml
 create mode 100644 imagepicker/src/main/res/drawable/check_green.xml
 create mode 100644 imagepicker/src/main/res/drawable/checkbox_checktor.xml
 create mode 100644 imagepicker/src/main/res/drawable/checkbox_selector.xml
 rename imagepicker/src/main/res/drawable/{image_border.xml => cwac_cam2_action_bar_bg_translucent.xml} (63%)
 create mode 100644 imagepicker/src/main/res/drawable/cwac_cam2_action_bar_bg_transparent.xml
 create mode 100644 imagepicker/src/main/res/drawable/cwac_cam2_ic_action_camera.xml
 create mode 100644 imagepicker/src/main/res/drawable/ic_action_camera_white.xml
 create mode 100644 imagepicker/src/main/res/drawable/ic_rotate_left_white_24dp.xml
 create mode 100644 imagepicker/src/main/res/drawable/ic_rotate_right_white_24dp.xml
 create mode 100644 imagepicker/src/main/res/drawable/image_placeholder.xml
 create mode 100644 imagepicker/src/main/res/drawable/item_divider.xml
 create mode 100644 imagepicker/src/main/res/drawable/radio_button.xml
 create mode 100644 imagepicker/src/main/res/layout/activity_album_pick.xml
 create mode 100644 imagepicker/src/main/res/layout/activity_photo_pick.xml
 create mode 100644 imagepicker/src/main/res/layout/activity_preview.xml
 create mode 100644 imagepicker/src/main/res/layout/cwac_cam2_fragment.xml
 create mode 100644 imagepicker/src/main/res/layout/element_image_preview.xml
 create mode 100644 imagepicker/src/main/res/layout/layout_loading.xml
 create mode 100644 imagepicker/src/main/res/menu/cwac_cam2_confirm.xml
 create mode 100644 imagepicker/src/main/res/mipmap-xhdpi/ic_back.png
 create mode 100644 imagepicker/src/main/res/mipmap-xhdpi/ic_camera.png
 create mode 100644 imagepicker/src/main/res/mipmap-xxhdpi/ic_arrow.png
 create mode 100644 imagepicker/src/main/res/mipmap-xxhdpi/ic_check.png
 create mode 100644 imagepicker/src/main/res/mipmap-xxhdpi/ic_checked.png
 create mode 100644 imagepicker/src/main/res/mipmap-xxhdpi/ic_placeholder.png
 create mode 100644 imagepicker/src/main/res/mipmap-xxhdpi/ic_radio_button.png
 create mode 100644 imagepicker/src/main/res/values-en/strings.xml
 create mode 100644 imagepicker/src/main/res/values-vi/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 78bb09b..1faf0a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.2'
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "net.yazeed44.imagepicker.sample"
-        minSdkVersion 15
-        targetSdkVersion 23
+        minSdkVersion 17
+        targetSdkVersion 28
         versionCode 3
         versionName "1.3.1"
+        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -22,7 +22,10 @@ android {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
     }
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
 }
 
@@ -33,11 +36,19 @@ repositories {
 
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':imagepicker')
-    compile('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':imagepicker')
+    implementation('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') {
         transitive = true
     }
+    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    //Glide
+    implementation 'com.github.bumptech.glide:glide:4.10.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:4.10.0'
+    //Multidex
+    implementation 'androidx.multidex:multidex:2.0.1'
 }
 
 // Remove comment to exclude cwac-cam2 dependency to make the capture feature unavailable
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8ce090f..8a415cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
 
     <application
-
+        android:name="net.yazeed44.multiimagepicker.Application"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/net/yazeed44/multiimagepicker/Application.java b/app/src/main/java/net/yazeed44/multiimagepicker/Application.java
new file mode 100644
index 0000000..aa0a796
--- /dev/null
+++ b/app/src/main/java/net/yazeed44/multiimagepicker/Application.java
@@ -0,0 +1,6 @@
+package net.yazeed44.multiimagepicker;
+
+import androidx.multidex.MultiDexApplication;
+
+public class Application extends MultiDexApplication {
+}
diff --git a/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java b/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java
index 956cd7f..2fb23b7 100644
--- a/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java
+++ b/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java
@@ -2,10 +2,11 @@
 
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.Html;
 import android.text.Spanned;
 import android.util.Log;
@@ -20,7 +21,7 @@
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.bumptech.glide.Glide;
 
-import net.yazeed44.imagepicker.model.ImageEntry;
+import net.yazeed44.imagepicker.data.model.ImageEntry;
 import net.yazeed44.imagepicker.sample.R;
 import net.yazeed44.imagepicker.util.Picker;
 
@@ -130,7 +131,6 @@ private void showAbout() {
 
 
 
-
     @Override
     public void onPickedSuccessfully(ArrayList<ImageEntry> images) {
         mSelectedImages = images;
@@ -176,8 +176,8 @@ private void loadImage(final String path, final ImageView imageView) {
             imageView.setLayoutParams(new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 440));
 
             Glide.with(MainActivity.this)
-                    .load(path)
                     .asBitmap()
+                    .load(path)
                     .into(imageView);
 
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4eb428a..46e5241 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity">
+    tools:context="net.yazeed44.multiimagepicker.MainActivity">
 
     <Button
         android:layout_width="match_parent"
@@ -30,7 +30,7 @@
         android:onClick="onClickPickImageWithVideos"
         android:text="@string/btn_pick_with_videos" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/images_sample"
 
         android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index ac702f5..c7d34ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,33 +1,46 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
 
 
     repositories {
         jcenter()
-
+        mavenCentral()
+        maven { url "https://clojars.org/repo/" }
+        maven { url "https://jitpack.io" }
+        google()
+        maven {
+            url 'https://maven.fabric.io/public'
+        }
+        maven {
+            name 'Sonatype SNAPSHOTs';
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        }
     }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.google.gms:google-services:4.3.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
 
 
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
-
-
-
 allprojects {
     repositories {
         jcenter()
-
+        mavenCentral()
         maven {
-            url "https://repo.commonsware.com.s3.amazonaws.com"
+            url "https://maven.google.com" // Google's Maven repository
         }
+        maven { url "https://jitpack.io" }
+        google()
     }
+}
 
-
+task clean(type: Delete) {
+    delete rootProject.buildDir
 }
diff --git a/gradle.properties b/gradle.properties
index f814266..390785b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,6 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.daemon=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac5e5e3..c8f3990 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index fecb1a3..349d000 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
 
+
 ext {
     bintrayRepo = 'maven'
     bintrayName = 'multi-image-picker'
@@ -7,7 +8,7 @@ ext {
     libraryName = 'MultiImage Picker'
     artifact = 'imagepicker'
 
-    libraryDescription = 'This library is built-in gallery to pick multiple images or capture new photos , and retrieve the path in the code'
+    libraryDescription = 'This library is built-in gallery to pick multiple images or capture new photos, and retrieve the path in the code'
 
     siteUrl = 'https://github.com/yazeed44/MultiImagePicker'
     gitUrl = 'https://github.com/yazeed44/MultiImagePicker.git'
@@ -26,13 +27,12 @@ ext {
 
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.2'
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 23
-
+        minSdkVersion 17
+        targetSdkVersion 28
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
@@ -40,33 +40,48 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
 }
 
 repositories {
     mavenCentral()
+    maven {
+        url "https://s3.amazonaws.com/repo.commonsware.com"
+    }
 }
 
-
-
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:support-annotations:23.1.1'
-    compile 'com.android.support:recyclerview-v7:23.1.1'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:design:23.1.1'
-    compile 'com.github.bumptech.glide:glide:3.6.1'
-    compile 'com.octo.android.robospice:robospice:1.4.14'
-    compile 'com.melnykov:floatingactionbutton:1.3.0'
-    compile 'de.greenrobot:eventbus:2.4.0'
-    compile 'com.github.chrisbanes.photoview:library:1.2.3'
-    compile 'com.commonsware.cwac:cam2:0.2.3'
-}
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
+    implementation 'com.github.bumptech.glide:glide:4.10.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
+    implementation('com.octo.android.robospice:robospice:1.4.14') {
+        exclude group: 'org.apache.commons', module: 'commons-io'
+    }
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'
 
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
+    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
+    implementation 'com.github.clans:fab:1.6.4'
 
+    implementation 'com.github.yalantis:ucrop:2.2.3'
 
+    //Rx Java
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.12'
+    implementation 'com.squareup.retrofit2:adapter-rxjava:2.6.2'
+    implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
+    //Dagger
+    implementation 'com.google.dagger:dagger:2.24'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
+    implementation 'net.sourceforge.streamsupport:streamsupport:1.7.1'
+    implementation 'com.jaeger.statusbarutil:library:1.5.1'
 
+}
 
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
\ No newline at end of file
diff --git a/imagepicker/src/androidTest/java/net/yazeed44/library/ApplicationTest.java b/imagepicker/src/androidTest/java/net/yazeed44/library/ApplicationTest.java
index 19c26f3..bba5511 100644
--- a/imagepicker/src/androidTest/java/net/yazeed44/library/ApplicationTest.java
+++ b/imagepicker/src/androidTest/java/net/yazeed44/library/ApplicationTest.java
@@ -1,7 +1,6 @@
 package net.yazeed44.library;
 
 import android.app.Application;
-import android.test.ApplicationTestCase;
 
 /**
  * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
diff --git a/imagepicker/src/main/AndroidManifest.xml b/imagepicker/src/main/AndroidManifest.xml
index e59c849..d16afe9 100644
--- a/imagepicker/src/main/AndroidManifest.xml
+++ b/imagepicker/src/main/AndroidManifest.xml
@@ -1,19 +1,44 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.yazeed44.imagepicker.library">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
-    <application
-        android:allowBackup="true"
-        android:label="@string/app_name">
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.front"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.microphone"
+        android:required="false" />
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <application android:allowBackup="true">
+        <uses-library
+            android:name="org.apache.http.legacy"
+            android:required="false" />
 
-        <activity android:name="net.yazeed44.imagepicker.ui.PickerActivity" />
+        <activity
+            android:name="net.yazeed44.imagepicker.ui.PickerActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.NoActionBar" />
+        <activity android:name="com.commonsware.cwac.cam2.CameraActivity" />
+        <activity android:name="com.commonsware.cwac.cam2.VideoRecorderActivity" />
+        <activity
+            android:name="com.yalantis.ucrop.UCropActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity android:name="net.yazeed44.imagepicker.ui.imagePreview.ImagePreviewActivity" />
 
         <service
             android:name="net.yazeed44.imagepicker.util.OfflineSpiceService"
             android:exported="false" />
     </application>
-
 </manifest>
diff --git a/imagepicker/src/main/java/com/android/mms/LogTag.java b/imagepicker/src/main/java/com/android/mms/LogTag.java
new file mode 100644
index 0000000..4461362
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/LogTag.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.util.Log;
+
+/*
+import com.android.mms.data.Contact;
+import com.android.mms.data.Conversation;
+import com.android.mms.data.RecipientIdCache;
+*/
+
+public class LogTag {
+    public static final String TAG = "Mms";
+
+    public static final String TRANSACTION = TAG;
+    public static final String APP = TAG;
+    public static final String THREAD_CACHE = TAG;
+    public static final String THUMBNAIL_CACHE = TAG;
+    public static final String PDU_CACHE = TAG;
+    public static final String WIDGET = TAG;
+    public static final String CONTACT = TAG;
+
+    /**
+     * Log tag for enabling/disabling StrictMode violation log.
+     * To enable: adb shell setprop log.tag.Mms:strictmode DEBUG
+     */
+    public static final String STRICT_MODE_TAG = TAG;
+    public static final boolean VERBOSE = false;
+    public static final boolean SEVERE_WARNING = true;                  // Leave this true
+    private static final boolean SHOW_SEVERE_WARNING_DIALOG = false;    // Set to false before ship
+    public static final boolean DEBUG_SEND = false;    // Set to false before ship
+    public static final boolean DEBUG_DUMP = false;    // Set to false before ship
+    public static final boolean ALLOW_DUMP_IN_LOGS = false;  // Set to false before ship
+
+    private static String prettyArray(String[] array) {
+        if (array.length == 0) {
+            return "[]";
+        }
+
+        StringBuilder sb = new StringBuilder("[");
+        int len = array.length-1;
+        for (int i = 0; i < len; i++) {
+            sb.append(array[i]);
+            sb.append(", ");
+        }
+        sb.append(array[len]);
+        sb.append("]");
+
+        return sb.toString();
+    }
+
+    private static String logFormat(String format, Object... args) {
+        for (int i = 0; i < args.length; i++) {
+            if (args[i] instanceof String[]) {
+                args[i] = prettyArray((String[])args[i]);
+            }
+        }
+        String s = String.format(format, args);
+        s = "[" + Thread.currentThread().getId() + "] " + s;
+        return s;
+    }
+
+    public static void debug(String format, Object... args) {
+        // Log.d(TAG, logFormat(format, args));
+    }
+
+    public static void warn(String format, Object... args) {
+        Log.w(TAG, logFormat(format, args));
+    }
+
+    public static void error(String format, Object... args) {
+        Log.e(TAG, logFormat(format, args));
+    }
+
+/*
+    public static void dumpInternalTables(final Context context) {
+        if (!ALLOW_DUMP_IN_LOGS) {
+            return;
+        }
+        new Thread(new Runnable() {
+            public void run() {
+                RecipientIdCache.canonicalTableDump();
+                RecipientIdCache.dump();
+                Conversation.dumpThreadsTable(context);
+                Conversation.dump();
+                Conversation.dumpSmsTable(context);
+                Contact.dump();
+            }
+        }).start();
+    }
+
+    public static void warnPossibleRecipientMismatch(final String msg, final Activity activity) {
+        Log.e(TAG, "WARNING!!!! " + msg, new RuntimeException());
+
+        if (SHOW_SEVERE_WARNING_DIALOG) {
+            dumpInternalTables(activity);
+            activity.runOnUiThread(new Runnable() {
+                public void run() {
+                    new AlertDialog.Builder(activity)
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
+                        .setTitle(R.string.error_state)
+                        .setMessage(msg + "\n\n" + activity.getString(R.string.error_state_text))
+                        .setPositiveButton(R.string.yes, new OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                dialog.dismiss();
+                            }
+                        })
+                        .show();
+                }
+            });
+        }
+    }
+*/
+
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ByteBufferInputStream.java b/imagepicker/src/main/java/com/android/mms/exif/ByteBufferInputStream.java
new file mode 100644
index 0000000..8e764af
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/ByteBufferInputStream.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+class ByteBufferInputStream extends InputStream {
+
+    private final ByteBuffer mBuf;
+
+    public ByteBufferInputStream(ByteBuffer buf) {
+        mBuf = buf;
+    }
+
+    @Override
+    public int read() {
+        if (!mBuf.hasRemaining()) {
+            return -1;
+        }
+        return mBuf.get() & 0xFF;
+    }
+
+    @Override
+    public int read(byte[] bytes, int off, int len) {
+        if (!mBuf.hasRemaining()) {
+            return -1;
+        }
+
+        len = Math.min(len, mBuf.remaining());
+        mBuf.get(bytes, off, len);
+        return len;
+    }
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java b/imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java
new file mode 100644
index 0000000..cbff12e
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import java.io.EOFException;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+
+class CountedDataInputStream extends FilterInputStream {
+
+    private int mCount = 0;
+
+    // allocate a byte buffer for a long value;
+    private final byte mByteArray[] = new byte[8];
+    private final ByteBuffer mByteBuffer = ByteBuffer.wrap(mByteArray);
+
+    protected CountedDataInputStream(InputStream in) {
+        super(in);
+    }
+
+    public int getReadByteCount() {
+        return mCount;
+    }
+
+    @Override
+    public int read(byte[] b) throws IOException {
+        int r = in.read(b);
+        mCount += (r >= 0) ? r : 0;
+        return r;
+    }
+
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException {
+        int r = in.read(b, off, len);
+        mCount += (r >= 0) ? r : 0;
+        return r;
+    }
+
+    @Override
+    public int read() throws IOException {
+        int r = in.read();
+        mCount += (r >= 0) ? 1 : 0;
+        return r;
+    }
+
+    @Override
+    public long skip(long length) throws IOException {
+        long skip = in.skip(length);
+        mCount += skip;
+        return skip;
+    }
+
+    public void skipOrThrow(long length) throws IOException {
+        if (skip(length) != length) throw new EOFException();
+    }
+
+    public void skipTo(long target) throws IOException {
+        long cur = mCount;
+        long diff = target - cur;
+        assert(diff >= 0);
+        skipOrThrow(diff);
+    }
+
+    public void readOrThrow(byte[] b, int off, int len) throws IOException {
+        int r = read(b, off, len);
+        if (r != len) throw new EOFException();
+    }
+
+    public void readOrThrow(byte[] b) throws IOException {
+        readOrThrow(b, 0, b.length);
+    }
+
+    public void setByteOrder(ByteOrder order) {
+        mByteBuffer.order(order);
+    }
+
+    public ByteOrder getByteOrder() {
+        return mByteBuffer.order();
+    }
+
+    public short readShort() throws IOException {
+        readOrThrow(mByteArray, 0 ,2);
+        mByteBuffer.rewind();
+        return mByteBuffer.getShort();
+    }
+
+    public int readUnsignedShort() throws IOException {
+        return readShort() & 0xffff;
+    }
+
+    public int readInt() throws IOException {
+        readOrThrow(mByteArray, 0 , 4);
+        mByteBuffer.rewind();
+        return mByteBuffer.getInt();
+    }
+
+    public long readUnsignedInt() throws IOException {
+        return readInt() & 0xffffffffL;
+    }
+
+    public long readLong() throws IOException {
+        readOrThrow(mByteArray, 0 , 8);
+        mByteBuffer.rewind();
+        return mByteBuffer.getLong();
+    }
+
+    public String readString(int n) throws IOException {
+        byte buf[] = new byte[n];
+        readOrThrow(buf);
+        return new String(buf, "UTF8");
+    }
+
+    public String readString(int n, Charset charset) throws IOException {
+        byte buf[] = new byte[n];
+        readOrThrow(buf);
+        return new String(buf, charset);
+    }
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifData.java b/imagepicker/src/main/java/com/android/mms/exif/ExifData.java
new file mode 100644
index 0000000..d8c5ef4
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifData.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import com.android.mms.LogTag;
+
+import android.util.Log;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This class stores the EXIF header in IFDs according to the JPEG
+ * specification. It is the result produced by {@link ExifReader}.
+ *
+ * @see ExifReader
+ * @see IfdData
+ */
+class ExifData {
+    private static final String TAG = LogTag.TAG;
+    private static final byte[] USER_COMMENT_ASCII = {
+            0x41, 0x53, 0x43, 0x49, 0x49, 0x00, 0x00, 0x00
+    };
+    private static final byte[] USER_COMMENT_JIS = {
+            0x4A, 0x49, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    private static final byte[] USER_COMMENT_UNICODE = {
+            0x55, 0x4E, 0x49, 0x43, 0x4F, 0x44, 0x45, 0x00
+    };
+
+    private final IfdData[] mIfdDatas = new IfdData[IfdId.TYPE_IFD_COUNT];
+    private byte[] mThumbnail;
+    private final ArrayList<byte[]> mStripBytes = new ArrayList<byte[]>();
+    private final ByteOrder mByteOrder;
+
+    ExifData(ByteOrder order) {
+        mByteOrder = order;
+    }
+
+    /**
+     * Gets the compressed thumbnail. Returns null if there is no compressed
+     * thumbnail.
+     *
+     * @see #hasCompressedThumbnail()
+     */
+    protected byte[] getCompressedThumbnail() {
+        return mThumbnail;
+    }
+
+    /**
+     * Sets the compressed thumbnail.
+     */
+    protected void setCompressedThumbnail(byte[] thumbnail) {
+        mThumbnail = thumbnail;
+    }
+
+    /**
+     * Returns true it this header contains a compressed thumbnail.
+     */
+    protected boolean hasCompressedThumbnail() {
+        return mThumbnail != null;
+    }
+
+    /**
+     * Adds an uncompressed strip.
+     */
+    protected void setStripBytes(int index, byte[] strip) {
+        if (index < mStripBytes.size()) {
+            mStripBytes.set(index, strip);
+        } else {
+            for (int i = mStripBytes.size(); i < index; i++) {
+                mStripBytes.add(null);
+            }
+            mStripBytes.add(strip);
+        }
+    }
+
+    /**
+     * Gets the strip count.
+     */
+    protected int getStripCount() {
+        return mStripBytes.size();
+    }
+
+    /**
+     * Gets the strip at the specified index.
+     *
+     * @exceptions #IndexOutOfBoundException
+     */
+    protected byte[] getStrip(int index) {
+        return mStripBytes.get(index);
+    }
+
+    /**
+     * Returns true if this header contains uncompressed strip.
+     */
+    protected boolean hasUncompressedStrip() {
+        return mStripBytes.size() != 0;
+    }
+
+    /**
+     * Gets the byte order.
+     */
+    protected ByteOrder getByteOrder() {
+        return mByteOrder;
+    }
+
+    /**
+     * Returns the {@link IfdData} object corresponding to a given IFD if it
+     * exists or null.
+     */
+    protected IfdData getIfdData(int ifdId) {
+        if (ExifTag.isValidIfd(ifdId)) {
+            return mIfdDatas[ifdId];
+        }
+        return null;
+    }
+
+    /**
+     * Adds IFD data. If IFD data of the same type already exists, it will be
+     * replaced by the new data.
+     */
+    protected void addIfdData(IfdData data) {
+        mIfdDatas[data.getId()] = data;
+    }
+
+    /**
+     * Returns the {@link IfdData} object corresponding to a given IFD or
+     * generates one if none exist.
+     */
+    protected IfdData getOrCreateIfdData(int ifdId) {
+        IfdData ifdData = mIfdDatas[ifdId];
+        if (ifdData == null) {
+            ifdData = new IfdData(ifdId);
+            mIfdDatas[ifdId] = ifdData;
+        }
+        return ifdData;
+    }
+
+    /**
+     * Returns the tag with a given TID in the given IFD if the tag exists.
+     * Otherwise returns null.
+     */
+    protected ExifTag getTag(short tag, int ifd) {
+        IfdData ifdData = mIfdDatas[ifd];
+        return (ifdData == null) ? null : ifdData.getTag(tag);
+    }
+
+    /**
+     * Adds the given ExifTag to its default IFD and returns an existing ExifTag
+     * with the same TID or null if none exist.
+     */
+    protected ExifTag addTag(ExifTag tag) {
+        if (tag != null) {
+            int ifd = tag.getIfd();
+            return addTag(tag, ifd);
+        }
+        return null;
+    }
+
+    /**
+     * Adds the given ExifTag to the given IFD and returns an existing ExifTag
+     * with the same TID or null if none exist.
+     */
+    protected ExifTag addTag(ExifTag tag, int ifdId) {
+        if (tag != null && ExifTag.isValidIfd(ifdId)) {
+            IfdData ifdData = getOrCreateIfdData(ifdId);
+            return ifdData.setTag(tag);
+        }
+        return null;
+    }
+
+    protected void clearThumbnailAndStrips() {
+        mThumbnail = null;
+        mStripBytes.clear();
+    }
+
+    /**
+     * Removes the thumbnail and its related tags. IFD1 will be removed.
+     */
+    protected void removeThumbnailData() {
+        clearThumbnailAndStrips();
+        mIfdDatas[IfdId.TYPE_IFD_1] = null;
+    }
+
+    /**
+     * Removes the tag with a given TID and IFD.
+     */
+    protected void removeTag(short tagId, int ifdId) {
+        IfdData ifdData = mIfdDatas[ifdId];
+        if (ifdData == null) {
+            return;
+        }
+        ifdData.removeTag(tagId);
+    }
+
+    /**
+     * Decodes the user comment tag into string as specified in the EXIF
+     * standard. Returns null if decoding failed.
+     */
+    protected String getUserComment() {
+        IfdData ifdData = mIfdDatas[IfdId.TYPE_IFD_0];
+        if (ifdData == null) {
+            return null;
+        }
+        ExifTag tag = ifdData.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_USER_COMMENT));
+        if (tag == null) {
+            return null;
+        }
+        if (tag.getComponentCount() < 8) {
+            return null;
+        }
+
+        byte[] buf = new byte[tag.getComponentCount()];
+        tag.getBytes(buf);
+
+        byte[] code = new byte[8];
+        System.arraycopy(buf, 0, code, 0, 8);
+
+        try {
+            if (Arrays.equals(code, USER_COMMENT_ASCII)) {
+                return new String(buf, 8, buf.length - 8, "US-ASCII");
+            } else if (Arrays.equals(code, USER_COMMENT_JIS)) {
+                return new String(buf, 8, buf.length - 8, "EUC-JP");
+            } else if (Arrays.equals(code, USER_COMMENT_UNICODE)) {
+                return new String(buf, 8, buf.length - 8, "UTF-16");
+            } else {
+                return null;
+            }
+        } catch (UnsupportedEncodingException e) {
+            Log.w(TAG, "Failed to decode the user comment");
+            return null;
+        }
+    }
+
+    /**
+     * Returns a list of all {@link ExifTag}s in the ExifData or null if there
+     * are none.
+     */
+    protected List<ExifTag> getAllTags() {
+        ArrayList<ExifTag> ret = new ArrayList<ExifTag>();
+        for (IfdData d : mIfdDatas) {
+            if (d != null) {
+                ExifTag[] tags = d.getAllTags();
+                if (tags != null) {
+                    for (ExifTag t : tags) {
+                        ret.add(t);
+                    }
+                }
+            }
+        }
+        if (ret.size() == 0) {
+            return null;
+        }
+        return ret;
+    }
+
+    /**
+     * Returns a list of all {@link ExifTag}s in a given IFD or null if there
+     * are none.
+     */
+    protected List<ExifTag> getAllTagsForIfd(int ifd) {
+        IfdData d = mIfdDatas[ifd];
+        if (d == null) {
+            return null;
+        }
+        ExifTag[] tags = d.getAllTags();
+        if (tags == null) {
+            return null;
+        }
+        ArrayList<ExifTag> ret = new ArrayList<ExifTag>(tags.length);
+        for (ExifTag t : tags) {
+            ret.add(t);
+        }
+        if (ret.size() == 0) {
+            return null;
+        }
+        return ret;
+    }
+
+    /**
+     * Returns a list of all {@link ExifTag}s with a given TID or null if there
+     * are none.
+     */
+    protected List<ExifTag> getAllTagsForTagId(short tag) {
+        ArrayList<ExifTag> ret = new ArrayList<ExifTag>();
+        for (IfdData d : mIfdDatas) {
+            if (d != null) {
+                ExifTag t = d.getTag(tag);
+                if (t != null) {
+                    ret.add(t);
+                }
+            }
+        }
+        if (ret.size() == 0) {
+            return null;
+        }
+        return ret;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (obj instanceof ExifData) {
+            ExifData data = (ExifData) obj;
+            if (data.mByteOrder != mByteOrder ||
+                    data.mStripBytes.size() != mStripBytes.size() ||
+                    !Arrays.equals(data.mThumbnail, mThumbnail)) {
+                return false;
+            }
+            for (int i = 0; i < mStripBytes.size(); i++) {
+                if (!Arrays.equals(data.mStripBytes.get(i), mStripBytes.get(i))) {
+                    return false;
+                }
+            }
+            for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) {
+                IfdData ifd1 = data.getIfdData(i);
+                IfdData ifd2 = getIfdData(i);
+                if (ifd1 != ifd2 && ifd1 != null && !ifd1.equals(ifd2)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java b/imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java
new file mode 100644
index 0000000..aa615d0
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java
@@ -0,0 +1,2416 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.SparseIntArray;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.FileChannel.MapMode;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.TimeZone;
+
+/**
+ * This class provides methods and constants for reading and writing jpeg file
+ * metadata. It contains a collection of ExifTags, and a collection of
+ * definitions for creating valid ExifTags. The collection of ExifTags can be
+ * updated by: reading new ones from a file, deleting or adding existing ones,
+ * or building new ExifTags from a tag definition. These ExifTags can be written
+ * to a valid jpeg image as exif metadata.
+ * <p>
+ * Each ExifTag has a tag ID (TID) and is stored in a specific image file
+ * directory (IFD) as specified by the exif standard. A tag definition can be
+ * looked up with a constant that is a combination of TID and IFD. This
+ * definition has information about the type, number of components, and valid
+ * IFDs for a tag.
+ *
+ * @see ExifTag
+ */
+public class ExifInterface {
+    public static final int TAG_NULL = -1;
+    public static final int IFD_NULL = -1;
+    public static final int DEFINITION_NULL = 0;
+
+    /**
+     * Tag constants for Jeita EXIF 2.2
+     */
+
+    // IFD 0
+    public static final int TAG_IMAGE_WIDTH =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0100);
+    public static final int TAG_IMAGE_LENGTH =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0101); // Image height
+    public static final int TAG_BITS_PER_SAMPLE =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0102);
+    public static final int TAG_COMPRESSION =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0103);
+    public static final int TAG_PHOTOMETRIC_INTERPRETATION =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0106);
+    public static final int TAG_IMAGE_DESCRIPTION =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x010E);
+    public static final int TAG_MAKE =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x010F);
+    public static final int TAG_MODEL =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0110);
+    public static final int TAG_STRIP_OFFSETS =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0111);
+    public static final int TAG_ORIENTATION =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0112);
+    public static final int TAG_SAMPLES_PER_PIXEL =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0115);
+    public static final int TAG_ROWS_PER_STRIP =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0116);
+    public static final int TAG_STRIP_BYTE_COUNTS =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0117);
+    public static final int TAG_X_RESOLUTION =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x011A);
+    public static final int TAG_Y_RESOLUTION =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x011B);
+    public static final int TAG_PLANAR_CONFIGURATION =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x011C);
+    public static final int TAG_RESOLUTION_UNIT =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0128);
+    public static final int TAG_TRANSFER_FUNCTION =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x012D);
+    public static final int TAG_SOFTWARE =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0131);
+    public static final int TAG_DATE_TIME =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0132);
+    public static final int TAG_ARTIST =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x013B);
+    public static final int TAG_WHITE_POINT =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x013E);
+    public static final int TAG_PRIMARY_CHROMATICITIES =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x013F);
+    public static final int TAG_Y_CB_CR_COEFFICIENTS =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0211);
+    public static final int TAG_Y_CB_CR_SUB_SAMPLING =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0212);
+    public static final int TAG_Y_CB_CR_POSITIONING =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0213);
+    public static final int TAG_REFERENCE_BLACK_WHITE =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x0214);
+    public static final int TAG_COPYRIGHT =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x8298);
+    public static final int TAG_EXIF_IFD =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x8769);
+    public static final int TAG_GPS_IFD =
+        defineTag(IfdId.TYPE_IFD_0, (short) 0x8825);
+    // IFD 1
+    public static final int TAG_JPEG_INTERCHANGE_FORMAT =
+        defineTag(IfdId.TYPE_IFD_1, (short) 0x0201);
+    public static final int TAG_JPEG_INTERCHANGE_FORMAT_LENGTH =
+        defineTag(IfdId.TYPE_IFD_1, (short) 0x0202);
+    // IFD Exif Tags
+    public static final int TAG_EXPOSURE_TIME =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x829A);
+    public static final int TAG_F_NUMBER =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x829D);
+    public static final int TAG_EXPOSURE_PROGRAM =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x8822);
+    public static final int TAG_SPECTRAL_SENSITIVITY =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x8824);
+    public static final int TAG_ISO_SPEED_RATINGS =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x8827);
+    public static final int TAG_OECF =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x8828);
+    public static final int TAG_EXIF_VERSION =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9000);
+    public static final int TAG_DATE_TIME_ORIGINAL =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9003);
+    public static final int TAG_DATE_TIME_DIGITIZED =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9004);
+    public static final int TAG_COMPONENTS_CONFIGURATION =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9101);
+    public static final int TAG_COMPRESSED_BITS_PER_PIXEL =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9102);
+    public static final int TAG_SHUTTER_SPEED_VALUE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9201);
+    public static final int TAG_APERTURE_VALUE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9202);
+    public static final int TAG_BRIGHTNESS_VALUE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9203);
+    public static final int TAG_EXPOSURE_BIAS_VALUE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9204);
+    public static final int TAG_MAX_APERTURE_VALUE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9205);
+    public static final int TAG_SUBJECT_DISTANCE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9206);
+    public static final int TAG_METERING_MODE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9207);
+    public static final int TAG_LIGHT_SOURCE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9208);
+    public static final int TAG_FLASH =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9209);
+    public static final int TAG_FOCAL_LENGTH =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x920A);
+    public static final int TAG_SUBJECT_AREA =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9214);
+    public static final int TAG_MAKER_NOTE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x927C);
+    public static final int TAG_USER_COMMENT =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9286);
+    public static final int TAG_SUB_SEC_TIME =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9290);
+    public static final int TAG_SUB_SEC_TIME_ORIGINAL =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9291);
+    public static final int TAG_SUB_SEC_TIME_DIGITIZED =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9292);
+    public static final int TAG_FLASHPIX_VERSION =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA000);
+    public static final int TAG_COLOR_SPACE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA001);
+    public static final int TAG_PIXEL_X_DIMENSION =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA002);
+    public static final int TAG_PIXEL_Y_DIMENSION =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA003);
+    public static final int TAG_RELATED_SOUND_FILE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA004);
+    public static final int TAG_INTEROPERABILITY_IFD =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA005);
+    public static final int TAG_FLASH_ENERGY =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA20B);
+    public static final int TAG_SPATIAL_FREQUENCY_RESPONSE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA20C);
+    public static final int TAG_FOCAL_PLANE_X_RESOLUTION =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA20E);
+    public static final int TAG_FOCAL_PLANE_Y_RESOLUTION =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA20F);
+    public static final int TAG_FOCAL_PLANE_RESOLUTION_UNIT =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA210);
+    public static final int TAG_SUBJECT_LOCATION =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA214);
+    public static final int TAG_EXPOSURE_INDEX =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA215);
+    public static final int TAG_SENSING_METHOD =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA217);
+    public static final int TAG_FILE_SOURCE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA300);
+    public static final int TAG_SCENE_TYPE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA301);
+    public static final int TAG_CFA_PATTERN =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA302);
+    public static final int TAG_CUSTOM_RENDERED =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA401);
+    public static final int TAG_EXPOSURE_MODE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA402);
+    public static final int TAG_WHITE_BALANCE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA403);
+    public static final int TAG_DIGITAL_ZOOM_RATIO =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA404);
+    public static final int TAG_FOCAL_LENGTH_IN_35_MM_FILE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA405);
+    public static final int TAG_SCENE_CAPTURE_TYPE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA406);
+    public static final int TAG_GAIN_CONTROL =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA407);
+    public static final int TAG_CONTRAST =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA408);
+    public static final int TAG_SATURATION =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA409);
+    public static final int TAG_SHARPNESS =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA40A);
+    public static final int TAG_DEVICE_SETTING_DESCRIPTION =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA40B);
+    public static final int TAG_SUBJECT_DISTANCE_RANGE =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA40C);
+    public static final int TAG_IMAGE_UNIQUE_ID =
+        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA420);
+    // IFD GPS tags
+    public static final int TAG_GPS_VERSION_ID =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 0);
+    public static final int TAG_GPS_LATITUDE_REF =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 1);
+    public static final int TAG_GPS_LATITUDE =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 2);
+    public static final int TAG_GPS_LONGITUDE_REF =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 3);
+    public static final int TAG_GPS_LONGITUDE =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 4);
+    public static final int TAG_GPS_ALTITUDE_REF =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 5);
+    public static final int TAG_GPS_ALTITUDE =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 6);
+    public static final int TAG_GPS_TIME_STAMP =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 7);
+    public static final int TAG_GPS_SATTELLITES =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 8);
+    public static final int TAG_GPS_STATUS =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 9);
+    public static final int TAG_GPS_MEASURE_MODE =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 10);
+    public static final int TAG_GPS_DOP =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 11);
+    public static final int TAG_GPS_SPEED_REF =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 12);
+    public static final int TAG_GPS_SPEED =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 13);
+    public static final int TAG_GPS_TRACK_REF =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 14);
+    public static final int TAG_GPS_TRACK =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 15);
+    public static final int TAG_GPS_IMG_DIRECTION_REF =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 16);
+    public static final int TAG_GPS_IMG_DIRECTION =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 17);
+    public static final int TAG_GPS_MAP_DATUM =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 18);
+    public static final int TAG_GPS_DEST_LATITUDE_REF =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 19);
+    public static final int TAG_GPS_DEST_LATITUDE =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 20);
+    public static final int TAG_GPS_DEST_LONGITUDE_REF =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 21);
+    public static final int TAG_GPS_DEST_LONGITUDE =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 22);
+    public static final int TAG_GPS_DEST_BEARING_REF =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 23);
+    public static final int TAG_GPS_DEST_BEARING =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 24);
+    public static final int TAG_GPS_DEST_DISTANCE_REF =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 25);
+    public static final int TAG_GPS_DEST_DISTANCE =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 26);
+    public static final int TAG_GPS_PROCESSING_METHOD =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 27);
+    public static final int TAG_GPS_AREA_INFORMATION =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 28);
+    public static final int TAG_GPS_DATE_STAMP =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 29);
+    public static final int TAG_GPS_DIFFERENTIAL =
+        defineTag(IfdId.TYPE_IFD_GPS, (short) 30);
+    // IFD Interoperability tags
+    public static final int TAG_INTEROPERABILITY_INDEX =
+        defineTag(IfdId.TYPE_IFD_INTEROPERABILITY, (short) 1);
+
+    /**
+     * Tags that contain offset markers. These are included in the banned
+     * defines.
+     */
+    private static HashSet<Short> sOffsetTags = new HashSet<Short>();
+    static {
+        sOffsetTags.add(getTrueTagKey(TAG_GPS_IFD));
+        sOffsetTags.add(getTrueTagKey(TAG_EXIF_IFD));
+        sOffsetTags.add(getTrueTagKey(TAG_JPEG_INTERCHANGE_FORMAT));
+        sOffsetTags.add(getTrueTagKey(TAG_INTEROPERABILITY_IFD));
+        sOffsetTags.add(getTrueTagKey(TAG_STRIP_OFFSETS));
+    }
+
+    /**
+     * Tags with definitions that cannot be overridden (banned defines).
+     */
+    protected static HashSet<Short> sBannedDefines = new HashSet<Short>(sOffsetTags);
+    static {
+        sBannedDefines.add(getTrueTagKey(TAG_NULL));
+        sBannedDefines.add(getTrueTagKey(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH));
+        sBannedDefines.add(getTrueTagKey(TAG_STRIP_BYTE_COUNTS));
+    }
+
+    /**
+     * Returns the constant representing a tag with a given TID and default IFD.
+     */
+    public static int defineTag(int ifdId, short tagId) {
+        return (tagId & 0x0000ffff) | (ifdId << 16);
+    }
+
+    /**
+     * Returns the TID for a tag constant.
+     */
+    public static short getTrueTagKey(int tag) {
+        // Truncate
+        return (short) tag;
+    }
+
+    /**
+     * Returns the default IFD for a tag constant.
+     */
+    public static int getTrueIfd(int tag) {
+        return tag >>> 16;
+    }
+
+    /**
+     * Constants for {@link TAG_ORIENTATION}. They can be interpreted as
+     * follows:
+     * <ul>
+     * <li>TOP_LEFT is the normal orientation.</li>
+     * <li>TOP_RIGHT is a left-right mirror.</li>
+     * <li>BOTTOM_LEFT is a 180 degree rotation.</li>
+     * <li>BOTTOM_RIGHT is a top-bottom mirror.</li>
+     * <li>LEFT_TOP is mirrored about the top-left<->bottom-right axis.</li>
+     * <li>RIGHT_TOP is a 90 degree clockwise rotation.</li>
+     * <li>LEFT_BOTTOM is mirrored about the top-right<->bottom-left axis.</li>
+     * <li>RIGHT_BOTTOM is a 270 degree clockwise rotation.</li>
+     * </ul>
+     */
+    public static interface Orientation {
+        public static final short TOP_LEFT = 1;
+        public static final short TOP_RIGHT = 2;
+        public static final short BOTTOM_LEFT = 3;
+        public static final short BOTTOM_RIGHT = 4;
+        public static final short LEFT_TOP = 5;
+        public static final short RIGHT_TOP = 6;
+        public static final short LEFT_BOTTOM = 7;
+        public static final short RIGHT_BOTTOM = 8;
+    }
+
+    /**
+     * Constants for {@link TAG_Y_CB_CR_POSITIONING}
+     */
+    public static interface YCbCrPositioning {
+        public static final short CENTERED = 1;
+        public static final short CO_SITED = 2;
+    }
+
+    /**
+     * Constants for {@link TAG_COMPRESSION}
+     */
+    public static interface Compression {
+        public static final short UNCOMPRESSION = 1;
+        public static final short JPEG = 6;
+    }
+
+    /**
+     * Constants for {@link TAG_RESOLUTION_UNIT}
+     */
+    public static interface ResolutionUnit {
+        public static final short INCHES = 2;
+        public static final short CENTIMETERS = 3;
+    }
+
+    /**
+     * Constants for {@link TAG_PHOTOMETRIC_INTERPRETATION}
+     */
+    public static interface PhotometricInterpretation {
+        public static final short RGB = 2;
+        public static final short YCBCR = 6;
+    }
+
+    /**
+     * Constants for {@link TAG_PLANAR_CONFIGURATION}
+     */
+    public static interface PlanarConfiguration {
+        public static final short CHUNKY = 1;
+        public static final short PLANAR = 2;
+    }
+
+    /**
+     * Constants for {@link TAG_EXPOSURE_PROGRAM}
+     */
+    public static interface ExposureProgram {
+        public static final short NOT_DEFINED = 0;
+        public static final short MANUAL = 1;
+        public static final short NORMAL_PROGRAM = 2;
+        public static final short APERTURE_PRIORITY = 3;
+        public static final short SHUTTER_PRIORITY = 4;
+        public static final short CREATIVE_PROGRAM = 5;
+        public static final short ACTION_PROGRAM = 6;
+        public static final short PROTRAIT_MODE = 7;
+        public static final short LANDSCAPE_MODE = 8;
+    }
+
+    /**
+     * Constants for {@link TAG_METERING_MODE}
+     */
+    public static interface MeteringMode {
+        public static final short UNKNOWN = 0;
+        public static final short AVERAGE = 1;
+        public static final short CENTER_WEIGHTED_AVERAGE = 2;
+        public static final short SPOT = 3;
+        public static final short MULTISPOT = 4;
+        public static final short PATTERN = 5;
+        public static final short PARTAIL = 6;
+        public static final short OTHER = 255;
+    }
+
+    /**
+     * Constants for {@link TAG_FLASH} As the definition in Jeita EXIF 2.2
+     * standard, we can treat this constant as bitwise flag.
+     * <p>
+     * e.g.
+     * <p>
+     * short flash = FIRED | RETURN_STROBE_RETURN_LIGHT_DETECTED |
+     * MODE_AUTO_MODE
+     */
+    public static interface Flash {
+        // LSB
+        public static final short DID_NOT_FIRED = 0;
+        public static final short FIRED = 1;
+        // 1st~2nd bits
+        public static final short RETURN_NO_STROBE_RETURN_DETECTION_FUNCTION = 0 << 1;
+        public static final short RETURN_STROBE_RETURN_LIGHT_NOT_DETECTED = 2 << 1;
+        public static final short RETURN_STROBE_RETURN_LIGHT_DETECTED = 3 << 1;
+        // 3rd~4th bits
+        public static final short MODE_UNKNOWN = 0 << 3;
+        public static final short MODE_COMPULSORY_FLASH_FIRING = 1 << 3;
+        public static final short MODE_COMPULSORY_FLASH_SUPPRESSION = 2 << 3;
+        public static final short MODE_AUTO_MODE = 3 << 3;
+        // 5th bit
+        public static final short FUNCTION_PRESENT = 0 << 5;
+        public static final short FUNCTION_NO_FUNCTION = 1 << 5;
+        // 6th bit
+        public static final short RED_EYE_REDUCTION_NO_OR_UNKNOWN = 0 << 6;
+        public static final short RED_EYE_REDUCTION_SUPPORT = 1 << 6;
+    }
+
+    /**
+     * Constants for {@link TAG_COLOR_SPACE}
+     */
+    public static interface ColorSpace {
+        public static final short SRGB = 1;
+        public static final short UNCALIBRATED = (short) 0xFFFF;
+    }
+
+    /**
+     * Constants for {@link TAG_EXPOSURE_MODE}
+     */
+    public static interface ExposureMode {
+        public static final short AUTO_EXPOSURE = 0;
+        public static final short MANUAL_EXPOSURE = 1;
+        public static final short AUTO_BRACKET = 2;
+    }
+
+    /**
+     * Constants for {@link TAG_WHITE_BALANCE}
+     */
+    public static interface WhiteBalance {
+        public static final short AUTO = 0;
+        public static final short MANUAL = 1;
+    }
+
+    /**
+     * Constants for {@link TAG_SCENE_CAPTURE_TYPE}
+     */
+    public static interface SceneCapture {
+        public static final short STANDARD = 0;
+        public static final short LANDSCAPE = 1;
+        public static final short PROTRAIT = 2;
+        public static final short NIGHT_SCENE = 3;
+    }
+
+    /**
+     * Constants for {@link TAG_COMPONENTS_CONFIGURATION}
+     */
+    public static interface ComponentsConfiguration {
+        public static final short NOT_EXIST = 0;
+        public static final short Y = 1;
+        public static final short CB = 2;
+        public static final short CR = 3;
+        public static final short R = 4;
+        public static final short G = 5;
+        public static final short B = 6;
+    }
+
+    /**
+     * Constants for {@link TAG_LIGHT_SOURCE}
+     */
+    public static interface LightSource {
+        public static final short UNKNOWN = 0;
+        public static final short DAYLIGHT = 1;
+        public static final short FLUORESCENT = 2;
+        public static final short TUNGSTEN = 3;
+        public static final short FLASH = 4;
+        public static final short FINE_WEATHER = 9;
+        public static final short CLOUDY_WEATHER = 10;
+        public static final short SHADE = 11;
+        public static final short DAYLIGHT_FLUORESCENT = 12;
+        public static final short DAY_WHITE_FLUORESCENT = 13;
+        public static final short COOL_WHITE_FLUORESCENT = 14;
+        public static final short WHITE_FLUORESCENT = 15;
+        public static final short STANDARD_LIGHT_A = 17;
+        public static final short STANDARD_LIGHT_B = 18;
+        public static final short STANDARD_LIGHT_C = 19;
+        public static final short D55 = 20;
+        public static final short D65 = 21;
+        public static final short D75 = 22;
+        public static final short D50 = 23;
+        public static final short ISO_STUDIO_TUNGSTEN = 24;
+        public static final short OTHER = 255;
+    }
+
+    /**
+     * Constants for {@link TAG_SENSING_METHOD}
+     */
+    public static interface SensingMethod {
+        public static final short NOT_DEFINED = 1;
+        public static final short ONE_CHIP_COLOR = 2;
+        public static final short TWO_CHIP_COLOR = 3;
+        public static final short THREE_CHIP_COLOR = 4;
+        public static final short COLOR_SEQUENTIAL_AREA = 5;
+        public static final short TRILINEAR = 7;
+        public static final short COLOR_SEQUENTIAL_LINEAR = 8;
+    }
+
+    /**
+     * Constants for {@link TAG_FILE_SOURCE}
+     */
+    public static interface FileSource {
+        public static final short DSC = 3;
+    }
+
+    /**
+     * Constants for {@link TAG_SCENE_TYPE}
+     */
+    public static interface SceneType {
+        public static final short DIRECT_PHOTOGRAPHED = 1;
+    }
+
+    /**
+     * Constants for {@link TAG_GAIN_CONTROL}
+     */
+    public static interface GainControl {
+        public static final short NONE = 0;
+        public static final short LOW_UP = 1;
+        public static final short HIGH_UP = 2;
+        public static final short LOW_DOWN = 3;
+        public static final short HIGH_DOWN = 4;
+    }
+
+    /**
+     * Constants for {@link TAG_CONTRAST}
+     */
+    public static interface Contrast {
+        public static final short NORMAL = 0;
+        public static final short SOFT = 1;
+        public static final short HARD = 2;
+    }
+
+    /**
+     * Constants for {@link TAG_SATURATION}
+     */
+    public static interface Saturation {
+        public static final short NORMAL = 0;
+        public static final short LOW = 1;
+        public static final short HIGH = 2;
+    }
+
+    /**
+     * Constants for {@link TAG_SHARPNESS}
+     */
+    public static interface Sharpness {
+        public static final short NORMAL = 0;
+        public static final short SOFT = 1;
+        public static final short HARD = 2;
+    }
+
+    /**
+     * Constants for {@link TAG_SUBJECT_DISTANCE}
+     */
+    public static interface SubjectDistance {
+        public static final short UNKNOWN = 0;
+        public static final short MACRO = 1;
+        public static final short CLOSE_VIEW = 2;
+        public static final short DISTANT_VIEW = 3;
+    }
+
+    /**
+     * Constants for {@link TAG_GPS_LATITUDE_REF},
+     * {@link TAG_GPS_DEST_LATITUDE_REF}
+     */
+    public static interface GpsLatitudeRef {
+        public static final String NORTH = "N";
+        public static final String SOUTH = "S";
+    }
+
+    /**
+     * Constants for {@link TAG_GPS_LONGITUDE_REF},
+     * {@link TAG_GPS_DEST_LONGITUDE_REF}
+     */
+    public static interface GpsLongitudeRef {
+        public static final String EAST = "E";
+        public static final String WEST = "W";
+    }
+
+    /**
+     * Constants for {@link TAG_GPS_ALTITUDE_REF}
+     */
+    public static interface GpsAltitudeRef {
+        public static final short SEA_LEVEL = 0;
+        public static final short SEA_LEVEL_NEGATIVE = 1;
+    }
+
+    /**
+     * Constants for {@link TAG_GPS_STATUS}
+     */
+    public static interface GpsStatus {
+        public static final String IN_PROGRESS = "A";
+        public static final String INTEROPERABILITY = "V";
+    }
+
+    /**
+     * Constants for {@link TAG_GPS_MEASURE_MODE}
+     */
+    public static interface GpsMeasureMode {
+        public static final String MODE_2_DIMENSIONAL = "2";
+        public static final String MODE_3_DIMENSIONAL = "3";
+    }
+
+    /**
+     * Constants for {@link TAG_GPS_SPEED_REF},
+     * {@link TAG_GPS_DEST_DISTANCE_REF}
+     */
+    public static interface GpsSpeedRef {
+        public static final String KILOMETERS = "K";
+        public static final String MILES = "M";
+        public static final String KNOTS = "N";
+    }
+
+    /**
+     * Constants for {@link TAG_GPS_TRACK_REF},
+     * {@link TAG_GPS_IMG_DIRECTION_REF}, {@link TAG_GPS_DEST_BEARING_REF}
+     */
+    public static interface GpsTrackRef {
+        public static final String TRUE_DIRECTION = "T";
+        public static final String MAGNETIC_DIRECTION = "M";
+    }
+
+    /**
+     * Constants for {@link TAG_GPS_DIFFERENTIAL}
+     */
+    public static interface GpsDifferential {
+        public static final short WITHOUT_DIFFERENTIAL_CORRECTION = 0;
+        public static final short DIFFERENTIAL_CORRECTION_APPLIED = 1;
+    }
+
+    private static final String NULL_ARGUMENT_STRING = "Argument is null";
+    private ExifData mData = new ExifData(DEFAULT_BYTE_ORDER);
+    public static final ByteOrder DEFAULT_BYTE_ORDER = ByteOrder.BIG_ENDIAN;
+
+    public ExifInterface() {
+        mGPSDateStampFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
+
+    /**
+     * Reads the exif tags from a byte array, clearing this ExifInterface
+     * object's existing exif tags.
+     *
+     * @param jpeg a byte array containing a jpeg compressed image.
+     * @throws IOException
+     */
+    public void readExif(byte[] jpeg) throws IOException {
+        readExif(new ByteArrayInputStream(jpeg));
+    }
+
+    /**
+     * Reads the exif tags from an InputStream, clearing this ExifInterface
+     * object's existing exif tags.
+     *
+     * @param inStream an InputStream containing a jpeg compressed image.
+     * @throws IOException
+     */
+    public void readExif(InputStream inStream) throws IOException {
+        if (inStream == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        ExifData d = null;
+        try {
+            d = new ExifReader(this).read(inStream);
+        } catch (ExifInvalidFormatException e) {
+            throw new IOException("Invalid exif format : " + e);
+        }
+        mData = d;
+    }
+
+    /**
+     * Reads the exif tags from a file, clearing this ExifInterface object's
+     * existing exif tags.
+     *
+     * @param inFileName a string representing the filepath to jpeg file.
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    public void readExif(String inFileName) throws FileNotFoundException, IOException {
+        if (inFileName == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        InputStream is = null;
+        try {
+            is = new BufferedInputStream(new FileInputStream(inFileName));
+            readExif(is);
+        } catch (IOException e) {
+            closeSilently(is);
+            throw e;
+        }
+        is.close();
+    }
+
+    /**
+     * Sets the exif tags, clearing this ExifInterface object's existing exif
+     * tags.
+     *
+     * @param tags a collection of exif tags to set.
+     */
+    public void setExif(Collection<ExifTag> tags) {
+        clearExif();
+        setTags(tags);
+    }
+
+    /**
+     * Clears this ExifInterface object's existing exif tags.
+     */
+    public void clearExif() {
+        mData = new ExifData(DEFAULT_BYTE_ORDER);
+    }
+
+    /**
+     * Writes the tags from this ExifInterface object into a jpeg image,
+     * removing prior exif tags.
+     *
+     * @param jpeg a byte array containing a jpeg compressed image.
+     * @param exifOutStream an OutputStream to which the jpeg image with added
+     *            exif tags will be written.
+     * @throws IOException
+     */
+    public void writeExif(byte[] jpeg, OutputStream exifOutStream) throws IOException {
+        if (jpeg == null || exifOutStream == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        OutputStream s = getExifWriterStream(exifOutStream);
+        s.write(jpeg, 0, jpeg.length);
+        s.flush();
+    }
+
+    /**
+     * Writes the tags from this ExifInterface object into a jpeg compressed
+     * bitmap, removing prior exif tags.
+     *
+     * @param bmap a bitmap to compress and write exif into.
+     * @param exifOutStream the OutputStream to which the jpeg image with added
+     *            exif tags will be written.
+     * @throws IOException
+     */
+    public void writeExif(Bitmap bmap, OutputStream exifOutStream) throws IOException {
+        if (bmap == null || exifOutStream == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        OutputStream s = getExifWriterStream(exifOutStream);
+        bmap.compress(Bitmap.CompressFormat.JPEG, 90, s);
+        s.flush();
+    }
+
+    public void writeExif(Bitmap bmap, OutputStream exifOutStream, int quality) throws IOException {
+        if (bmap == null || exifOutStream == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        OutputStream s = getExifWriterStream(exifOutStream);
+        bmap.compress(Bitmap.CompressFormat.JPEG, quality, s);
+        s.flush();
+    }
+
+    /**
+     * Writes the tags from this ExifInterface object into a jpeg stream,
+     * removing prior exif tags.
+     *
+     * @param jpegStream an InputStream containing a jpeg compressed image.
+     * @param exifOutStream an OutputStream to which the jpeg image with added
+     *            exif tags will be written.
+     * @throws IOException
+     */
+    public void writeExif(InputStream jpegStream, OutputStream exifOutStream) throws IOException {
+        if (jpegStream == null || exifOutStream == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        OutputStream s = getExifWriterStream(exifOutStream);
+        doExifStreamIO(jpegStream, s);
+        s.flush();
+    }
+
+    /**
+     * Writes the tags from this ExifInterface object into a jpeg image,
+     * removing prior exif tags.
+     *
+     * @param jpeg a byte array containing a jpeg compressed image.
+     * @param exifOutFileName a String containing the filepath to which the jpeg
+     *            image with added exif tags will be written.
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    public void writeExif(byte[] jpeg, String exifOutFileName) throws FileNotFoundException,
+            IOException {
+        if (jpeg == null || exifOutFileName == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        OutputStream s = null;
+        try {
+            s = getExifWriterStream(exifOutFileName);
+            s.write(jpeg, 0, jpeg.length);
+            s.flush();
+        } catch (IOException e) {
+            closeSilently(s);
+            throw e;
+        }
+        s.close();
+    }
+
+    /**
+     * Writes the tags from this ExifInterface object into a jpeg compressed
+     * bitmap, removing prior exif tags.
+     *
+     * @param bmap a bitmap to compress and write exif into.
+     * @param exifOutFileName a String containing the filepath to which the jpeg
+     *            image with added exif tags will be written.
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    public void writeExif(Bitmap bmap, String exifOutFileName) throws FileNotFoundException,
+            IOException {
+        if (bmap == null || exifOutFileName == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        OutputStream s = null;
+        try {
+            s = getExifWriterStream(exifOutFileName);
+            bmap.compress(Bitmap.CompressFormat.JPEG, 90, s);
+            s.flush();
+        } catch (IOException e) {
+            closeSilently(s);
+            throw e;
+        }
+        s.close();
+    }
+
+    /**
+     * Writes the tags from this ExifInterface object into a jpeg stream,
+     * removing prior exif tags.
+     *
+     * @param jpegStream an InputStream containing a jpeg compressed image.
+     * @param exifOutFileName a String containing the filepath to which the jpeg
+     *            image with added exif tags will be written.
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    public void writeExif(InputStream jpegStream, String exifOutFileName)
+            throws FileNotFoundException, IOException {
+        if (jpegStream == null || exifOutFileName == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        OutputStream s = null;
+        try {
+            s = getExifWriterStream(exifOutFileName);
+            doExifStreamIO(jpegStream, s);
+            s.flush();
+        } catch (IOException e) {
+            closeSilently(s);
+            throw e;
+        }
+        s.close();
+    }
+
+    /**
+     * Writes the tags from this ExifInterface object into a jpeg file, removing
+     * prior exif tags.
+     *
+     * @param jpegFileName a String containing the filepath for a jpeg file.
+     * @param exifOutFileName a String containing the filepath to which the jpeg
+     *            image with added exif tags will be written.
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    public void writeExif(String jpegFileName, String exifOutFileName)
+            throws FileNotFoundException, IOException {
+        if (jpegFileName == null || exifOutFileName == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        InputStream is = null;
+        try {
+            is = new FileInputStream(jpegFileName);
+            writeExif(is, exifOutFileName);
+        } catch (IOException e) {
+            closeSilently(is);
+            throw e;
+        }
+        is.close();
+    }
+
+    /**
+     * Wraps an OutputStream object with an ExifOutputStream. Exif tags in this
+     * ExifInterface object will be added to a jpeg image written to this
+     * stream, removing prior exif tags. Other methods of this ExifInterface
+     * object should not be called until the returned OutputStream has been
+     * closed.
+     *
+     * @param outStream an OutputStream to wrap.
+     * @return an OutputStream that wraps the outStream parameter, and adds exif
+     *         metadata. A jpeg image should be written to this stream.
+     */
+    public OutputStream getExifWriterStream(OutputStream outStream) {
+        if (outStream == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        ExifOutputStream eos = new ExifOutputStream(outStream, this);
+        eos.setExifData(mData);
+        return eos;
+    }
+
+    /**
+     * Returns an OutputStream object that writes to a file. Exif tags in this
+     * ExifInterface object will be added to a jpeg image written to this
+     * stream, removing prior exif tags. Other methods of this ExifInterface
+     * object should not be called until the returned OutputStream has been
+     * closed.
+     *
+     * @param exifOutFileName an String containing a filepath for a jpeg file.
+     * @return an OutputStream that writes to the exifOutFileName file, and adds
+     *         exif metadata. A jpeg image should be written to this stream.
+     * @throws FileNotFoundException
+     */
+    public OutputStream getExifWriterStream(String exifOutFileName) throws FileNotFoundException {
+        if (exifOutFileName == null) {
+            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
+        }
+        OutputStream out = null;
+        try {
+            out = new FileOutputStream(exifOutFileName);
+        } catch (FileNotFoundException e) {
+            closeSilently(out);
+            throw e;
+        }
+        return getExifWriterStream(out);
+    }
+
+    /**
+     * Attempts to do an in-place rewrite the exif metadata in a file for the
+     * given tags. If tags do not exist or do not have the same size as the
+     * existing exif tags, this method will fail.
+     *
+     * @param filename a String containing a filepath for a jpeg file with exif
+     *            tags to rewrite.
+     * @param tags tags that will be written into the jpeg file over existing
+     *            tags if possible.
+     * @return true if success, false if could not overwrite. If false, no
+     *         changes are made to the file.
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    public boolean rewriteExif(String filename, Collection<ExifTag> tags)
+            throws FileNotFoundException, IOException {
+        RandomAccessFile file = null;
+        InputStream is = null;
+        boolean ret;
+        try {
+            File temp = new File(filename);
+            is = new BufferedInputStream(new FileInputStream(temp));
+
+            // Parse beginning of APP1 in exif to find size of exif header.
+            ExifParser parser = null;
+            try {
+                parser = ExifParser.parse(is, this);
+            } catch (ExifInvalidFormatException e) {
+                throw new IOException("Invalid exif format : ", e);
+            }
+            long exifSize = parser.getOffsetToExifEndFromSOF();
+
+            // Free up resources
+            is.close();
+            is = null;
+
+            // Open file for memory mapping.
+            file = new RandomAccessFile(temp, "rw");
+            long fileLength = file.length();
+            if (fileLength < exifSize) {
+                throw new IOException("Filesize changed during operation");
+            }
+
+            // Map only exif header into memory.
+            ByteBuffer buf = file.getChannel().map(MapMode.READ_WRITE, 0, exifSize);
+
+            // Attempt to overwrite tag values without changing lengths (avoids
+            // file copy).
+            ret = rewriteExif(buf, tags);
+        } catch (IOException e) {
+            closeSilently(file);
+            throw e;
+        } finally {
+            closeSilently(is);
+        }
+        file.close();
+        return ret;
+    }
+
+    /**
+     * Attempts to do an in-place rewrite the exif metadata in a ByteBuffer for
+     * the given tags. If tags do not exist or do not have the same size as the
+     * existing exif tags, this method will fail.
+     *
+     * @param buf a ByteBuffer containing a jpeg file with existing exif tags to
+     *            rewrite.
+     * @param tags tags that will be written into the jpeg ByteBuffer over
+     *            existing tags if possible.
+     * @return true if success, false if could not overwrite. If false, no
+     *         changes are made to the ByteBuffer.
+     * @throws IOException
+     */
+    public boolean rewriteExif(ByteBuffer buf, Collection<ExifTag> tags) throws IOException {
+        ExifModifier mod = null;
+        try {
+            mod = new ExifModifier(buf, this);
+            for (ExifTag t : tags) {
+                mod.modifyTag(t);
+            }
+            return mod.commit();
+        } catch (ExifInvalidFormatException e) {
+            throw new IOException("Invalid exif format : " + e);
+        }
+    }
+
+    /**
+     * Attempts to do an in-place rewrite of the exif metadata. If this fails,
+     * fall back to overwriting file. This preserves tags that are not being
+     * rewritten.
+     *
+     * @param filename a String containing a filepath for a jpeg file.
+     * @param tags tags that will be written into the jpeg file over existing
+     *            tags if possible.
+     * @throws FileNotFoundException
+     * @throws IOException
+     * @see #rewriteExif
+     */
+    public void forceRewriteExif(String filename, Collection<ExifTag> tags)
+            throws FileNotFoundException,
+            IOException {
+        // Attempt in-place write
+        if (!rewriteExif(filename, tags)) {
+            // Fall back to doing a copy
+            ExifData tempData = mData;
+            mData = new ExifData(DEFAULT_BYTE_ORDER);
+            FileInputStream is = null;
+            ByteArrayOutputStream bytes = null;
+            try {
+                is = new FileInputStream(filename);
+                bytes = new ByteArrayOutputStream();
+                doExifStreamIO(is, bytes);
+                byte[] imageBytes = bytes.toByteArray();
+                readExif(imageBytes);
+                setTags(tags);
+                writeExif(imageBytes, filename);
+            } catch (IOException e) {
+                closeSilently(is);
+                throw e;
+            } finally {
+                is.close();
+                // Prevent clobbering of mData
+                mData = tempData;
+            }
+        }
+    }
+
+    /**
+     * Attempts to do an in-place rewrite of the exif metadata using the tags in
+     * this ExifInterface object. If this fails, fall back to overwriting file.
+     * This preserves tags that are not being rewritten.
+     *
+     * @param filename a String containing a filepath for a jpeg file.
+     * @throws FileNotFoundException
+     * @throws IOException
+     * @see #rewriteExif
+     */
+    public void forceRewriteExif(String filename) throws FileNotFoundException, IOException {
+        forceRewriteExif(filename, getAllTags());
+    }
+
+    /**
+     * Get the exif tags in this ExifInterface object or null if none exist.
+     *
+     * @return a List of {@link ExifTag}s.
+     */
+    public List<ExifTag> getAllTags() {
+        return mData.getAllTags();
+    }
+
+    /**
+     * Returns a list of ExifTags that share a TID (which can be obtained by
+     * calling {@link #getTrueTagKey} on a defined tag constant) or null if none
+     * exist.
+     *
+     * @param tagId a TID as defined in the exif standard (or with
+     *            {@link #defineTag}).
+     * @return a List of {@link ExifTag}s.
+     */
+    public List<ExifTag> getTagsForTagId(short tagId) {
+        return mData.getAllTagsForTagId(tagId);
+    }
+
+    /**
+     * Returns a list of ExifTags that share an IFD (which can be obtained by
+     * calling {@link #getTrueIFD} on a defined tag constant) or null if none
+     * exist.
+     *
+     * @param ifdId an IFD as defined in the exif standard (or with
+     *            {@link #defineTag}).
+     * @return a List of {@link ExifTag}s.
+     */
+    public List<ExifTag> getTagsForIfdId(int ifdId) {
+        return mData.getAllTagsForIfd(ifdId);
+    }
+
+    /**
+     * Gets an ExifTag for an IFD other than the tag's default.
+     *
+     * @see #getTag
+     */
+    public ExifTag getTag(int tagId, int ifdId) {
+        if (!ExifTag.isValidIfd(ifdId)) {
+            return null;
+        }
+        return mData.getTag(getTrueTagKey(tagId), ifdId);
+    }
+
+    /**
+     * Returns the ExifTag in that tag's default IFD for a defined tag constant
+     * or null if none exists.
+     *
+     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @return an {@link ExifTag} or null if none exists.
+     */
+    public ExifTag getTag(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTag(tagId, ifdId);
+    }
+
+    /**
+     * Gets a tag value for an IFD other than the tag's default.
+     *
+     * @see #getTagValue
+     */
+    public Object getTagValue(int tagId, int ifdId) {
+        ExifTag t = getTag(tagId, ifdId);
+        return (t == null) ? null : t.getValue();
+    }
+
+    /**
+     * Returns the value of the ExifTag in that tag's default IFD for a defined
+     * tag constant or null if none exists or the value could not be cast into
+     * the return type.
+     *
+     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @return the value of the ExifTag or null if none exists.
+     */
+    public Object getTagValue(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTagValue(tagId, ifdId);
+    }
+
+    /*
+     * Getter methods that are similar to getTagValue. Null is returned if the
+     * tag value cannot be cast into the return type.
+     */
+
+    /**
+     * @see #getTagValue
+     */
+    public String getTagStringValue(int tagId, int ifdId) {
+        ExifTag t = getTag(tagId, ifdId);
+        if (t == null) {
+            return null;
+        }
+        return t.getValueAsString();
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public String getTagStringValue(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTagStringValue(tagId, ifdId);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public Long getTagLongValue(int tagId, int ifdId) {
+        long[] l = getTagLongValues(tagId, ifdId);
+        if (l == null || l.length <= 0) {
+            return null;
+        }
+        return new Long(l[0]);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public Long getTagLongValue(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTagLongValue(tagId, ifdId);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public Integer getTagIntValue(int tagId, int ifdId) {
+        int[] l = getTagIntValues(tagId, ifdId);
+        if (l == null || l.length <= 0) {
+            return null;
+        }
+        return new Integer(l[0]);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public Integer getTagIntValue(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTagIntValue(tagId, ifdId);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public Byte getTagByteValue(int tagId, int ifdId) {
+        byte[] l = getTagByteValues(tagId, ifdId);
+        if (l == null || l.length <= 0) {
+            return null;
+        }
+        return new Byte(l[0]);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public Byte getTagByteValue(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTagByteValue(tagId, ifdId);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public Rational getTagRationalValue(int tagId, int ifdId) {
+        Rational[] l = getTagRationalValues(tagId, ifdId);
+        if (l == null || l.length == 0) {
+            return null;
+        }
+        return new Rational(l[0]);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public Rational getTagRationalValue(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTagRationalValue(tagId, ifdId);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public long[] getTagLongValues(int tagId, int ifdId) {
+        ExifTag t = getTag(tagId, ifdId);
+        if (t == null) {
+            return null;
+        }
+        return t.getValueAsLongs();
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public long[] getTagLongValues(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTagLongValues(tagId, ifdId);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public int[] getTagIntValues(int tagId, int ifdId) {
+        ExifTag t = getTag(tagId, ifdId);
+        if (t == null) {
+            return null;
+        }
+        return t.getValueAsInts();
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public int[] getTagIntValues(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTagIntValues(tagId, ifdId);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public byte[] getTagByteValues(int tagId, int ifdId) {
+        ExifTag t = getTag(tagId, ifdId);
+        if (t == null) {
+            return null;
+        }
+        return t.getValueAsBytes();
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public byte[] getTagByteValues(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTagByteValues(tagId, ifdId);
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public Rational[] getTagRationalValues(int tagId, int ifdId) {
+        ExifTag t = getTag(tagId, ifdId);
+        if (t == null) {
+            return null;
+        }
+        return t.getValueAsRationals();
+    }
+
+    /**
+     * @see #getTagValue
+     */
+    public Rational[] getTagRationalValues(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return getTagRationalValues(tagId, ifdId);
+    }
+
+    /**
+     * Checks whether a tag has a defined number of elements.
+     *
+     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @return true if the tag has a defined number of elements.
+     */
+    public boolean isTagCountDefined(int tagId) {
+        int info = getTagInfo().get(tagId);
+        // No value in info can be zero, as all tags have a non-zero type
+        if (info == 0) {
+            return false;
+        }
+        return getComponentCountFromInfo(info) != ExifTag.SIZE_UNDEFINED;
+    }
+
+    /**
+     * Gets the defined number of elements for a tag.
+     *
+     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @return the number of elements or {@link ExifTag#SIZE_UNDEFINED} if the
+     *         tag or the number of elements is not defined.
+     */
+    public int getDefinedTagCount(int tagId) {
+        int info = getTagInfo().get(tagId);
+        if (info == 0) {
+            return ExifTag.SIZE_UNDEFINED;
+        }
+        return getComponentCountFromInfo(info);
+    }
+
+    /**
+     * Gets the number of elements for an ExifTag in a given IFD.
+     *
+     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @param ifdId the IFD containing the ExifTag to check.
+     * @return the number of elements in the ExifTag, if the tag's size is
+     *         undefined this will return the actual number of elements that is
+     *         in the ExifTag's value.
+     */
+    public int getActualTagCount(int tagId, int ifdId) {
+        ExifTag t = getTag(tagId, ifdId);
+        if (t == null) {
+            return 0;
+        }
+        return t.getComponentCount();
+    }
+
+    /**
+     * Gets the default IFD for a tag.
+     *
+     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @return the default IFD for a tag definition or {@link #IFD_NULL} if no
+     *         definition exists.
+     */
+    public int getDefinedTagDefaultIfd(int tagId) {
+        int info = getTagInfo().get(tagId);
+        if (info == DEFINITION_NULL) {
+            return IFD_NULL;
+        }
+        return getTrueIfd(tagId);
+    }
+
+    /**
+     * Gets the defined type for a tag.
+     *
+     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @return the type.
+     * @see ExifTag#getDataType()
+     */
+    public short getDefinedTagType(int tagId) {
+        int info = getTagInfo().get(tagId);
+        if (info == 0) {
+            return -1;
+        }
+        return getTypeFromInfo(info);
+    }
+
+    /**
+     * Returns true if tag TID is one of the following: {@link TAG_EXIF_IFD},
+     * {@link TAG_GPS_IFD}, {@link TAG_JPEG_INTERCHANGE_FORMAT},
+     * {@link TAG_STRIP_OFFSETS}, {@link TAG_INTEROPERABILITY_IFD}
+     * <p>
+     * Note: defining tags with these TID's is disallowed.
+     *
+     * @param tag a tag's TID (can be obtained from a defined tag constant with
+     *            {@link #getTrueTagKey}).
+     * @return true if the TID is that of an offset tag.
+     */
+    protected static boolean isOffsetTag(short tag) {
+        return sOffsetTags.contains(tag);
+    }
+
+    /**
+     * Creates a tag for a defined tag constant in a given IFD if that IFD is
+     * allowed for the tag.  This method will fail anytime the appropriate
+     * {@link ExifTag#setValue} for this tag's datatype would fail.
+     *
+     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @param ifdId the IFD that the tag should be in.
+     * @param val the value of the tag to set.
+     * @return an ExifTag object or null if one could not be constructed.
+     * @see #buildTag
+     */
+    public ExifTag buildTag(int tagId, int ifdId, Object val) {
+        int info = getTagInfo().get(tagId);
+        if (info == 0 || val == null) {
+            return null;
+        }
+        short type = getTypeFromInfo(info);
+        int definedCount = getComponentCountFromInfo(info);
+        boolean hasDefinedCount = (definedCount != ExifTag.SIZE_UNDEFINED);
+        if (!ExifInterface.isIfdAllowed(info, ifdId)) {
+            return null;
+        }
+        ExifTag t = new ExifTag(getTrueTagKey(tagId), type, definedCount, ifdId, hasDefinedCount);
+        if (!t.setValue(val)) {
+            return null;
+        }
+        return t;
+    }
+
+    /**
+     * Creates a tag for a defined tag constant in the tag's default IFD.
+     *
+     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @param val the tag's value.
+     * @return an ExifTag object.
+     */
+    public ExifTag buildTag(int tagId, Object val) {
+        int ifdId = getTrueIfd(tagId);
+        return buildTag(tagId, ifdId, val);
+    }
+
+    protected ExifTag buildUninitializedTag(int tagId) {
+        int info = getTagInfo().get(tagId);
+        if (info == 0) {
+            return null;
+        }
+        short type = getTypeFromInfo(info);
+        int definedCount = getComponentCountFromInfo(info);
+        boolean hasDefinedCount = (definedCount != ExifTag.SIZE_UNDEFINED);
+        int ifdId = getTrueIfd(tagId);
+        ExifTag t = new ExifTag(getTrueTagKey(tagId), type, definedCount, ifdId, hasDefinedCount);
+        return t;
+    }
+
+    /**
+     * Sets the value of an ExifTag if it exists in the given IFD. The value
+     * must be the correct type and length for that ExifTag.
+     *
+     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @param ifdId the IFD that the ExifTag is in.
+     * @param val the value to set.
+     * @return true if success, false if the ExifTag doesn't exist or the value
+     *         is the wrong type/length.
+     * @see #setTagValue
+     */
+    public boolean setTagValue(int tagId, int ifdId, Object val) {
+        ExifTag t = getTag(tagId, ifdId);
+        if (t == null) {
+            return false;
+        }
+        return t.setValue(val);
+    }
+
+    /**
+     * Sets the value of an ExifTag if it exists it's default IFD. The value
+     * must be the correct type and length for that ExifTag.
+     *
+     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @param val the value to set.
+     * @return true if success, false if the ExifTag doesn't exist or the value
+     *         is the wrong type/length.
+     */
+    public boolean setTagValue(int tagId, Object val) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        return setTagValue(tagId, ifdId, val);
+    }
+
+    /**
+     * Puts an ExifTag into this ExifInterface object's tags, removing a
+     * previous ExifTag with the same TID and IFD. The IFD it is put into will
+     * be the one the tag was created with in {@link #buildTag}.
+     *
+     * @param tag an ExifTag to put into this ExifInterface's tags.
+     * @return the previous ExifTag with the same TID and IFD or null if none
+     *         exists.
+     */
+    public ExifTag setTag(ExifTag tag) {
+        return mData.addTag(tag);
+    }
+
+    /**
+     * Puts a collection of ExifTags into this ExifInterface objects's tags. Any
+     * previous ExifTags with the same TID and IFDs will be removed.
+     *
+     * @param tags a Collection of ExifTags.
+     * @see #setTag
+     */
+    public void setTags(Collection<ExifTag> tags) {
+        for (ExifTag t : tags) {
+            setTag(t);
+        }
+    }
+
+    /**
+     * Removes the ExifTag for a tag constant from the given IFD.
+     *
+     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     * @param ifdId the IFD of the ExifTag to remove.
+     */
+    public void deleteTag(int tagId, int ifdId) {
+        mData.removeTag(getTrueTagKey(tagId), ifdId);
+    }
+
+    /**
+     * Removes the ExifTag for a tag constant from that tag's default IFD.
+     *
+     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     */
+    public void deleteTag(int tagId) {
+        int ifdId = getDefinedTagDefaultIfd(tagId);
+        deleteTag(tagId, ifdId);
+    }
+
+    /**
+     * Creates a new tag definition in this ExifInterface object for a given TID
+     * and default IFD. Creating a definition with the same TID and default IFD
+     * as a previous definition will override it.
+     *
+     * @param tagId the TID for the tag.
+     * @param defaultIfd the default IFD for the tag.
+     * @param tagType the type of the tag (see {@link ExifTag#getDataType()}).
+     * @param defaultComponentCount the number of elements of this tag's type in
+     *            the tags value.
+     * @param allowedIfds the IFD's this tag is allowed to be put in.
+     * @return the defined tag constant (e.g. {@link #TAG_IMAGE_WIDTH}) or
+     *         {@link #TAG_NULL} if the definition could not be made.
+     */
+    public int setTagDefinition(short tagId, int defaultIfd, short tagType,
+            short defaultComponentCount, int[] allowedIfds) {
+        if (sBannedDefines.contains(tagId)) {
+            return TAG_NULL;
+        }
+        if (ExifTag.isValidType(tagType) && ExifTag.isValidIfd(defaultIfd)) {
+            int tagDef = defineTag(defaultIfd, tagId);
+            if (tagDef == TAG_NULL) {
+                return TAG_NULL;
+            }
+            int[] otherDefs = getTagDefinitionsForTagId(tagId);
+            SparseIntArray infos = getTagInfo();
+            // Make sure defaultIfd is in allowedIfds
+            boolean defaultCheck = false;
+            for (int i : allowedIfds) {
+                if (defaultIfd == i) {
+                    defaultCheck = true;
+                }
+                if (!ExifTag.isValidIfd(i)) {
+                    return TAG_NULL;
+                }
+            }
+            if (!defaultCheck) {
+                return TAG_NULL;
+            }
+
+            int ifdFlags = getFlagsFromAllowedIfds(allowedIfds);
+            // Make sure no identical tags can exist in allowedIfds
+            if (otherDefs != null) {
+                for (int def : otherDefs) {
+                    int tagInfo = infos.get(def);
+                    int allowedFlags = getAllowedIfdFlagsFromInfo(tagInfo);
+                    if ((ifdFlags & allowedFlags) != 0) {
+                        return TAG_NULL;
+                    }
+                }
+            }
+            getTagInfo().put(tagDef, ifdFlags << 24 | (tagType << 16) | defaultComponentCount);
+            return tagDef;
+        }
+        return TAG_NULL;
+    }
+
+    protected int getTagDefinition(short tagId, int defaultIfd) {
+        return getTagInfo().get(defineTag(defaultIfd, tagId));
+    }
+
+    protected int[] getTagDefinitionsForTagId(short tagId) {
+        int[] ifds = IfdData.getIfds();
+        int[] defs = new int[ifds.length];
+        int counter = 0;
+        SparseIntArray infos = getTagInfo();
+        for (int i : ifds) {
+            int def = defineTag(i, tagId);
+            if (infos.get(def) != DEFINITION_NULL) {
+                defs[counter++] = def;
+            }
+        }
+        if (counter == 0) {
+            return null;
+        }
+
+        return Arrays.copyOfRange(defs, 0, counter);
+    }
+
+    protected int getTagDefinitionForTag(ExifTag tag) {
+        short type = tag.getDataType();
+        int count = tag.getComponentCount();
+        int ifd = tag.getIfd();
+        return getTagDefinitionForTag(tag.getTagId(), type, count, ifd);
+    }
+
+    protected int getTagDefinitionForTag(short tagId, short type, int count, int ifd) {
+        int[] defs = getTagDefinitionsForTagId(tagId);
+        if (defs == null) {
+            return TAG_NULL;
+        }
+        SparseIntArray infos = getTagInfo();
+        int ret = TAG_NULL;
+        for (int i : defs) {
+            int info = infos.get(i);
+            short def_type = getTypeFromInfo(info);
+            int def_count = getComponentCountFromInfo(info);
+            int[] def_ifds = getAllowedIfdsFromInfo(info);
+            boolean valid_ifd = false;
+            for (int j : def_ifds) {
+                if (j == ifd) {
+                    valid_ifd = true;
+                    break;
+                }
+            }
+            if (valid_ifd && type == def_type
+                    && (count == def_count || def_count == ExifTag.SIZE_UNDEFINED)) {
+                ret = i;
+                break;
+            }
+        }
+        return ret;
+    }
+
+    /**
+     * Removes a tag definition for given defined tag constant.
+     *
+     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
+     */
+    public void removeTagDefinition(int tagId) {
+        getTagInfo().delete(tagId);
+    }
+
+    /**
+     * Resets tag definitions to the default ones.
+     */
+    public void resetTagDefinitions() {
+        mTagInfo = null;
+    }
+
+    /**
+     * Returns the thumbnail from IFD1 as a bitmap, or null if none exists.
+     *
+     * @return the thumbnail as a bitmap.
+     */
+    public Bitmap getThumbnailBitmap() {
+        if (mData.hasCompressedThumbnail()) {
+            byte[] thumb = mData.getCompressedThumbnail();
+            return BitmapFactory.decodeByteArray(thumb, 0, thumb.length);
+        } else if (mData.hasUncompressedStrip()) {
+            // TODO: implement uncompressed
+        }
+        return null;
+    }
+
+    /**
+     * Returns the thumbnail from IFD1 as a byte array, or null if none exists.
+     * The bytes may either be an uncompressed strip as specified in the exif
+     * standard or a jpeg compressed image.
+     *
+     * @return the thumbnail as a byte array.
+     */
+    public byte[] getThumbnailBytes() {
+        if (mData.hasCompressedThumbnail()) {
+            return mData.getCompressedThumbnail();
+        } else if (mData.hasUncompressedStrip()) {
+            // TODO: implement this
+        }
+        return null;
+    }
+
+    /**
+     * Returns the thumbnail if it is jpeg compressed, or null if none exists.
+     *
+     * @return the thumbnail as a byte array.
+     */
+    public byte[] getThumbnail() {
+        return mData.getCompressedThumbnail();
+    }
+
+    /**
+     * Check if thumbnail is compressed.
+     *
+     * @return true if the thumbnail is compressed.
+     */
+    public boolean isThumbnailCompressed() {
+        return mData.hasCompressedThumbnail();
+    }
+
+    /**
+     * Check if thumbnail exists.
+     *
+     * @return true if a compressed thumbnail exists.
+     */
+    public boolean hasThumbnail() {
+        // TODO: add back in uncompressed strip
+        return mData.hasCompressedThumbnail();
+    }
+
+    // TODO: uncompressed thumbnail setters
+
+    /**
+     * Sets the thumbnail to be a jpeg compressed image. Clears any prior
+     * thumbnail.
+     *
+     * @param thumb a byte array containing a jpeg compressed image.
+     * @return true if the thumbnail was set.
+     */
+    public boolean setCompressedThumbnail(byte[] thumb) {
+        mData.clearThumbnailAndStrips();
+        mData.setCompressedThumbnail(thumb);
+        return true;
+    }
+
+    /**
+     * Sets the thumbnail to be a jpeg compressed bitmap. Clears any prior
+     * thumbnail.
+     *
+     * @param thumb a bitmap to compress to a jpeg thumbnail.
+     * @return true if the thumbnail was set.
+     */
+    public boolean setCompressedThumbnail(Bitmap thumb) {
+        ByteArrayOutputStream thumbnail = new ByteArrayOutputStream();
+        if (!thumb.compress(Bitmap.CompressFormat.JPEG, 90, thumbnail)) {
+            return false;
+        }
+        return setCompressedThumbnail(thumbnail.toByteArray());
+    }
+
+    /**
+     * Clears the compressed thumbnail if it exists.
+     */
+    public void removeCompressedThumbnail() {
+        mData.setCompressedThumbnail(null);
+    }
+
+    // Convenience methods:
+
+    /**
+     * Decodes the user comment tag into string as specified in the EXIF
+     * standard. Returns null if decoding failed.
+     */
+    public String getUserComment() {
+        return mData.getUserComment();
+    }
+
+    /**
+     * Returns the Orientation ExifTag value for a given number of degrees.
+     *
+     * @param degrees the amount an image is rotated in degrees.
+     */
+    public static short getOrientationValueForRotation(int degrees) {
+        degrees %= 360;
+        if (degrees < 0) {
+            degrees += 360;
+        }
+        if (degrees < 90) {
+            return Orientation.TOP_LEFT; // 0 degrees
+        } else if (degrees < 180) {
+            return Orientation.RIGHT_TOP; // 90 degrees cw
+        } else if (degrees < 270) {
+            return Orientation.BOTTOM_LEFT; // 180 degrees
+        } else {
+            return Orientation.RIGHT_BOTTOM; // 270 degrees cw
+        }
+    }
+
+    /**
+     * Returns the rotation degrees corresponding to an ExifTag Orientation
+     * value.
+     *
+     * @param orientation the ExifTag Orientation value.
+     */
+    public static int getRotationForOrientationValue(short orientation) {
+        switch (orientation) {
+            case Orientation.TOP_LEFT:
+                return 0;
+            case Orientation.RIGHT_TOP:
+                return 90;
+            case Orientation.BOTTOM_LEFT:
+                return 180;
+            case Orientation.RIGHT_BOTTOM:
+                return 270;
+            default:
+                return 0;
+        }
+    }
+
+    /**
+     * Gets the double representation of the GPS latitude or longitude
+     * coordinate.
+     *
+     * @param coordinate an array of 3 Rationals representing the degrees,
+     *            minutes, and seconds of the GPS location as defined in the
+     *            exif specification.
+     * @param reference a GPS reference reperesented by a String containing "N",
+     *            "S", "E", or "W".
+     * @return the GPS coordinate represented as degrees + minutes/60 +
+     *         seconds/3600
+     */
+    public static double convertLatOrLongToDouble(Rational[] coordinate, String reference) {
+        try {
+            double degrees = coordinate[0].toDouble();
+            double minutes = coordinate[1].toDouble();
+            double seconds = coordinate[2].toDouble();
+            double result = degrees + minutes / 60.0 + seconds / 3600.0;
+            if ((reference.equals("S") || reference.equals("W"))) {
+                return -result;
+            }
+            return result;
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    /**
+     * Gets the GPS latitude and longitude as a pair of doubles from this
+     * ExifInterface object's tags, or null if the necessary tags do not exist.
+     *
+     * @return an array of 2 doubles containing the latitude, and longitude
+     *         respectively.
+     * @see #convertLatOrLongToDouble
+     */
+    public double[] getLatLongAsDoubles() {
+        Rational[] latitude = getTagRationalValues(TAG_GPS_LATITUDE);
+        String latitudeRef = getTagStringValue(TAG_GPS_LATITUDE_REF);
+        Rational[] longitude = getTagRationalValues(TAG_GPS_LONGITUDE);
+        String longitudeRef = getTagStringValue(TAG_GPS_LONGITUDE_REF);
+        if (latitude == null || longitude == null || latitudeRef == null || longitudeRef == null
+                || latitude.length < 3 || longitude.length < 3) {
+            return null;
+        }
+        double[] latLon = new double[2];
+        latLon[0] = convertLatOrLongToDouble(latitude, latitudeRef);
+        latLon[1] = convertLatOrLongToDouble(longitude, longitudeRef);
+        return latLon;
+    }
+
+    private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd";
+    private static final String DATETIME_FORMAT_STR = "yyyy:MM:dd kk:mm:ss";
+    private final DateFormat mDateTimeStampFormat = new SimpleDateFormat(DATETIME_FORMAT_STR);
+    private final DateFormat mGPSDateStampFormat = new SimpleDateFormat(GPS_DATE_FORMAT_STR);
+    private final Calendar mGPSTimeStampCalendar = Calendar
+            .getInstance(TimeZone.getTimeZone("UTC"));
+
+    /**
+     * Creates, formats, and sets the DateTimeStamp tag for one of:
+     * {@link #TAG_DATE_TIME}, {@link #TAG_DATE_TIME_DIGITIZED},
+     * {@link #TAG_DATE_TIME_ORIGINAL}.
+     *
+     * @param tagId one of the DateTimeStamp tags.
+     * @param timestamp a timestamp to format.
+     * @param timezone a TimeZone object.
+     * @return true if success, false if the tag could not be set.
+     */
+    public boolean addDateTimeStampTag(int tagId, long timestamp, TimeZone timezone) {
+        if (tagId == TAG_DATE_TIME || tagId == TAG_DATE_TIME_DIGITIZED
+                || tagId == TAG_DATE_TIME_ORIGINAL) {
+            mDateTimeStampFormat.setTimeZone(timezone);
+            ExifTag t = buildTag(tagId, mDateTimeStampFormat.format(timestamp));
+            if (t == null) {
+                return false;
+            }
+            setTag(t);
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Creates and sets all to the GPS tags for a give latitude and longitude.
+     *
+     * @param latitude a GPS latitude coordinate.
+     * @param longitude a GPS longitude coordinate.
+     * @return true if success, false if they could not be created or set.
+     */
+    public boolean addGpsTags(double latitude, double longitude) {
+        ExifTag latTag = buildTag(TAG_GPS_LATITUDE, toExifLatLong(latitude));
+        ExifTag longTag = buildTag(TAG_GPS_LONGITUDE, toExifLatLong(longitude));
+        ExifTag latRefTag = buildTag(TAG_GPS_LATITUDE_REF,
+                latitude >= 0 ? GpsLatitudeRef.NORTH
+                        : GpsLatitudeRef.SOUTH);
+        ExifTag longRefTag = buildTag(TAG_GPS_LONGITUDE_REF,
+                longitude >= 0 ? GpsLongitudeRef.EAST
+                        : GpsLongitudeRef.WEST);
+        if (latTag == null || longTag == null || latRefTag == null || longRefTag == null) {
+            return false;
+        }
+        setTag(latTag);
+        setTag(longTag);
+        setTag(latRefTag);
+        setTag(longRefTag);
+        return true;
+    }
+
+    /**
+     * Creates and sets the GPS timestamp tag.
+     *
+     * @param timestamp a GPS timestamp.
+     * @return true if success, false if could not be created or set.
+     */
+    public boolean addGpsDateTimeStampTag(long timestamp) {
+        ExifTag t = buildTag(TAG_GPS_DATE_STAMP, mGPSDateStampFormat.format(timestamp));
+        if (t == null) {
+            return false;
+        }
+        setTag(t);
+        mGPSTimeStampCalendar.setTimeInMillis(timestamp);
+        t = buildTag(TAG_GPS_TIME_STAMP, new Rational[] {
+                new Rational(mGPSTimeStampCalendar.get(Calendar.HOUR_OF_DAY), 1),
+                new Rational(mGPSTimeStampCalendar.get(Calendar.MINUTE), 1),
+                new Rational(mGPSTimeStampCalendar.get(Calendar.SECOND), 1)
+        });
+        if (t == null) {
+            return false;
+        }
+        setTag(t);
+        return true;
+    }
+
+    private static Rational[] toExifLatLong(double value) {
+        // convert to the format dd/1 mm/1 ssss/100
+        value = Math.abs(value);
+        int degrees = (int) value;
+        value = (value - degrees) * 60;
+        int minutes = (int) value;
+        value = (value - minutes) * 6000;
+        int seconds = (int) value;
+        return new Rational[] {
+                new Rational(degrees, 1), new Rational(minutes, 1), new Rational(seconds, 100)
+        };
+    }
+
+    private void doExifStreamIO(InputStream is, OutputStream os) throws IOException {
+        byte[] buf = new byte[1024];
+        int ret = is.read(buf, 0, 1024);
+        while (ret != -1) {
+            os.write(buf, 0, ret);
+            ret = is.read(buf, 0, 1024);
+        }
+    }
+
+    protected static void closeSilently(Closeable c) {
+        if (c != null) {
+            try {
+                c.close();
+            } catch (Throwable e) {
+                // ignored
+            }
+        }
+    }
+
+    private SparseIntArray mTagInfo = null;
+
+    protected SparseIntArray getTagInfo() {
+        if (mTagInfo == null) {
+            mTagInfo = new SparseIntArray();
+            initTagInfo();
+        }
+        return mTagInfo;
+    }
+
+    private void initTagInfo() {
+        /**
+         * We put tag information in a 4-bytes integer. The first byte a bitmask
+         * representing the allowed IFDs of the tag, the second byte is the data
+         * type, and the last two byte are a short value indicating the default
+         * component count of this tag.
+         */
+        // IFD0 tags
+        int[] ifdAllowedIfds = {
+                IfdId.TYPE_IFD_0, IfdId.TYPE_IFD_1
+        };
+        int ifdFlags = getFlagsFromAllowedIfds(ifdAllowedIfds) << 24;
+        mTagInfo.put(ExifInterface.TAG_MAKE,
+                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_IMAGE_WIDTH,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_IMAGE_LENGTH,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_BITS_PER_SAMPLE,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 3);
+        mTagInfo.put(ExifInterface.TAG_COMPRESSION,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_PHOTOMETRIC_INTERPRETATION,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_ORIENTATION, ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16
+                | 1);
+        mTagInfo.put(ExifInterface.TAG_SAMPLES_PER_PIXEL,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_PLANAR_CONFIGURATION,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_Y_CB_CR_SUB_SAMPLING,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_Y_CB_CR_POSITIONING,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_X_RESOLUTION,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_Y_RESOLUTION,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_RESOLUTION_UNIT,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_STRIP_OFFSETS,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_ROWS_PER_STRIP,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_STRIP_BYTE_COUNTS,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_TRANSFER_FUNCTION,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 3 * 256);
+        mTagInfo.put(ExifInterface.TAG_WHITE_POINT,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_PRIMARY_CHROMATICITIES,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 6);
+        mTagInfo.put(ExifInterface.TAG_Y_CB_CR_COEFFICIENTS,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 3);
+        mTagInfo.put(ExifInterface.TAG_REFERENCE_BLACK_WHITE,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 6);
+        mTagInfo.put(ExifInterface.TAG_DATE_TIME,
+                ifdFlags | ExifTag.TYPE_ASCII << 16 | 20);
+        mTagInfo.put(ExifInterface.TAG_IMAGE_DESCRIPTION,
+                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_MAKE,
+                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_MODEL,
+                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_SOFTWARE,
+                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_ARTIST,
+                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_COPYRIGHT,
+                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_EXIF_IFD,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GPS_IFD,
+                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
+        // IFD1 tags
+        int[] ifd1AllowedIfds = {
+            IfdId.TYPE_IFD_1
+        };
+        int ifdFlags1 = getFlagsFromAllowedIfds(ifd1AllowedIfds) << 24;
+        mTagInfo.put(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT,
+                ifdFlags1 | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,
+                ifdFlags1 | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
+        // Exif tags
+        int[] exifAllowedIfds = {
+            IfdId.TYPE_IFD_EXIF
+        };
+        int exifFlags = getFlagsFromAllowedIfds(exifAllowedIfds) << 24;
+        mTagInfo.put(ExifInterface.TAG_EXIF_VERSION,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | 4);
+        mTagInfo.put(ExifInterface.TAG_FLASHPIX_VERSION,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | 4);
+        mTagInfo.put(ExifInterface.TAG_COLOR_SPACE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_COMPONENTS_CONFIGURATION,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | 4);
+        mTagInfo.put(ExifInterface.TAG_COMPRESSED_BITS_PER_PIXEL,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_PIXEL_X_DIMENSION,
+                exifFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_PIXEL_Y_DIMENSION,
+                exifFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_MAKER_NOTE,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_USER_COMMENT,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_RELATED_SOUND_FILE,
+                exifFlags | ExifTag.TYPE_ASCII << 16 | 13);
+        mTagInfo.put(ExifInterface.TAG_DATE_TIME_ORIGINAL,
+                exifFlags | ExifTag.TYPE_ASCII << 16 | 20);
+        mTagInfo.put(ExifInterface.TAG_DATE_TIME_DIGITIZED,
+                exifFlags | ExifTag.TYPE_ASCII << 16 | 20);
+        mTagInfo.put(ExifInterface.TAG_SUB_SEC_TIME,
+                exifFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_SUB_SEC_TIME_ORIGINAL,
+                exifFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_SUB_SEC_TIME_DIGITIZED,
+                exifFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_IMAGE_UNIQUE_ID,
+                exifFlags | ExifTag.TYPE_ASCII << 16 | 33);
+        mTagInfo.put(ExifInterface.TAG_EXPOSURE_TIME,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_F_NUMBER,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_EXPOSURE_PROGRAM,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_SPECTRAL_SENSITIVITY,
+                exifFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_ISO_SPEED_RATINGS,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_OECF,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_SHUTTER_SPEED_VALUE,
+                exifFlags | ExifTag.TYPE_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_APERTURE_VALUE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_BRIGHTNESS_VALUE,
+                exifFlags | ExifTag.TYPE_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_EXPOSURE_BIAS_VALUE,
+                exifFlags | ExifTag.TYPE_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_MAX_APERTURE_VALUE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_SUBJECT_DISTANCE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_METERING_MODE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_LIGHT_SOURCE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_FLASH,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_FOCAL_LENGTH,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_SUBJECT_AREA,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_FLASH_ENERGY,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_SPATIAL_FREQUENCY_RESPONSE,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_FOCAL_PLANE_X_RESOLUTION,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_FOCAL_PLANE_Y_RESOLUTION,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_FOCAL_PLANE_RESOLUTION_UNIT,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_SUBJECT_LOCATION,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_EXPOSURE_INDEX,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_SENSING_METHOD,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_FILE_SOURCE,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_SCENE_TYPE,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_CFA_PATTERN,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_CUSTOM_RENDERED,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_EXPOSURE_MODE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_WHITE_BALANCE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_DIGITAL_ZOOM_RATIO,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_FOCAL_LENGTH_IN_35_MM_FILE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_SCENE_CAPTURE_TYPE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GAIN_CONTROL,
+                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_CONTRAST,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_SATURATION,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_SHARPNESS,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_DEVICE_SETTING_DESCRIPTION,
+                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_SUBJECT_DISTANCE_RANGE,
+                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_INTEROPERABILITY_IFD, exifFlags
+                | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
+        // GPS tag
+        int[] gpsAllowedIfds = {
+            IfdId.TYPE_IFD_GPS
+        };
+        int gpsFlags = getFlagsFromAllowedIfds(gpsAllowedIfds) << 24;
+        mTagInfo.put(ExifInterface.TAG_GPS_VERSION_ID,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_BYTE << 16 | 4);
+        mTagInfo.put(ExifInterface.TAG_GPS_LATITUDE_REF,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_GPS_LONGITUDE_REF,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_GPS_LATITUDE,
+                gpsFlags | ExifTag.TYPE_RATIONAL << 16 | 3);
+        mTagInfo.put(ExifInterface.TAG_GPS_LONGITUDE,
+                gpsFlags | ExifTag.TYPE_RATIONAL << 16 | 3);
+        mTagInfo.put(ExifInterface.TAG_GPS_ALTITUDE_REF,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_BYTE << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GPS_ALTITUDE,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GPS_TIME_STAMP,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 3);
+        mTagInfo.put(ExifInterface.TAG_GPS_SATTELLITES,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_GPS_STATUS,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_GPS_MEASURE_MODE,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_GPS_DOP,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GPS_SPEED_REF,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_GPS_SPEED,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GPS_TRACK_REF,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_GPS_TRACK,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GPS_IMG_DIRECTION_REF,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_GPS_IMG_DIRECTION,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GPS_MAP_DATUM,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_GPS_DEST_LATITUDE_REF,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_GPS_DEST_LATITUDE,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GPS_DEST_BEARING_REF,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_GPS_DEST_BEARING,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GPS_DEST_DISTANCE_REF,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
+        mTagInfo.put(ExifInterface.TAG_GPS_DEST_DISTANCE,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
+        mTagInfo.put(ExifInterface.TAG_GPS_PROCESSING_METHOD,
+                gpsFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_GPS_AREA_INFORMATION,
+                gpsFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
+        mTagInfo.put(ExifInterface.TAG_GPS_DATE_STAMP,
+                gpsFlags | ExifTag.TYPE_ASCII << 16 | 11);
+        mTagInfo.put(ExifInterface.TAG_GPS_DIFFERENTIAL,
+                gpsFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 11);
+        // Interoperability tag
+        int[] interopAllowedIfds = {
+            IfdId.TYPE_IFD_INTEROPERABILITY
+        };
+        int interopFlags = getFlagsFromAllowedIfds(interopAllowedIfds) << 24;
+        mTagInfo.put(TAG_INTEROPERABILITY_INDEX, interopFlags | ExifTag.TYPE_ASCII << 16
+                | ExifTag.SIZE_UNDEFINED);
+    }
+
+    protected static int getAllowedIfdFlagsFromInfo(int info) {
+        return info >>> 24;
+    }
+
+    protected static int[] getAllowedIfdsFromInfo(int info) {
+        int ifdFlags = getAllowedIfdFlagsFromInfo(info);
+        int[] ifds = IfdData.getIfds();
+        ArrayList<Integer> l = new ArrayList<Integer>();
+        for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) {
+            int flag = (ifdFlags >> i) & 1;
+            if (flag == 1) {
+                l.add(ifds[i]);
+            }
+        }
+        if (l.size() <= 0) {
+            return null;
+        }
+        int[] ret = new int[l.size()];
+        int j = 0;
+        for (int i : l) {
+            ret[j++] = i;
+        }
+        return ret;
+    }
+
+    protected static boolean isIfdAllowed(int info, int ifd) {
+        int[] ifds = IfdData.getIfds();
+        int ifdFlags = getAllowedIfdFlagsFromInfo(info);
+        for (int i = 0; i < ifds.length; i++) {
+            if (ifd == ifds[i] && ((ifdFlags >> i) & 1) == 1) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected static int getFlagsFromAllowedIfds(int[] allowedIfds) {
+        if (allowedIfds == null || allowedIfds.length == 0) {
+            return 0;
+        }
+        int flags = 0;
+        int[] ifds = IfdData.getIfds();
+        for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) {
+            for (int j : allowedIfds) {
+                if (ifds[i] == j) {
+                    flags |= 1 << i;
+                    break;
+                }
+            }
+        }
+        return flags;
+    }
+
+    protected static short getTypeFromInfo(int info) {
+        return (short) ((info >> 16) & 0x0ff);
+    }
+
+    protected static int getComponentCountFromInfo(int info) {
+        return info & 0x0ffff;
+    }
+
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifInvalidFormatException.java b/imagepicker/src/main/java/com/android/mms/exif/ExifInvalidFormatException.java
new file mode 100644
index 0000000..ad13235
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifInvalidFormatException.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+public class ExifInvalidFormatException extends Exception {
+    public ExifInvalidFormatException(String meg) {
+        super(meg);
+    }
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java b/imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java
new file mode 100644
index 0000000..7204805
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import com.android.mms.LogTag;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.List;
+
+class ExifModifier {
+    public static final String TAG = LogTag.TAG;
+    public static final boolean DEBUG = false;
+    private final ByteBuffer mByteBuffer;
+    private final ExifData mTagToModified;
+    private final List<TagOffset> mTagOffsets = new ArrayList<TagOffset>();
+    private final ExifInterface mInterface;
+    private int mOffsetBase;
+
+    private static class TagOffset {
+        final int mOffset;
+        final ExifTag mTag;
+
+        TagOffset(ExifTag tag, int offset) {
+            mTag = tag;
+            mOffset = offset;
+        }
+    }
+
+    protected ExifModifier(ByteBuffer byteBuffer, ExifInterface iRef) throws IOException,
+            ExifInvalidFormatException {
+        mByteBuffer = byteBuffer;
+        mOffsetBase = byteBuffer.position();
+        mInterface = iRef;
+        InputStream is = null;
+        try {
+            is = new ByteBufferInputStream(byteBuffer);
+            // Do not require any IFD;
+            ExifParser parser = ExifParser.parse(is, mInterface);
+            mTagToModified = new ExifData(parser.getByteOrder());
+            mOffsetBase += parser.getTiffStartPosition();
+            mByteBuffer.position(0);
+        } finally {
+            ExifInterface.closeSilently(is);
+        }
+    }
+
+    protected ByteOrder getByteOrder() {
+        return mTagToModified.getByteOrder();
+    }
+
+    protected boolean commit() throws IOException, ExifInvalidFormatException {
+        InputStream is = null;
+        try {
+            is = new ByteBufferInputStream(mByteBuffer);
+            int flag = 0;
+            IfdData[] ifdDatas = new IfdData[] {
+                    mTagToModified.getIfdData(IfdId.TYPE_IFD_0),
+                    mTagToModified.getIfdData(IfdId.TYPE_IFD_1),
+                    mTagToModified.getIfdData(IfdId.TYPE_IFD_EXIF),
+                    mTagToModified.getIfdData(IfdId.TYPE_IFD_INTEROPERABILITY),
+                    mTagToModified.getIfdData(IfdId.TYPE_IFD_GPS)
+            };
+
+            if (ifdDatas[IfdId.TYPE_IFD_0] != null) {
+                flag |= ExifParser.OPTION_IFD_0;
+            }
+            if (ifdDatas[IfdId.TYPE_IFD_1] != null) {
+                flag |= ExifParser.OPTION_IFD_1;
+            }
+            if (ifdDatas[IfdId.TYPE_IFD_EXIF] != null) {
+                flag |= ExifParser.OPTION_IFD_EXIF;
+            }
+            if (ifdDatas[IfdId.TYPE_IFD_GPS] != null) {
+                flag |= ExifParser.OPTION_IFD_GPS;
+            }
+            if (ifdDatas[IfdId.TYPE_IFD_INTEROPERABILITY] != null) {
+                flag |= ExifParser.OPTION_IFD_INTEROPERABILITY;
+            }
+
+            ExifParser parser = ExifParser.parse(is, flag, mInterface);
+            int event = parser.next();
+            IfdData currIfd = null;
+            while (event != ExifParser.EVENT_END) {
+                switch (event) {
+                    case ExifParser.EVENT_START_OF_IFD:
+                        currIfd = ifdDatas[parser.getCurrentIfd()];
+                        if (currIfd == null) {
+                            parser.skipRemainingTagsInCurrentIfd();
+                        }
+                        break;
+                    case ExifParser.EVENT_NEW_TAG:
+                        ExifTag oldTag = parser.getTag();
+                        ExifTag newTag = currIfd.getTag(oldTag.getTagId());
+                        if (newTag != null) {
+                            if (newTag.getComponentCount() != oldTag.getComponentCount()
+                                    || newTag.getDataType() != oldTag.getDataType()) {
+                                return false;
+                            } else {
+                                mTagOffsets.add(new TagOffset(newTag, oldTag.getOffset()));
+                                currIfd.removeTag(oldTag.getTagId());
+                                if (currIfd.getTagCount() == 0) {
+                                    parser.skipRemainingTagsInCurrentIfd();
+                                }
+                            }
+                        }
+                        break;
+                }
+                event = parser.next();
+            }
+            for (IfdData ifd : ifdDatas) {
+                if (ifd != null && ifd.getTagCount() > 0) {
+                    return false;
+                }
+            }
+            modify();
+        } finally {
+            ExifInterface.closeSilently(is);
+        }
+        return true;
+    }
+
+    private void modify() {
+        mByteBuffer.order(getByteOrder());
+        for (TagOffset tagOffset : mTagOffsets) {
+            writeTagValue(tagOffset.mTag, tagOffset.mOffset);
+        }
+    }
+
+    private void writeTagValue(ExifTag tag, int offset) {
+        if (DEBUG) {
+            Log.v(TAG, "modifying tag to: \n" + tag.toString());
+            Log.v(TAG, "at offset: " + offset);
+        }
+        mByteBuffer.position(offset + mOffsetBase);
+        switch (tag.getDataType()) {
+            case ExifTag.TYPE_ASCII:
+                byte buf[] = tag.getStringByte();
+                if (buf.length == tag.getComponentCount()) {
+                    buf[buf.length - 1] = 0;
+                    mByteBuffer.put(buf);
+                } else {
+                    mByteBuffer.put(buf);
+                    mByteBuffer.put((byte) 0);
+                }
+                break;
+            case ExifTag.TYPE_LONG:
+            case ExifTag.TYPE_UNSIGNED_LONG:
+                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
+                    mByteBuffer.putInt((int) tag.getValueAt(i));
+                }
+                break;
+            case ExifTag.TYPE_RATIONAL:
+            case ExifTag.TYPE_UNSIGNED_RATIONAL:
+                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
+                    Rational v = tag.getRational(i);
+                    mByteBuffer.putInt((int) v.getNumerator());
+                    mByteBuffer.putInt((int) v.getDenominator());
+                }
+                break;
+            case ExifTag.TYPE_UNDEFINED:
+            case ExifTag.TYPE_UNSIGNED_BYTE:
+                buf = new byte[tag.getComponentCount()];
+                tag.getBytes(buf);
+                mByteBuffer.put(buf);
+                break;
+            case ExifTag.TYPE_UNSIGNED_SHORT:
+                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
+                    mByteBuffer.putShort((short) tag.getValueAt(i));
+                }
+                break;
+        }
+    }
+
+    public void modifyTag(ExifTag tag) {
+        mTagToModified.addTag(tag);
+    }
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java b/imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java
new file mode 100644
index 0000000..669c02b
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java
@@ -0,0 +1,520 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import com.android.mms.LogTag;
+
+import android.util.Log;
+
+import java.io.BufferedOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+
+/**
+ * This class provides a way to replace the Exif header of a JPEG image.
+ * <p>
+ * Below is an example of writing EXIF data into a file
+ *
+ * <pre>
+ * public static void writeExif(byte[] jpeg, ExifData exif, String path) {
+ *     OutputStream os = null;
+ *     try {
+ *         os = new FileOutputStream(path);
+ *         ExifOutputStream eos = new ExifOutputStream(os);
+ *         // Set the exif header
+ *         eos.setExifData(exif);
+ *         // Write the original jpeg out, the header will be add into the file.
+ *         eos.write(jpeg);
+ *     } catch (FileNotFoundException e) {
+ *         e.printStackTrace();
+ *     } catch (IOException e) {
+ *         e.printStackTrace();
+ *     } finally {
+ *         if (os != null) {
+ *             try {
+ *                 os.close();
+ *             } catch (IOException e) {
+ *                 e.printStackTrace();
+ *             }
+ *         }
+ *     }
+ * }
+ * </pre>
+ */
+class ExifOutputStream extends FilterOutputStream {
+    private static final String TAG = LogTag.TAG;
+    private static final boolean DEBUG = false;
+    private static final int STREAMBUFFER_SIZE = 0x00010000; // 64Kb
+
+    private static final int STATE_SOI = 0;
+    private static final int STATE_FRAME_HEADER = 1;
+    private static final int STATE_JPEG_DATA = 2;
+
+    private static final int EXIF_HEADER = 0x45786966;
+    private static final short TIFF_HEADER = 0x002A;
+    private static final short TIFF_BIG_ENDIAN = 0x4d4d;
+    private static final short TIFF_LITTLE_ENDIAN = 0x4949;
+    private static final short TAG_SIZE = 12;
+    private static final short TIFF_HEADER_SIZE = 8;
+    private static final int MAX_EXIF_SIZE = 65535;
+
+    private ExifData mExifData;
+    private int mState = STATE_SOI;
+    private int mByteToSkip;
+    private int mByteToCopy;
+    private final byte[] mSingleByteArray = new byte[1];
+    private final ByteBuffer mBuffer = ByteBuffer.allocate(4);
+    private final ExifInterface mInterface;
+
+    protected ExifOutputStream(OutputStream ou, ExifInterface iRef) {
+        super(new BufferedOutputStream(ou, STREAMBUFFER_SIZE));
+        mInterface = iRef;
+    }
+
+    /**
+     * Sets the ExifData to be written into the JPEG file. Should be called
+     * before writing image data.
+     */
+    protected void setExifData(ExifData exifData) {
+        mExifData = exifData;
+    }
+
+    /**
+     * Gets the Exif header to be written into the JPEF file.
+     */
+    protected ExifData getExifData() {
+        return mExifData;
+    }
+
+    private int requestByteToBuffer(int requestByteCount, byte[] buffer
+            , int offset, int length) {
+        int byteNeeded = requestByteCount - mBuffer.position();
+        int byteToRead = length > byteNeeded ? byteNeeded : length;
+        mBuffer.put(buffer, offset, byteToRead);
+        return byteToRead;
+    }
+
+    /**
+     * Writes the image out. The input data should be a valid JPEG format. After
+     * writing, it's Exif header will be replaced by the given header.
+     */
+    @Override
+    public void write(byte[] buffer, int offset, int length) throws IOException {
+        while ((mByteToSkip > 0 || mByteToCopy > 0 || mState != STATE_JPEG_DATA)
+                && length > 0) {
+            if (mByteToSkip > 0) {
+                int byteToProcess = length > mByteToSkip ? mByteToSkip : length;
+                length -= byteToProcess;
+                mByteToSkip -= byteToProcess;
+                offset += byteToProcess;
+            }
+            if (mByteToCopy > 0) {
+                int byteToProcess = length > mByteToCopy ? mByteToCopy : length;
+                out.write(buffer, offset, byteToProcess);
+                length -= byteToProcess;
+                mByteToCopy -= byteToProcess;
+                offset += byteToProcess;
+            }
+            if (length == 0) {
+                return;
+            }
+            switch (mState) {
+                case STATE_SOI:
+                    int byteRead = requestByteToBuffer(2, buffer, offset, length);
+                    offset += byteRead;
+                    length -= byteRead;
+                    if (mBuffer.position() < 2) {
+                        return;
+                    }
+                    mBuffer.rewind();
+                    if (mBuffer.getShort() != JpegHeader.SOI) {
+                        throw new IOException("Not a valid jpeg image, cannot write exif");
+                    }
+                    out.write(mBuffer.array(), 0, 2);
+                    mState = STATE_FRAME_HEADER;
+                    mBuffer.rewind();
+                    writeExifData();
+                    break;
+                case STATE_FRAME_HEADER:
+                    // We ignore the APP1 segment and copy all other segments
+                    // until SOF tag.
+                    byteRead = requestByteToBuffer(4, buffer, offset, length);
+                    offset += byteRead;
+                    length -= byteRead;
+                    // Check if this image data doesn't contain SOF.
+                    if (mBuffer.position() == 2) {
+                        short tag = mBuffer.getShort();
+                        if (tag == JpegHeader.EOI) {
+                            out.write(mBuffer.array(), 0, 2);
+                            mBuffer.rewind();
+                        }
+                    }
+                    if (mBuffer.position() < 4) {
+                        return;
+                    }
+                    mBuffer.rewind();
+                    short marker = mBuffer.getShort();
+                    if (marker == JpegHeader.APP1) {
+                        mByteToSkip = (mBuffer.getShort() & 0x0000ffff) - 2;
+                        mState = STATE_JPEG_DATA;
+                    } else if (!JpegHeader.isSofMarker(marker)) {
+                        out.write(mBuffer.array(), 0, 4);
+                        mByteToCopy = (mBuffer.getShort() & 0x0000ffff) - 2;
+                    } else {
+                        out.write(mBuffer.array(), 0, 4);
+                        mState = STATE_JPEG_DATA;
+                    }
+                    mBuffer.rewind();
+            }
+        }
+        if (length > 0) {
+            out.write(buffer, offset, length);
+        }
+    }
+
+    /**
+     * Writes the one bytes out. The input data should be a valid JPEG format.
+     * After writing, it's Exif header will be replaced by the given header.
+     */
+    @Override
+    public void write(int oneByte) throws IOException {
+        mSingleByteArray[0] = (byte) (0xff & oneByte);
+        write(mSingleByteArray);
+    }
+
+    /**
+     * Equivalent to calling write(buffer, 0, buffer.length).
+     */
+    @Override
+    public void write(byte[] buffer) throws IOException {
+        write(buffer, 0, buffer.length);
+    }
+
+    private void writeExifData() throws IOException {
+        if (mExifData == null) {
+            return;
+        }
+        if (DEBUG) {
+            Log.v(TAG, "Writing exif data...");
+        }
+        ArrayList<ExifTag> nullTags = stripNullValueTags(mExifData);
+        createRequiredIfdAndTag();
+        int exifSize = calculateAllOffset();
+        if (exifSize + 8 > MAX_EXIF_SIZE) {
+            throw new IOException("Exif header is too large (>64Kb)");
+        }
+        OrderedDataOutputStream dataOutputStream = new OrderedDataOutputStream(out);
+        dataOutputStream.setByteOrder(ByteOrder.BIG_ENDIAN);
+        dataOutputStream.writeShort(JpegHeader.APP1);
+        dataOutputStream.writeShort((short) (exifSize + 8));
+        dataOutputStream.writeInt(EXIF_HEADER);
+        dataOutputStream.writeShort((short) 0x0000);
+        if (mExifData.getByteOrder() == ByteOrder.BIG_ENDIAN) {
+            dataOutputStream.writeShort(TIFF_BIG_ENDIAN);
+        } else {
+            dataOutputStream.writeShort(TIFF_LITTLE_ENDIAN);
+        }
+        dataOutputStream.setByteOrder(mExifData.getByteOrder());
+        dataOutputStream.writeShort(TIFF_HEADER);
+        dataOutputStream.writeInt(8);
+        writeAllTags(dataOutputStream);
+        writeThumbnail(dataOutputStream);
+        for (ExifTag t : nullTags) {
+            mExifData.addTag(t);
+        }
+    }
+
+    private ArrayList<ExifTag> stripNullValueTags(ExifData data) {
+        ArrayList<ExifTag> nullTags = new ArrayList<ExifTag>();
+        for(ExifTag t : data.getAllTags()) {
+            if (t.getValue() == null && !ExifInterface.isOffsetTag(t.getTagId())) {
+                data.removeTag(t.getTagId(), t.getIfd());
+                nullTags.add(t);
+            }
+        }
+        return nullTags;
+    }
+
+    private void writeThumbnail(OrderedDataOutputStream dataOutputStream) throws IOException {
+        if (mExifData.hasCompressedThumbnail()) {
+            dataOutputStream.write(mExifData.getCompressedThumbnail());
+        } else if (mExifData.hasUncompressedStrip()) {
+            for (int i = 0; i < mExifData.getStripCount(); i++) {
+                dataOutputStream.write(mExifData.getStrip(i));
+            }
+        }
+    }
+
+    private void writeAllTags(OrderedDataOutputStream dataOutputStream) throws IOException {
+        writeIfd(mExifData.getIfdData(IfdId.TYPE_IFD_0), dataOutputStream);
+        writeIfd(mExifData.getIfdData(IfdId.TYPE_IFD_EXIF), dataOutputStream);
+        IfdData interoperabilityIfd = mExifData.getIfdData(IfdId.TYPE_IFD_INTEROPERABILITY);
+        if (interoperabilityIfd != null) {
+            writeIfd(interoperabilityIfd, dataOutputStream);
+        }
+        IfdData gpsIfd = mExifData.getIfdData(IfdId.TYPE_IFD_GPS);
+        if (gpsIfd != null) {
+            writeIfd(gpsIfd, dataOutputStream);
+        }
+        IfdData ifd1 = mExifData.getIfdData(IfdId.TYPE_IFD_1);
+        if (ifd1 != null) {
+            writeIfd(mExifData.getIfdData(IfdId.TYPE_IFD_1), dataOutputStream);
+        }
+    }
+
+    private void writeIfd(IfdData ifd, OrderedDataOutputStream dataOutputStream)
+            throws IOException {
+        ExifTag[] tags = ifd.getAllTags();
+        dataOutputStream.writeShort((short) tags.length);
+        for (ExifTag tag : tags) {
+            dataOutputStream.writeShort(tag.getTagId());
+            dataOutputStream.writeShort(tag.getDataType());
+            dataOutputStream.writeInt(tag.getComponentCount());
+            if (DEBUG) {
+                Log.v(TAG, "\n" + tag.toString());
+            }
+            if (tag.getDataSize() > 4) {
+                dataOutputStream.writeInt(tag.getOffset());
+            } else {
+                ExifOutputStream.writeTagValue(tag, dataOutputStream);
+                for (int i = 0, n = 4 - tag.getDataSize(); i < n; i++) {
+                    dataOutputStream.write(0);
+                }
+            }
+        }
+        dataOutputStream.writeInt(ifd.getOffsetToNextIfd());
+        for (ExifTag tag : tags) {
+            if (tag.getDataSize() > 4) {
+                ExifOutputStream.writeTagValue(tag, dataOutputStream);
+            }
+        }
+    }
+
+    private int calculateOffsetOfIfd(IfdData ifd, int offset) {
+        offset += 2 + ifd.getTagCount() * TAG_SIZE + 4;
+        ExifTag[] tags = ifd.getAllTags();
+        for (ExifTag tag : tags) {
+            if (tag.getDataSize() > 4) {
+                tag.setOffset(offset);
+                offset += tag.getDataSize();
+            }
+        }
+        return offset;
+    }
+
+    private void createRequiredIfdAndTag() throws IOException {
+        // IFD0 is required for all file
+        IfdData ifd0 = mExifData.getIfdData(IfdId.TYPE_IFD_0);
+        if (ifd0 == null) {
+            ifd0 = new IfdData(IfdId.TYPE_IFD_0);
+            mExifData.addIfdData(ifd0);
+        }
+        ExifTag exifOffsetTag = mInterface.buildUninitializedTag(ExifInterface.TAG_EXIF_IFD);
+        if (exifOffsetTag == null) {
+            throw new IOException("No definition for crucial exif tag: "
+                    + ExifInterface.TAG_EXIF_IFD);
+        }
+        ifd0.setTag(exifOffsetTag);
+
+        // Exif IFD is required for all files.
+        IfdData exifIfd = mExifData.getIfdData(IfdId.TYPE_IFD_EXIF);
+        if (exifIfd == null) {
+            exifIfd = new IfdData(IfdId.TYPE_IFD_EXIF);
+            mExifData.addIfdData(exifIfd);
+        }
+
+        // GPS IFD
+        IfdData gpsIfd = mExifData.getIfdData(IfdId.TYPE_IFD_GPS);
+        if (gpsIfd != null) {
+            ExifTag gpsOffsetTag = mInterface.buildUninitializedTag(ExifInterface.TAG_GPS_IFD);
+            if (gpsOffsetTag == null) {
+                throw new IOException("No definition for crucial exif tag: "
+                        + ExifInterface.TAG_GPS_IFD);
+            }
+            ifd0.setTag(gpsOffsetTag);
+        }
+
+        // Interoperability IFD
+        IfdData interIfd = mExifData.getIfdData(IfdId.TYPE_IFD_INTEROPERABILITY);
+        if (interIfd != null) {
+            ExifTag interOffsetTag = mInterface
+                    .buildUninitializedTag(ExifInterface.TAG_INTEROPERABILITY_IFD);
+            if (interOffsetTag == null) {
+                throw new IOException("No definition for crucial exif tag: "
+                        + ExifInterface.TAG_INTEROPERABILITY_IFD);
+            }
+            exifIfd.setTag(interOffsetTag);
+        }
+
+        IfdData ifd1 = mExifData.getIfdData(IfdId.TYPE_IFD_1);
+
+        // thumbnail
+        if (mExifData.hasCompressedThumbnail()) {
+
+            if (ifd1 == null) {
+                ifd1 = new IfdData(IfdId.TYPE_IFD_1);
+                mExifData.addIfdData(ifd1);
+            }
+
+            ExifTag offsetTag = mInterface
+                    .buildUninitializedTag(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT);
+            if (offsetTag == null) {
+                throw new IOException("No definition for crucial exif tag: "
+                        + ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT);
+            }
+
+            ifd1.setTag(offsetTag);
+            ExifTag lengthTag = mInterface
+                    .buildUninitializedTag(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
+            if (lengthTag == null) {
+                throw new IOException("No definition for crucial exif tag: "
+                        + ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
+            }
+
+            lengthTag.setValue(mExifData.getCompressedThumbnail().length);
+            ifd1.setTag(lengthTag);
+
+            // Get rid of tags for uncompressed if they exist.
+            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_OFFSETS));
+            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_BYTE_COUNTS));
+        } else if (mExifData.hasUncompressedStrip()) {
+            if (ifd1 == null) {
+                ifd1 = new IfdData(IfdId.TYPE_IFD_1);
+                mExifData.addIfdData(ifd1);
+            }
+            int stripCount = mExifData.getStripCount();
+            ExifTag offsetTag = mInterface.buildUninitializedTag(ExifInterface.TAG_STRIP_OFFSETS);
+            if (offsetTag == null) {
+                throw new IOException("No definition for crucial exif tag: "
+                        + ExifInterface.TAG_STRIP_OFFSETS);
+            }
+            ExifTag lengthTag = mInterface
+                    .buildUninitializedTag(ExifInterface.TAG_STRIP_BYTE_COUNTS);
+            if (lengthTag == null) {
+                throw new IOException("No definition for crucial exif tag: "
+                        + ExifInterface.TAG_STRIP_BYTE_COUNTS);
+            }
+            long[] lengths = new long[stripCount];
+            for (int i = 0; i < mExifData.getStripCount(); i++) {
+                lengths[i] = mExifData.getStrip(i).length;
+            }
+            lengthTag.setValue(lengths);
+            ifd1.setTag(offsetTag);
+            ifd1.setTag(lengthTag);
+            // Get rid of tags for compressed if they exist.
+            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT));
+            ifd1.removeTag(ExifInterface
+                    .getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH));
+        } else if (ifd1 != null) {
+            // Get rid of offset and length tags if there is no thumbnail.
+            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_OFFSETS));
+            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_BYTE_COUNTS));
+            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT));
+            ifd1.removeTag(ExifInterface
+                    .getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH));
+        }
+    }
+
+    private int calculateAllOffset() {
+        int offset = TIFF_HEADER_SIZE;
+        IfdData ifd0 = mExifData.getIfdData(IfdId.TYPE_IFD_0);
+        offset = calculateOffsetOfIfd(ifd0, offset);
+        ifd0.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_EXIF_IFD)).setValue(offset);
+
+        IfdData exifIfd = mExifData.getIfdData(IfdId.TYPE_IFD_EXIF);
+        offset = calculateOffsetOfIfd(exifIfd, offset);
+
+        IfdData interIfd = mExifData.getIfdData(IfdId.TYPE_IFD_INTEROPERABILITY);
+        if (interIfd != null) {
+            exifIfd.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_INTEROPERABILITY_IFD))
+                    .setValue(offset);
+            offset = calculateOffsetOfIfd(interIfd, offset);
+        }
+
+        IfdData gpsIfd = mExifData.getIfdData(IfdId.TYPE_IFD_GPS);
+        if (gpsIfd != null) {
+            ifd0.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_GPS_IFD)).setValue(offset);
+            offset = calculateOffsetOfIfd(gpsIfd, offset);
+        }
+
+        IfdData ifd1 = mExifData.getIfdData(IfdId.TYPE_IFD_1);
+        if (ifd1 != null) {
+            ifd0.setOffsetToNextIfd(offset);
+            offset = calculateOffsetOfIfd(ifd1, offset);
+        }
+
+        // thumbnail
+        if (mExifData.hasCompressedThumbnail()) {
+            ifd1.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT))
+                    .setValue(offset);
+            offset += mExifData.getCompressedThumbnail().length;
+        } else if (mExifData.hasUncompressedStrip()) {
+            int stripCount = mExifData.getStripCount();
+            long[] offsets = new long[stripCount];
+            for (int i = 0; i < mExifData.getStripCount(); i++) {
+                offsets[i] = offset;
+                offset += mExifData.getStrip(i).length;
+            }
+            ifd1.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_OFFSETS)).setValue(
+                    offsets);
+        }
+        return offset;
+    }
+
+    static void writeTagValue(ExifTag tag, OrderedDataOutputStream dataOutputStream)
+            throws IOException {
+        switch (tag.getDataType()) {
+            case ExifTag.TYPE_ASCII:
+                byte buf[] = tag.getStringByte();
+                if (buf.length == tag.getComponentCount()) {
+                    buf[buf.length - 1] = 0;
+                    dataOutputStream.write(buf);
+                } else {
+                    dataOutputStream.write(buf);
+                    dataOutputStream.write(0);
+                }
+                break;
+            case ExifTag.TYPE_LONG:
+            case ExifTag.TYPE_UNSIGNED_LONG:
+                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
+                    dataOutputStream.writeInt((int) tag.getValueAt(i));
+                }
+                break;
+            case ExifTag.TYPE_RATIONAL:
+            case ExifTag.TYPE_UNSIGNED_RATIONAL:
+                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
+                    dataOutputStream.writeRational(tag.getRational(i));
+                }
+                break;
+            case ExifTag.TYPE_UNDEFINED:
+            case ExifTag.TYPE_UNSIGNED_BYTE:
+                buf = new byte[tag.getComponentCount()];
+                tag.getBytes(buf);
+                dataOutputStream.write(buf);
+                break;
+            case ExifTag.TYPE_UNSIGNED_SHORT:
+                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
+                    dataOutputStream.writeShort((short) tag.getValueAt(i));
+                }
+                break;
+        }
+    }
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifParser.java b/imagepicker/src/main/java/com/android/mms/exif/ExifParser.java
new file mode 100644
index 0000000..7779a29
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifParser.java
@@ -0,0 +1,918 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import com.android.mms.LogTag;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
+/**
+ * This class provides a low-level EXIF parsing API. Given a JPEG format
+ * InputStream, the caller can request which IFD's to read via
+ * {@link #parse(InputStream, int)} with given options.
+ * <p>
+ * Below is an example of getting EXIF data from IFD 0 and EXIF IFD using the
+ * parser.
+ *
+ * <pre>
+ * void parse() {
+ *     ExifParser parser = ExifParser.parse(mImageInputStream,
+ *             ExifParser.OPTION_IFD_0 | ExifParser.OPTIONS_IFD_EXIF);
+ *     int event = parser.next();
+ *     while (event != ExifParser.EVENT_END) {
+ *         switch (event) {
+ *             case ExifParser.EVENT_START_OF_IFD:
+ *                 break;
+ *             case ExifParser.EVENT_NEW_TAG:
+ *                 ExifTag tag = parser.getTag();
+ *                 if (!tag.hasValue()) {
+ *                     parser.registerForTagValue(tag);
+ *                 } else {
+ *                     processTag(tag);
+ *                 }
+ *                 break;
+ *             case ExifParser.EVENT_VALUE_OF_REGISTERED_TAG:
+ *                 tag = parser.getTag();
+ *                 if (tag.getDataType() != ExifTag.TYPE_UNDEFINED) {
+ *                     processTag(tag);
+ *                 }
+ *                 break;
+ *         }
+ *         event = parser.next();
+ *     }
+ * }
+ *
+ * void processTag(ExifTag tag) {
+ *     // process the tag as you like.
+ * }
+ * </pre>
+ */
+public class ExifParser {
+    private static final boolean LOGV = false;
+    private static final String TAG = LogTag.TAG;
+    /**
+     * When the parser reaches a new IFD area. Call {@link #getCurrentIfd()} to
+     * know which IFD we are in.
+     */
+    public static final int EVENT_START_OF_IFD = 0;
+    /**
+     * When the parser reaches a new tag. Call {@link #getTag()}to get the
+     * corresponding tag.
+     */
+    public static final int EVENT_NEW_TAG = 1;
+    /**
+     * When the parser reaches the value area of tag that is registered by
+     * {@link #registerForTagValue(ExifTag)} previously. Call {@link #getTag()}
+     * to get the corresponding tag.
+     */
+    public static final int EVENT_VALUE_OF_REGISTERED_TAG = 2;
+
+    /**
+     * When the parser reaches the compressed image area.
+     */
+    public static final int EVENT_COMPRESSED_IMAGE = 3;
+    /**
+     * When the parser reaches the uncompressed image strip. Call
+     * {@link #getStripIndex()} to get the index of the strip.
+     *
+     * @see #getStripIndex()
+     * @see #getStripCount()
+     */
+    public static final int EVENT_UNCOMPRESSED_STRIP = 4;
+    /**
+     * When there is nothing more to parse.
+     */
+    public static final int EVENT_END = 5;
+
+    /**
+     * Option bit to request to parse IFD0.
+     */
+    public static final int OPTION_IFD_0 = 1 << 0;
+    /**
+     * Option bit to request to parse IFD1.
+     */
+    public static final int OPTION_IFD_1 = 1 << 1;
+    /**
+     * Option bit to request to parse Exif-IFD.
+     */
+    public static final int OPTION_IFD_EXIF = 1 << 2;
+    /**
+     * Option bit to request to parse GPS-IFD.
+     */
+    public static final int OPTION_IFD_GPS = 1 << 3;
+    /**
+     * Option bit to request to parse Interoperability-IFD.
+     */
+    public static final int OPTION_IFD_INTEROPERABILITY = 1 << 4;
+    /**
+     * Option bit to request to parse thumbnail.
+     */
+    public static final int OPTION_THUMBNAIL = 1 << 5;
+
+    protected static final int EXIF_HEADER = 0x45786966; // EXIF header "Exif"
+    protected static final short EXIF_HEADER_TAIL = (short) 0x0000; // EXIF header in APP1
+
+    // TIFF header
+    protected static final short LITTLE_ENDIAN_TAG = (short) 0x4949; // "II"
+    protected static final short BIG_ENDIAN_TAG = (short) 0x4d4d; // "MM"
+    protected static final short TIFF_HEADER_TAIL = 0x002A;
+
+    protected static final int TAG_SIZE = 12;
+    protected static final int OFFSET_SIZE = 2;
+
+    private static final Charset US_ASCII = Charset.forName("US-ASCII");
+
+    protected static final int DEFAULT_IFD0_OFFSET = 8;
+
+    private final CountedDataInputStream mTiffStream;
+    private final int mOptions;
+    private int mIfdStartOffset = 0;
+    private int mNumOfTagInIfd = 0;
+    private int mIfdType;
+    private ExifTag mTag;
+    private ImageEvent mImageEvent;
+    private int mStripCount;
+    private ExifTag mStripSizeTag;
+    private ExifTag mJpegSizeTag;
+    private boolean mNeedToParseOffsetsInCurrentIfd;
+    private boolean mContainExifData = false;
+    private int mApp1End;
+    private int mOffsetToApp1EndFromSOF = 0;
+    private byte[] mDataAboveIfd0;
+    private int mIfd0Position;
+    private int mTiffStartPosition;
+    private final ExifInterface mInterface;
+
+    private static final short TAG_EXIF_IFD = ExifInterface
+            .getTrueTagKey(ExifInterface.TAG_EXIF_IFD);
+    private static final short TAG_GPS_IFD = ExifInterface.getTrueTagKey(ExifInterface.TAG_GPS_IFD);
+    private static final short TAG_INTEROPERABILITY_IFD = ExifInterface
+            .getTrueTagKey(ExifInterface.TAG_INTEROPERABILITY_IFD);
+    private static final short TAG_JPEG_INTERCHANGE_FORMAT = ExifInterface
+            .getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT);
+    private static final short TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = ExifInterface
+            .getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
+    private static final short TAG_STRIP_OFFSETS = ExifInterface
+            .getTrueTagKey(ExifInterface.TAG_STRIP_OFFSETS);
+    private static final short TAG_STRIP_BYTE_COUNTS = ExifInterface
+            .getTrueTagKey(ExifInterface.TAG_STRIP_BYTE_COUNTS);
+
+    private final TreeMap<Integer, Object> mCorrespondingEvent = new TreeMap<Integer, Object>();
+
+    private boolean isIfdRequested(int ifdType) {
+        switch (ifdType) {
+            case IfdId.TYPE_IFD_0:
+                return (mOptions & OPTION_IFD_0) != 0;
+            case IfdId.TYPE_IFD_1:
+                return (mOptions & OPTION_IFD_1) != 0;
+            case IfdId.TYPE_IFD_EXIF:
+                return (mOptions & OPTION_IFD_EXIF) != 0;
+            case IfdId.TYPE_IFD_GPS:
+                return (mOptions & OPTION_IFD_GPS) != 0;
+            case IfdId.TYPE_IFD_INTEROPERABILITY:
+                return (mOptions & OPTION_IFD_INTEROPERABILITY) != 0;
+        }
+        return false;
+    }
+
+    private boolean isThumbnailRequested() {
+        return (mOptions & OPTION_THUMBNAIL) != 0;
+    }
+
+    private ExifParser(InputStream inputStream, int options, ExifInterface iRef)
+            throws IOException, ExifInvalidFormatException {
+        if (inputStream == null) {
+            throw new IOException("Null argument inputStream to ExifParser");
+        }
+        if (LOGV) {
+            Log.v(TAG, "Reading exif...");
+        }
+        mInterface = iRef;
+        mContainExifData = seekTiffData(inputStream);
+        mTiffStream = new CountedDataInputStream(inputStream);
+        mOptions = options;
+        if (!mContainExifData) {
+            return;
+        }
+
+        parseTiffHeader();
+        long offset = mTiffStream.readUnsignedInt();
+        if (offset > Integer.MAX_VALUE) {
+            throw new ExifInvalidFormatException("Invalid offset " + offset);
+        }
+        mIfd0Position = (int) offset;
+        mIfdType = IfdId.TYPE_IFD_0;
+        if (isIfdRequested(IfdId.TYPE_IFD_0) || needToParseOffsetsInCurrentIfd()) {
+            registerIfd(IfdId.TYPE_IFD_0, offset);
+            if (offset != DEFAULT_IFD0_OFFSET) {
+                mDataAboveIfd0 = new byte[(int) offset - DEFAULT_IFD0_OFFSET];
+                read(mDataAboveIfd0);
+            }
+        }
+    }
+
+    /**
+     * Parses the the given InputStream with the given options
+     *
+     * @exception IOException
+     * @exception ExifInvalidFormatException
+     */
+    protected static ExifParser parse(InputStream inputStream, int options, ExifInterface iRef)
+            throws IOException, ExifInvalidFormatException {
+        return new ExifParser(inputStream, options, iRef);
+    }
+
+    /**
+     * Parses the the given InputStream with default options; that is, every IFD
+     * and thumbnaill will be parsed.
+     *
+     * @exception IOException
+     * @exception ExifInvalidFormatException
+     * @see #parse(InputStream, int)
+     */
+    protected static ExifParser parse(InputStream inputStream, ExifInterface iRef)
+            throws IOException, ExifInvalidFormatException {
+        return new ExifParser(inputStream, OPTION_IFD_0 | OPTION_IFD_1
+                | OPTION_IFD_EXIF | OPTION_IFD_GPS | OPTION_IFD_INTEROPERABILITY
+                | OPTION_THUMBNAIL, iRef);
+    }
+
+    /**
+     * Moves the parser forward and returns the next parsing event
+     *
+     * @exception IOException
+     * @exception ExifInvalidFormatException
+     * @see #EVENT_START_OF_IFD
+     * @see #EVENT_NEW_TAG
+     * @see #EVENT_VALUE_OF_REGISTERED_TAG
+     * @see #EVENT_COMPRESSED_IMAGE
+     * @see #EVENT_UNCOMPRESSED_STRIP
+     * @see #EVENT_END
+     */
+    protected int next() throws IOException, ExifInvalidFormatException {
+        if (!mContainExifData) {
+            return EVENT_END;
+        }
+        int offset = mTiffStream.getReadByteCount();
+        int endOfTags = mIfdStartOffset + OFFSET_SIZE + TAG_SIZE * mNumOfTagInIfd;
+        if (offset < endOfTags) {
+            mTag = readTag();
+            if (mTag == null) {
+                return next();
+            }
+            if (mNeedToParseOffsetsInCurrentIfd) {
+                checkOffsetOrImageTag(mTag);
+            }
+            return EVENT_NEW_TAG;
+        } else if (offset == endOfTags) {
+            // There is a link to ifd1 at the end of ifd0
+            if (mIfdType == IfdId.TYPE_IFD_0) {
+                long ifdOffset = readUnsignedLong();
+                if (isIfdRequested(IfdId.TYPE_IFD_1) || isThumbnailRequested()) {
+                    if (ifdOffset != 0) {
+                        registerIfd(IfdId.TYPE_IFD_1, ifdOffset);
+                    }
+                }
+            } else {
+                int offsetSize = 4;
+                // Some camera models use invalid length of the offset
+                if (mCorrespondingEvent.size() > 0) {
+                    offsetSize = mCorrespondingEvent.firstEntry().getKey() -
+                            mTiffStream.getReadByteCount();
+                }
+                if (offsetSize < 4) {
+                    Log.w(TAG, "Invalid size of link to next IFD: " + offsetSize);
+                } else {
+                    long ifdOffset = readUnsignedLong();
+                    if (ifdOffset != 0) {
+                        Log.w(TAG, "Invalid link to next IFD: " + ifdOffset);
+                    }
+                }
+            }
+        }
+        while (mCorrespondingEvent.size() != 0) {
+            Entry<Integer, Object> entry = mCorrespondingEvent.pollFirstEntry();
+            Object event = entry.getValue();
+            try {
+                skipTo(entry.getKey());
+            } catch (IOException e) {
+                Log.w(TAG, "Failed to skip to data at: " + entry.getKey() +
+                        " for " + event.getClass().getName() + ", the file may be broken.");
+                continue;
+            }
+            if (event instanceof IfdEvent) {
+                mIfdType = ((IfdEvent) event).ifd;
+                mNumOfTagInIfd = mTiffStream.readUnsignedShort();
+                mIfdStartOffset = entry.getKey();
+
+                if (mNumOfTagInIfd * TAG_SIZE + mIfdStartOffset + OFFSET_SIZE > mApp1End) {
+                    Log.w(TAG, "Invalid size of IFD " + mIfdType);
+                    return EVENT_END;
+                }
+
+                mNeedToParseOffsetsInCurrentIfd = needToParseOffsetsInCurrentIfd();
+                if (((IfdEvent) event).isRequested) {
+                    return EVENT_START_OF_IFD;
+                } else {
+                    skipRemainingTagsInCurrentIfd();
+                }
+            } else if (event instanceof ImageEvent) {
+                mImageEvent = (ImageEvent) event;
+                return mImageEvent.type;
+            } else {
+                ExifTagEvent tagEvent = (ExifTagEvent) event;
+                mTag = tagEvent.tag;
+                if (mTag.getDataType() != ExifTag.TYPE_UNDEFINED) {
+                    readFullTagValue(mTag);
+                    checkOffsetOrImageTag(mTag);
+                }
+                if (tagEvent.isRequested) {
+                    return EVENT_VALUE_OF_REGISTERED_TAG;
+                }
+            }
+        }
+        return EVENT_END;
+    }
+
+    /**
+     * Skips the tags area of current IFD, if the parser is not in the tag area,
+     * nothing will happen.
+     *
+     * @throws IOException
+     * @throws ExifInvalidFormatException
+     */
+    protected void skipRemainingTagsInCurrentIfd() throws IOException, ExifInvalidFormatException {
+        int endOfTags = mIfdStartOffset + OFFSET_SIZE + TAG_SIZE * mNumOfTagInIfd;
+        int offset = mTiffStream.getReadByteCount();
+        if (offset > endOfTags) {
+            return;
+        }
+        if (mNeedToParseOffsetsInCurrentIfd) {
+            while (offset < endOfTags) {
+                mTag = readTag();
+                offset += TAG_SIZE;
+                if (mTag == null) {
+                    continue;
+                }
+                checkOffsetOrImageTag(mTag);
+            }
+        } else {
+            skipTo(endOfTags);
+        }
+        long ifdOffset = readUnsignedLong();
+        // For ifd0, there is a link to ifd1 in the end of all tags
+        if (mIfdType == IfdId.TYPE_IFD_0
+                && (isIfdRequested(IfdId.TYPE_IFD_1) || isThumbnailRequested())) {
+            if (ifdOffset > 0) {
+                registerIfd(IfdId.TYPE_IFD_1, ifdOffset);
+            }
+        }
+    }
+
+    private boolean needToParseOffsetsInCurrentIfd() {
+        switch (mIfdType) {
+            case IfdId.TYPE_IFD_0:
+                return isIfdRequested(IfdId.TYPE_IFD_EXIF) || isIfdRequested(IfdId.TYPE_IFD_GPS)
+                        || isIfdRequested(IfdId.TYPE_IFD_INTEROPERABILITY)
+                        || isIfdRequested(IfdId.TYPE_IFD_1);
+            case IfdId.TYPE_IFD_1:
+                return isThumbnailRequested();
+            case IfdId.TYPE_IFD_EXIF:
+                // The offset to interoperability IFD is located in Exif IFD
+                return isIfdRequested(IfdId.TYPE_IFD_INTEROPERABILITY);
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * If {@link #next()} return {@link #EVENT_NEW_TAG} or
+     * {@link #EVENT_VALUE_OF_REGISTERED_TAG}, call this function to get the
+     * corresponding tag.
+     * <p>
+     * For {@link #EVENT_NEW_TAG}, the tag may not contain the value if the size
+     * of the value is greater than 4 bytes. One should call
+     * {@link ExifTag#hasValue()} to check if the tag contains value. If there
+     * is no value,call {@link #registerForTagValue(ExifTag)} to have the parser
+     * emit {@link #EVENT_VALUE_OF_REGISTERED_TAG} when it reaches the area
+     * pointed by the offset.
+     * <p>
+     * When {@link #EVENT_VALUE_OF_REGISTERED_TAG} is emitted, the value of the
+     * tag will have already been read except for tags of undefined type. For
+     * tags of undefined type, call one of the read methods to get the value.
+     *
+     * @see #registerForTagValue(ExifTag)
+     * @see #read(byte[])
+     * @see #read(byte[], int, int)
+     * @see #readLong()
+     * @see #readRational()
+     * @see #readString(int)
+     * @see #readString(int, Charset)
+     */
+    protected ExifTag getTag() {
+        return mTag;
+    }
+
+    /**
+     * Gets number of tags in the current IFD area.
+     */
+    protected int getTagCountInCurrentIfd() {
+        return mNumOfTagInIfd;
+    }
+
+    /**
+     * Gets the ID of current IFD.
+     *
+     * @see IfdId#TYPE_IFD_0
+     * @see IfdId#TYPE_IFD_1
+     * @see IfdId#TYPE_IFD_GPS
+     * @see IfdId#TYPE_IFD_INTEROPERABILITY
+     * @see IfdId#TYPE_IFD_EXIF
+     */
+    protected int getCurrentIfd() {
+        return mIfdType;
+    }
+
+    /**
+     * When receiving {@link #EVENT_UNCOMPRESSED_STRIP}, call this function to
+     * get the index of this strip.
+     *
+     * @see #getStripCount()
+     */
+    protected int getStripIndex() {
+        return mImageEvent.stripIndex;
+    }
+
+    /**
+     * When receiving {@link #EVENT_UNCOMPRESSED_STRIP}, call this function to
+     * get the number of strip data.
+     *
+     * @see #getStripIndex()
+     */
+    protected int getStripCount() {
+        return mStripCount;
+    }
+
+    /**
+     * When receiving {@link #EVENT_UNCOMPRESSED_STRIP}, call this function to
+     * get the strip size.
+     */
+    protected int getStripSize() {
+        if (mStripSizeTag == null)
+            return 0;
+        return (int) mStripSizeTag.getValueAt(0);
+    }
+
+    /**
+     * When receiving {@link #EVENT_COMPRESSED_IMAGE}, call this function to get
+     * the image data size.
+     */
+    protected int getCompressedImageSize() {
+        if (mJpegSizeTag == null) {
+            return 0;
+        }
+        return (int) mJpegSizeTag.getValueAt(0);
+    }
+
+    private void skipTo(int offset) throws IOException {
+        mTiffStream.skipTo(offset);
+        while (!mCorrespondingEvent.isEmpty() && mCorrespondingEvent.firstKey() < offset) {
+            mCorrespondingEvent.pollFirstEntry();
+        }
+    }
+
+    /**
+     * When getting {@link #EVENT_NEW_TAG} in the tag area of IFD, the tag may
+     * not contain the value if the size of the value is greater than 4 bytes.
+     * When the value is not available here, call this method so that the parser
+     * will emit {@link #EVENT_VALUE_OF_REGISTERED_TAG} when it reaches the area
+     * where the value is located.
+     *
+     * @see #EVENT_VALUE_OF_REGISTERED_TAG
+     */
+    protected void registerForTagValue(ExifTag tag) {
+        if (tag.getOffset() >= mTiffStream.getReadByteCount()) {
+            mCorrespondingEvent.put(tag.getOffset(), new ExifTagEvent(tag, true));
+        }
+    }
+
+    private void registerIfd(int ifdType, long offset) {
+        // Cast unsigned int to int since the offset is always smaller
+        // than the size of APP1 (65536)
+        mCorrespondingEvent.put((int) offset, new IfdEvent(ifdType, isIfdRequested(ifdType)));
+    }
+
+    private void registerCompressedImage(long offset) {
+        mCorrespondingEvent.put((int) offset, new ImageEvent(EVENT_COMPRESSED_IMAGE));
+    }
+
+    private void registerUncompressedStrip(int stripIndex, long offset) {
+        mCorrespondingEvent.put((int) offset, new ImageEvent(EVENT_UNCOMPRESSED_STRIP
+                , stripIndex));
+    }
+
+    private ExifTag readTag() throws IOException, ExifInvalidFormatException {
+        short tagId = mTiffStream.readShort();
+        short dataFormat = mTiffStream.readShort();
+        long numOfComp = mTiffStream.readUnsignedInt();
+        if (numOfComp > Integer.MAX_VALUE) {
+            throw new ExifInvalidFormatException(
+                    "Number of component is larger then Integer.MAX_VALUE");
+        }
+        // Some invalid image file contains invalid data type. Ignore those tags
+        if (!ExifTag.isValidType(dataFormat)) {
+            Log.w(TAG, String.format("Tag %04x: Invalid data type %d", tagId, dataFormat));
+            mTiffStream.skip(4);
+            return null;
+        }
+        // TODO: handle numOfComp overflow
+        ExifTag tag = new ExifTag(tagId, dataFormat, (int) numOfComp, mIfdType,
+                ((int) numOfComp) != ExifTag.SIZE_UNDEFINED);
+        int dataSize = tag.getDataSize();
+        if (dataSize > 4) {
+            long offset = mTiffStream.readUnsignedInt();
+            if (offset > Integer.MAX_VALUE) {
+                throw new ExifInvalidFormatException(
+                        "offset is larger then Integer.MAX_VALUE");
+            }
+            // Some invalid images put some undefined data before IFD0.
+            // Read the data here.
+            if ((offset < mIfd0Position) && (dataFormat == ExifTag.TYPE_UNDEFINED)) {
+                byte[] buf = new byte[(int) numOfComp];
+                System.arraycopy(mDataAboveIfd0, (int) offset - DEFAULT_IFD0_OFFSET,
+                        buf, 0, (int) numOfComp);
+                tag.setValue(buf);
+            } else {
+                tag.setOffset((int) offset);
+            }
+        } else {
+            boolean defCount = tag.hasDefinedCount();
+            // Set defined count to 0 so we can add \0 to non-terminated strings
+            tag.setHasDefinedCount(false);
+            // Read value
+            readFullTagValue(tag);
+            tag.setHasDefinedCount(defCount);
+            mTiffStream.skip(4 - dataSize);
+            // Set the offset to the position of value.
+            tag.setOffset(mTiffStream.getReadByteCount() - 4);
+        }
+        return tag;
+    }
+
+    /**
+     * Check the tag, if the tag is one of the offset tag that points to the IFD
+     * or image the caller is interested in, register the IFD or image.
+     */
+    private void checkOffsetOrImageTag(ExifTag tag) {
+        // Some invalid formattd image contains tag with 0 size.
+        if (tag.getComponentCount() == 0) {
+            return;
+        }
+        short tid = tag.getTagId();
+        int ifd = tag.getIfd();
+        if (tid == TAG_EXIF_IFD && checkAllowed(ifd, ExifInterface.TAG_EXIF_IFD)) {
+            if (isIfdRequested(IfdId.TYPE_IFD_EXIF)
+                    || isIfdRequested(IfdId.TYPE_IFD_INTEROPERABILITY)) {
+                registerIfd(IfdId.TYPE_IFD_EXIF, tag.getValueAt(0));
+            }
+        } else if (tid == TAG_GPS_IFD && checkAllowed(ifd, ExifInterface.TAG_GPS_IFD)) {
+            if (isIfdRequested(IfdId.TYPE_IFD_GPS)) {
+                registerIfd(IfdId.TYPE_IFD_GPS, tag.getValueAt(0));
+            }
+        } else if (tid == TAG_INTEROPERABILITY_IFD
+                && checkAllowed(ifd, ExifInterface.TAG_INTEROPERABILITY_IFD)) {
+            if (isIfdRequested(IfdId.TYPE_IFD_INTEROPERABILITY)) {
+                registerIfd(IfdId.TYPE_IFD_INTEROPERABILITY, tag.getValueAt(0));
+            }
+        } else if (tid == TAG_JPEG_INTERCHANGE_FORMAT
+                && checkAllowed(ifd, ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT)) {
+            if (isThumbnailRequested()) {
+                registerCompressedImage(tag.getValueAt(0));
+            }
+        } else if (tid == TAG_JPEG_INTERCHANGE_FORMAT_LENGTH
+                && checkAllowed(ifd, ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH)) {
+            if (isThumbnailRequested()) {
+                mJpegSizeTag = tag;
+            }
+        } else if (tid == TAG_STRIP_OFFSETS && checkAllowed(ifd, ExifInterface.TAG_STRIP_OFFSETS)) {
+            if (isThumbnailRequested()) {
+                if (tag.hasValue()) {
+                    for (int i = 0; i < tag.getComponentCount(); i++) {
+                        if (tag.getDataType() == ExifTag.TYPE_UNSIGNED_SHORT) {
+                            registerUncompressedStrip(i, tag.getValueAt(i));
+                        } else {
+                            registerUncompressedStrip(i, tag.getValueAt(i));
+                        }
+                    }
+                } else {
+                    mCorrespondingEvent.put(tag.getOffset(), new ExifTagEvent(tag, false));
+                }
+            }
+        } else if (tid == TAG_STRIP_BYTE_COUNTS
+                && checkAllowed(ifd, ExifInterface.TAG_STRIP_BYTE_COUNTS)
+                &&isThumbnailRequested() && tag.hasValue()) {
+            mStripSizeTag = tag;
+        }
+    }
+
+    private boolean checkAllowed(int ifd, int tagId) {
+        int info = mInterface.getTagInfo().get(tagId);
+        if (info == ExifInterface.DEFINITION_NULL) {
+            return false;
+        }
+        return ExifInterface.isIfdAllowed(info, ifd);
+    }
+
+    protected void readFullTagValue(ExifTag tag) throws IOException {
+        // Some invalid images contains tags with wrong size, check it here
+        short type = tag.getDataType();
+        if (type == ExifTag.TYPE_ASCII || type == ExifTag.TYPE_UNDEFINED ||
+                type == ExifTag.TYPE_UNSIGNED_BYTE) {
+            int size = tag.getComponentCount();
+            if (mCorrespondingEvent.size() > 0) {
+                if (mCorrespondingEvent.firstEntry().getKey() < mTiffStream.getReadByteCount()
+                        + size) {
+                    Object event = mCorrespondingEvent.firstEntry().getValue();
+                    if (event instanceof ImageEvent) {
+                        // Tag value overlaps thumbnail, ignore thumbnail.
+                        Log.w(TAG, "Thumbnail overlaps value for tag: \n" + tag.toString());
+                        Entry<Integer, Object> entry = mCorrespondingEvent.pollFirstEntry();
+                        Log.w(TAG, "Invalid thumbnail offset: " + entry.getKey());
+                    } else {
+                        // Tag value overlaps another tag, shorten count
+                        if (event instanceof IfdEvent) {
+                            Log.w(TAG, "Ifd " + ((IfdEvent) event).ifd
+                                    + " overlaps value for tag: \n" + tag.toString());
+                        } else if (event instanceof ExifTagEvent) {
+                            Log.w(TAG, "Tag value for tag: \n"
+                                    + ((ExifTagEvent) event).tag.toString()
+                                    + " overlaps value for tag: \n" + tag.toString());
+                        }
+                        size = mCorrespondingEvent.firstEntry().getKey()
+                                - mTiffStream.getReadByteCount();
+                        Log.w(TAG, "Invalid size of tag: \n" + tag.toString()
+                                + " setting count to: " + size);
+                        tag.forceSetComponentCount(size);
+                    }
+                }
+            }
+        }
+        switch (tag.getDataType()) {
+            case ExifTag.TYPE_UNSIGNED_BYTE:
+            case ExifTag.TYPE_UNDEFINED: {
+                byte buf[] = new byte[tag.getComponentCount()];
+                read(buf);
+                tag.setValue(buf);
+            }
+                break;
+            case ExifTag.TYPE_ASCII:
+                tag.setValue(readString(tag.getComponentCount()));
+                break;
+            case ExifTag.TYPE_UNSIGNED_LONG: {
+                long value[] = new long[tag.getComponentCount()];
+                for (int i = 0, n = value.length; i < n; i++) {
+                    value[i] = readUnsignedLong();
+                }
+                tag.setValue(value);
+            }
+                break;
+            case ExifTag.TYPE_UNSIGNED_RATIONAL: {
+                Rational value[] = new Rational[tag.getComponentCount()];
+                for (int i = 0, n = value.length; i < n; i++) {
+                    value[i] = readUnsignedRational();
+                }
+                tag.setValue(value);
+            }
+                break;
+            case ExifTag.TYPE_UNSIGNED_SHORT: {
+                int value[] = new int[tag.getComponentCount()];
+                for (int i = 0, n = value.length; i < n; i++) {
+                    value[i] = readUnsignedShort();
+                }
+                tag.setValue(value);
+            }
+                break;
+            case ExifTag.TYPE_LONG: {
+                int value[] = new int[tag.getComponentCount()];
+                for (int i = 0, n = value.length; i < n; i++) {
+                    value[i] = readLong();
+                }
+                tag.setValue(value);
+            }
+                break;
+            case ExifTag.TYPE_RATIONAL: {
+                Rational value[] = new Rational[tag.getComponentCount()];
+                for (int i = 0, n = value.length; i < n; i++) {
+                    value[i] = readRational();
+                }
+                tag.setValue(value);
+            }
+                break;
+        }
+        if (LOGV) {
+            Log.v(TAG, "\n" + tag.toString());
+        }
+    }
+
+    private void parseTiffHeader() throws IOException,
+            ExifInvalidFormatException {
+        short byteOrder = mTiffStream.readShort();
+        if (LITTLE_ENDIAN_TAG == byteOrder) {
+            mTiffStream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
+        } else if (BIG_ENDIAN_TAG == byteOrder) {
+            mTiffStream.setByteOrder(ByteOrder.BIG_ENDIAN);
+        } else {
+            throw new ExifInvalidFormatException("Invalid TIFF header");
+        }
+
+        if (mTiffStream.readShort() != TIFF_HEADER_TAIL) {
+            throw new ExifInvalidFormatException("Invalid TIFF header");
+        }
+    }
+
+    private boolean seekTiffData(InputStream inputStream) throws IOException,
+            ExifInvalidFormatException {
+        CountedDataInputStream dataStream = new CountedDataInputStream(inputStream);
+        if (dataStream.readShort() != JpegHeader.SOI) {
+            throw new ExifInvalidFormatException("Invalid JPEG format");
+        }
+
+        short marker = dataStream.readShort();
+        while (marker != JpegHeader.EOI
+                && !JpegHeader.isSofMarker(marker)) {
+            int length = dataStream.readUnsignedShort();
+            // Some invalid formatted image contains multiple APP1,
+            // try to find the one with Exif data.
+            if (marker == JpegHeader.APP1) {
+                int header = 0;
+                short headerTail = 0;
+                if (length >= 8) {
+                    header = dataStream.readInt();
+                    headerTail = dataStream.readShort();
+                    length -= 6;
+                    if (header == EXIF_HEADER && headerTail == EXIF_HEADER_TAIL) {
+                        mTiffStartPosition = dataStream.getReadByteCount();
+                        mApp1End = length;
+                        mOffsetToApp1EndFromSOF = mTiffStartPosition + mApp1End;
+                        return true;
+                    }
+                }
+            }
+            if (length < 2 || (length - 2) != dataStream.skip(length - 2)) {
+                Log.w(TAG, "Invalid JPEG format.");
+                return false;
+            }
+            marker = dataStream.readShort();
+        }
+        return false;
+    }
+
+    protected int getOffsetToExifEndFromSOF() {
+        return mOffsetToApp1EndFromSOF;
+    }
+
+    protected int getTiffStartPosition() {
+        return mTiffStartPosition;
+    }
+
+    /**
+     * Reads bytes from the InputStream.
+     */
+    protected int read(byte[] buffer, int offset, int length) throws IOException {
+        return mTiffStream.read(buffer, offset, length);
+    }
+
+    /**
+     * Equivalent to read(buffer, 0, buffer.length).
+     */
+    protected int read(byte[] buffer) throws IOException {
+        return mTiffStream.read(buffer);
+    }
+
+    /**
+     * Reads a String from the InputStream with US-ASCII charset. The parser
+     * will read n bytes and convert it to ascii string. This is used for
+     * reading values of type {@link ExifTag#TYPE_ASCII}.
+     */
+    protected String readString(int n) throws IOException {
+        return readString(n, US_ASCII);
+    }
+
+    /**
+     * Reads a String from the InputStream with the given charset. The parser
+     * will read n bytes and convert it to string. This is used for reading
+     * values of type {@link ExifTag#TYPE_ASCII}.
+     */
+    protected String readString(int n, Charset charset) throws IOException {
+        if (n > 0) {
+            return mTiffStream.readString(n, charset);
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * Reads value of type {@link ExifTag#TYPE_UNSIGNED_SHORT} from the
+     * InputStream.
+     */
+    protected int readUnsignedShort() throws IOException {
+        return mTiffStream.readShort() & 0xffff;
+    }
+
+    /**
+     * Reads value of type {@link ExifTag#TYPE_UNSIGNED_LONG} from the
+     * InputStream.
+     */
+    protected long readUnsignedLong() throws IOException {
+        return readLong() & 0xffffffffL;
+    }
+
+    /**
+     * Reads value of type {@link ExifTag#TYPE_UNSIGNED_RATIONAL} from the
+     * InputStream.
+     */
+    protected Rational readUnsignedRational() throws IOException {
+        long nomi = readUnsignedLong();
+        long denomi = readUnsignedLong();
+        return new Rational(nomi, denomi);
+    }
+
+    /**
+     * Reads value of type {@link ExifTag#TYPE_LONG} from the InputStream.
+     */
+    protected int readLong() throws IOException {
+        return mTiffStream.readInt();
+    }
+
+    /**
+     * Reads value of type {@link ExifTag#TYPE_RATIONAL} from the InputStream.
+     */
+    protected Rational readRational() throws IOException {
+        int nomi = readLong();
+        int denomi = readLong();
+        return new Rational(nomi, denomi);
+    }
+
+    private static class ImageEvent {
+        int stripIndex;
+        int type;
+
+        ImageEvent(int type) {
+            this.stripIndex = 0;
+            this.type = type;
+        }
+
+        ImageEvent(int type, int stripIndex) {
+            this.type = type;
+            this.stripIndex = stripIndex;
+        }
+    }
+
+    private static class IfdEvent {
+        int ifd;
+        boolean isRequested;
+
+        IfdEvent(int ifd, boolean isInterestedIfd) {
+            this.ifd = ifd;
+            this.isRequested = isInterestedIfd;
+        }
+    }
+
+    private static class ExifTagEvent {
+        ExifTag tag;
+        boolean isRequested;
+
+        ExifTagEvent(ExifTag tag, boolean isRequireByUser) {
+            this.tag = tag;
+            this.isRequested = isRequireByUser;
+        }
+    }
+
+    /**
+     * Gets the byte order of the current InputStream.
+     */
+    protected ByteOrder getByteOrder() {
+        return mTiffStream.getByteOrder();
+    }
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifReader.java b/imagepicker/src/main/java/com/android/mms/exif/ExifReader.java
new file mode 100644
index 0000000..f204594
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifReader.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import com.android.mms.LogTag;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * This class reads the EXIF header of a JPEG file and stores it in
+ * {@link ExifData}.
+ */
+class ExifReader {
+    private static final String TAG = LogTag.TAG;
+
+    private final ExifInterface mInterface;
+
+    ExifReader(ExifInterface iRef) {
+        mInterface = iRef;
+    }
+
+    /**
+     * Parses the inputStream and and returns the EXIF data in an
+     * {@link ExifData}.
+     *
+     * @throws ExifInvalidFormatException
+     * @throws IOException
+     */
+    protected ExifData read(InputStream inputStream) throws ExifInvalidFormatException,
+            IOException {
+        ExifParser parser = ExifParser.parse(inputStream, mInterface);
+        ExifData exifData = new ExifData(parser.getByteOrder());
+        ExifTag tag = null;
+
+        int event = parser.next();
+        while (event != ExifParser.EVENT_END) {
+            switch (event) {
+                case ExifParser.EVENT_START_OF_IFD:
+                    exifData.addIfdData(new IfdData(parser.getCurrentIfd()));
+                    break;
+                case ExifParser.EVENT_NEW_TAG:
+                    tag = parser.getTag();
+                    if (!tag.hasValue()) {
+                        parser.registerForTagValue(tag);
+                    } else {
+                        exifData.getIfdData(tag.getIfd()).setTag(tag);
+                    }
+                    break;
+                case ExifParser.EVENT_VALUE_OF_REGISTERED_TAG:
+                    tag = parser.getTag();
+                    if (tag.getDataType() == ExifTag.TYPE_UNDEFINED) {
+                        parser.readFullTagValue(tag);
+                    }
+                    exifData.getIfdData(tag.getIfd()).setTag(tag);
+                    break;
+                case ExifParser.EVENT_COMPRESSED_IMAGE:
+                    byte buf[] = new byte[parser.getCompressedImageSize()];
+                    if (buf.length == parser.read(buf)) {
+                        exifData.setCompressedThumbnail(buf);
+                    } else {
+                        Log.w(TAG, "Failed to read the compressed thumbnail");
+                    }
+                    break;
+                case ExifParser.EVENT_UNCOMPRESSED_STRIP:
+                    buf = new byte[parser.getStripSize()];
+                    if (buf.length == parser.read(buf)) {
+                        exifData.setStripBytes(parser.getStripIndex(), buf);
+                    } else {
+                        Log.w(TAG, "Failed to read the strip bytes");
+                    }
+                    break;
+            }
+            event = parser.next();
+        }
+        return exifData;
+    }
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifTag.java b/imagepicker/src/main/java/com/android/mms/exif/ExifTag.java
new file mode 100644
index 0000000..88028a1
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifTag.java
@@ -0,0 +1,1011 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import androidx.annotation.NonNull;
+
+import java.nio.charset.Charset;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+
+/**
+ * This class stores information of an EXIF tag. For more information about
+ * defined EXIF tags, please read the Jeita EXIF 2.2 standard. Tags should be
+ * instantiated using {@link ExifInterface#buildTag}.
+ *
+ * @see ExifInterface
+ */
+public class ExifTag {
+    /**
+     * The BYTE type in the EXIF standard. An 8-bit unsigned integer.
+     */
+    public static final short TYPE_UNSIGNED_BYTE = 1;
+    /**
+     * The ASCII type in the EXIF standard. An 8-bit byte containing one 7-bit
+     * ASCII code. The final byte is terminated with NULL.
+     */
+    public static final short TYPE_ASCII = 2;
+    /**
+     * The SHORT type in the EXIF standard. A 16-bit (2-byte) unsigned integer
+     */
+    public static final short TYPE_UNSIGNED_SHORT = 3;
+    /**
+     * The LONG type in the EXIF standard. A 32-bit (4-byte) unsigned integer
+     */
+    public static final short TYPE_UNSIGNED_LONG = 4;
+    /**
+     * The RATIONAL type of EXIF standard. It consists of two LONGs. The first
+     * one is the numerator and the second one expresses the denominator.
+     */
+    public static final short TYPE_UNSIGNED_RATIONAL = 5;
+    /**
+     * The UNDEFINED type in the EXIF standard. An 8-bit byte that can take any
+     * value depending on the field definition.
+     */
+    public static final short TYPE_UNDEFINED = 7;
+    /**
+     * The SLONG type in the EXIF standard. A 32-bit (4-byte) signed integer
+     * (2's complement notation).
+     */
+    public static final short TYPE_LONG = 9;
+    /**
+     * The SRATIONAL type of EXIF standard. It consists of two SLONGs. The first
+     * one is the numerator and the second one is the denominator.
+     */
+    public static final short TYPE_RATIONAL = 10;
+
+    private static Charset US_ASCII = Charset.forName("US-ASCII");
+    private static final int TYPE_TO_SIZE_MAP[] = new int[11];
+    private static final int UNSIGNED_SHORT_MAX = 65535;
+    private static final long UNSIGNED_LONG_MAX = 4294967295L;
+    private static final long LONG_MAX = Integer.MAX_VALUE;
+    private static final long LONG_MIN = Integer.MIN_VALUE;
+
+    static {
+        TYPE_TO_SIZE_MAP[TYPE_UNSIGNED_BYTE] = 1;
+        TYPE_TO_SIZE_MAP[TYPE_ASCII] = 1;
+        TYPE_TO_SIZE_MAP[TYPE_UNSIGNED_SHORT] = 2;
+        TYPE_TO_SIZE_MAP[TYPE_UNSIGNED_LONG] = 4;
+        TYPE_TO_SIZE_MAP[TYPE_UNSIGNED_RATIONAL] = 8;
+        TYPE_TO_SIZE_MAP[TYPE_UNDEFINED] = 1;
+        TYPE_TO_SIZE_MAP[TYPE_LONG] = 4;
+        TYPE_TO_SIZE_MAP[TYPE_RATIONAL] = 8;
+    }
+
+    static final int SIZE_UNDEFINED = 0;
+
+    // Exif TagId
+    private final short mTagId;
+    // Exif Tag Type
+    private final short mDataType;
+    // If tag has defined count
+    private boolean mHasDefinedDefaultComponentCount;
+    // Actual data count in tag (should be number of elements in value array)
+    private int mComponentCountActual;
+    // The ifd that this tag should be put in
+    private int mIfd;
+    // The value (array of elements of type Tag Type)
+    private Object mValue;
+    // Value offset in exif header.
+    private int mOffset;
+
+    private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("yyyy:MM:dd kk:mm:ss");
+
+    /**
+     * Returns true if the given IFD is a valid IFD.
+     */
+    public static boolean isValidIfd(int ifdId) {
+        return ifdId == IfdId.TYPE_IFD_0 || ifdId == IfdId.TYPE_IFD_1
+                || ifdId == IfdId.TYPE_IFD_EXIF || ifdId == IfdId.TYPE_IFD_INTEROPERABILITY
+                || ifdId == IfdId.TYPE_IFD_GPS;
+    }
+
+    /**
+     * Returns true if a given type is a valid tag type.
+     */
+    public static boolean isValidType(short type) {
+        return type == TYPE_UNSIGNED_BYTE || type == TYPE_ASCII ||
+                type == TYPE_UNSIGNED_SHORT || type == TYPE_UNSIGNED_LONG ||
+                type == TYPE_UNSIGNED_RATIONAL || type == TYPE_UNDEFINED ||
+                type == TYPE_LONG || type == TYPE_RATIONAL;
+    }
+
+    // Use builtTag in ExifInterface instead of constructor.
+    ExifTag(short tagId, short type, int componentCount, int ifd,
+            boolean hasDefinedComponentCount) {
+        mTagId = tagId;
+        mDataType = type;
+        mComponentCountActual = componentCount;
+        mHasDefinedDefaultComponentCount = hasDefinedComponentCount;
+        mIfd = ifd;
+        mValue = null;
+    }
+
+    /**
+     * Gets the element size of the given data type in bytes.
+     *
+     * @see #TYPE_ASCII
+     * @see #TYPE_LONG
+     * @see #TYPE_RATIONAL
+     * @see #TYPE_UNDEFINED
+     * @see #TYPE_UNSIGNED_BYTE
+     * @see #TYPE_UNSIGNED_LONG
+     * @see #TYPE_UNSIGNED_RATIONAL
+     * @see #TYPE_UNSIGNED_SHORT
+     */
+    public static int getElementSize(short type) {
+        return TYPE_TO_SIZE_MAP[type];
+    }
+
+    /**
+     * Returns the ID of the IFD this tag belongs to.
+     *
+     * @see IfdId#TYPE_IFD_0
+     * @see IfdId#TYPE_IFD_1
+     * @see IfdId#TYPE_IFD_EXIF
+     * @see IfdId#TYPE_IFD_GPS
+     * @see IfdId#TYPE_IFD_INTEROPERABILITY
+     */
+    public int getIfd() {
+        return mIfd;
+    }
+
+    protected void setIfd(int ifdId) {
+        mIfd = ifdId;
+    }
+
+    /**
+     * Gets the TID of this tag.
+     */
+    public short getTagId() {
+        return mTagId;
+    }
+
+    /**
+     * Gets the data type of this tag
+     *
+     * @see #TYPE_ASCII
+     * @see #TYPE_LONG
+     * @see #TYPE_RATIONAL
+     * @see #TYPE_UNDEFINED
+     * @see #TYPE_UNSIGNED_BYTE
+     * @see #TYPE_UNSIGNED_LONG
+     * @see #TYPE_UNSIGNED_RATIONAL
+     * @see #TYPE_UNSIGNED_SHORT
+     */
+    public short getDataType() {
+        return mDataType;
+    }
+
+    /**
+     * Gets the total data size in bytes of the value of this tag.
+     */
+    public int getDataSize() {
+        return getComponentCount() * getElementSize(getDataType());
+    }
+
+    /**
+     * Gets the component count of this tag.
+     */
+
+    // TODO: fix integer overflows with this
+    public int getComponentCount() {
+        return mComponentCountActual;
+    }
+
+    /**
+     * Sets the component count of this tag. Call this function before
+     * setValue() if the length of value does not match the component count.
+     */
+    protected void forceSetComponentCount(int count) {
+        mComponentCountActual = count;
+    }
+
+    /**
+     * Returns true if this ExifTag contains value; otherwise, this tag will
+     * contain an offset value that is determined when the tag is written.
+     */
+    public boolean hasValue() {
+        return mValue != null;
+    }
+
+    /**
+     * Sets integer values into this tag. This method should be used for tags of
+     * type {@link #TYPE_UNSIGNED_SHORT}. This method will fail if:
+     * <ul>
+     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_SHORT},
+     * {@link #TYPE_UNSIGNED_LONG}, or {@link #TYPE_LONG}.</li>
+     * <li>The value overflows.</li>
+     * <li>The value.length does NOT match the component count in the definition
+     * for this tag.</li>
+     * </ul>
+     */
+    public boolean setValue(int[] value) {
+        if (checkBadComponentCount(value.length)) {
+            return false;
+        }
+        if (mDataType != TYPE_UNSIGNED_SHORT && mDataType != TYPE_LONG &&
+                mDataType != TYPE_UNSIGNED_LONG) {
+            return false;
+        }
+        if (mDataType == TYPE_UNSIGNED_SHORT && checkOverflowForUnsignedShort(value)) {
+            return false;
+        } else if (mDataType == TYPE_UNSIGNED_LONG && checkOverflowForUnsignedLong(value)) {
+            return false;
+        }
+
+        long[] data = new long[value.length];
+        for (int i = 0; i < value.length; i++) {
+            data[i] = value[i];
+        }
+        mValue = data;
+        mComponentCountActual = value.length;
+        return true;
+    }
+
+    /**
+     * Sets integer value into this tag. This method should be used for tags of
+     * type {@link #TYPE_UNSIGNED_SHORT}, or {@link #TYPE_LONG}. This method
+     * will fail if:
+     * <ul>
+     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_SHORT},
+     * {@link #TYPE_UNSIGNED_LONG}, or {@link #TYPE_LONG}.</li>
+     * <li>The value overflows.</li>
+     * <li>The component count in the definition of this tag is not 1.</li>
+     * </ul>
+     */
+    public boolean setValue(int value) {
+        return setValue(new int[] {
+                value
+        });
+    }
+
+    /**
+     * Sets long values into this tag. This method should be used for tags of
+     * type {@link #TYPE_UNSIGNED_LONG}. This method will fail if:
+     * <ul>
+     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_LONG}.</li>
+     * <li>The value overflows.</li>
+     * <li>The value.length does NOT match the component count in the definition
+     * for this tag.</li>
+     * </ul>
+     */
+    public boolean setValue(long[] value) {
+        if (checkBadComponentCount(value.length) || mDataType != TYPE_UNSIGNED_LONG) {
+            return false;
+        }
+        if (checkOverflowForUnsignedLong(value)) {
+            return false;
+        }
+        mValue = value;
+        mComponentCountActual = value.length;
+        return true;
+    }
+
+    /**
+     * Sets long values into this tag. This method should be used for tags of
+     * type {@link #TYPE_UNSIGNED_LONG}. This method will fail if:
+     * <ul>
+     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_LONG}.</li>
+     * <li>The value overflows.</li>
+     * <li>The component count in the definition for this tag is not 1.</li>
+     * </ul>
+     */
+    public boolean setValue(long value) {
+        return setValue(new long[] {
+                value
+        });
+    }
+
+    /**
+     * Sets a string value into this tag. This method should be used for tags of
+     * type {@link #TYPE_ASCII}. The string is converted to an ASCII string.
+     * Characters that cannot be converted are replaced with '?'. The length of
+     * the string must be equal to either (component count -1) or (component
+     * count). The final byte will be set to the string null terminator '\0',
+     * overwriting the last character in the string if the value.length is equal
+     * to the component count. This method will fail if:
+     * <ul>
+     * <li>The data type is not {@link #TYPE_ASCII} or {@link #TYPE_UNDEFINED}.</li>
+     * <li>The length of the string is not equal to (component count -1) or
+     * (component count) in the definition for this tag.</li>
+     * </ul>
+     */
+    public boolean setValue(String value) {
+        if (mDataType != TYPE_ASCII && mDataType != TYPE_UNDEFINED) {
+            return false;
+        }
+
+        byte[] buf = value.getBytes(US_ASCII);
+        byte[] finalBuf = buf;
+        if (buf.length > 0) {
+            finalBuf = (buf[buf.length - 1] == 0 || mDataType == TYPE_UNDEFINED) ? buf : Arrays
+                .copyOf(buf, buf.length + 1);
+        } else if (mDataType == TYPE_ASCII && mComponentCountActual == 1) {
+            finalBuf = new byte[] { 0 };
+        }
+        int count = finalBuf.length;
+        if (checkBadComponentCount(count)) {
+            return false;
+        }
+        mComponentCountActual = count;
+        mValue = finalBuf;
+        return true;
+    }
+
+    /**
+     * Sets Rational values into this tag. This method should be used for tags
+     * of type {@link #TYPE_UNSIGNED_RATIONAL}, or {@link #TYPE_RATIONAL}. This
+     * method will fail if:
+     * <ul>
+     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_RATIONAL}
+     * or {@link #TYPE_RATIONAL}.</li>
+     * <li>The value overflows.</li>
+     * <li>The value.length does NOT match the component count in the definition
+     * for this tag.</li>
+     * </ul>
+     *
+     * @see Rational
+     */
+    public boolean setValue(Rational[] value) {
+        if (checkBadComponentCount(value.length)) {
+            return false;
+        }
+        if (mDataType != TYPE_UNSIGNED_RATIONAL && mDataType != TYPE_RATIONAL) {
+            return false;
+        }
+        if (mDataType == TYPE_UNSIGNED_RATIONAL && checkOverflowForUnsignedRational(value)) {
+            return false;
+        } else if (mDataType == TYPE_RATIONAL && checkOverflowForRational(value)) {
+            return false;
+        }
+
+        mValue = value;
+        mComponentCountActual = value.length;
+        return true;
+    }
+
+    /**
+     * Sets a Rational value into this tag. This method should be used for tags
+     * of type {@link #TYPE_UNSIGNED_RATIONAL}, or {@link #TYPE_RATIONAL}. This
+     * method will fail if:
+     * <ul>
+     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_RATIONAL}
+     * or {@link #TYPE_RATIONAL}.</li>
+     * <li>The value overflows.</li>
+     * <li>The component count in the definition for this tag is not 1.</li>
+     * </ul>
+     *
+     * @see Rational
+     */
+    public boolean setValue(Rational value) {
+        return setValue(new Rational[] {
+                value
+        });
+    }
+
+    /**
+     * Sets byte values into this tag. This method should be used for tags of
+     * type {@link #TYPE_UNSIGNED_BYTE} or {@link #TYPE_UNDEFINED}. This method
+     * will fail if:
+     * <ul>
+     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_BYTE} or
+     * {@link #TYPE_UNDEFINED} .</li>
+     * <li>The length does NOT match the component count in the definition for
+     * this tag.</li>
+     * </ul>
+     */
+    public boolean setValue(byte[] value, int offset, int length) {
+        if (checkBadComponentCount(length)) {
+            return false;
+        }
+        if (mDataType != TYPE_UNSIGNED_BYTE && mDataType != TYPE_UNDEFINED) {
+            return false;
+        }
+        mValue = new byte[length];
+        System.arraycopy(value, offset, mValue, 0, length);
+        mComponentCountActual = length;
+        return true;
+    }
+
+    /**
+     * Equivalent to setValue(value, 0, value.length).
+     */
+    public boolean setValue(byte[] value) {
+        return setValue(value, 0, value.length);
+    }
+
+    /**
+     * Sets byte value into this tag. This method should be used for tags of
+     * type {@link #TYPE_UNSIGNED_BYTE} or {@link #TYPE_UNDEFINED}. This method
+     * will fail if:
+     * <ul>
+     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_BYTE} or
+     * {@link #TYPE_UNDEFINED} .</li>
+     * <li>The component count in the definition for this tag is not 1.</li>
+     * </ul>
+     */
+    public boolean setValue(byte value) {
+        return setValue(new byte[] {
+                value
+        });
+    }
+
+    /**
+     * Sets the value for this tag using an appropriate setValue method for the
+     * given object. This method will fail if:
+     * <ul>
+     * <li>The corresponding setValue method for the class of the object passed
+     * in would fail.</li>
+     * <li>There is no obvious way to cast the object passed in into an EXIF tag
+     * type.</li>
+     * </ul>
+     */
+    public boolean setValue(Object obj) {
+        if (obj == null) {
+            return false;
+        } else if (obj instanceof Short) {
+            return setValue(((Short) obj).shortValue() & 0x0ffff);
+        } else if (obj instanceof String) {
+            return setValue((String) obj);
+        } else if (obj instanceof int[]) {
+            return setValue((int[]) obj);
+        } else if (obj instanceof long[]) {
+            return setValue((long[]) obj);
+        } else if (obj instanceof Rational) {
+            return setValue((Rational) obj);
+        } else if (obj instanceof Rational[]) {
+            return setValue((Rational[]) obj);
+        } else if (obj instanceof byte[]) {
+            return setValue((byte[]) obj);
+        } else if (obj instanceof Integer) {
+            return setValue(((Integer) obj).intValue());
+        } else if (obj instanceof Long) {
+            return setValue(((Long) obj).longValue());
+        } else if (obj instanceof Byte) {
+            return setValue(((Byte) obj).byteValue());
+        } else if (obj instanceof Short[]) {
+            // Nulls in this array are treated as zeroes.
+            Short[] arr = (Short[]) obj;
+            int[] fin = new int[arr.length];
+            for (int i = 0; i < arr.length; i++) {
+                fin[i] = (arr[i] == null) ? 0 : arr[i].shortValue() & 0x0ffff;
+            }
+            return setValue(fin);
+        } else if (obj instanceof Integer[]) {
+            // Nulls in this array are treated as zeroes.
+            Integer[] arr = (Integer[]) obj;
+            int[] fin = new int[arr.length];
+            for (int i = 0; i < arr.length; i++) {
+                fin[i] = (arr[i] == null) ? 0 : arr[i].intValue();
+            }
+            return setValue(fin);
+        } else if (obj instanceof Long[]) {
+            // Nulls in this array are treated as zeroes.
+            Long[] arr = (Long[]) obj;
+            long[] fin = new long[arr.length];
+            for (int i = 0; i < arr.length; i++) {
+                fin[i] = (arr[i] == null) ? 0 : arr[i].longValue();
+            }
+            return setValue(fin);
+        } else if (obj instanceof Byte[]) {
+            // Nulls in this array are treated as zeroes.
+            Byte[] arr = (Byte[]) obj;
+            byte[] fin = new byte[arr.length];
+            for (int i = 0; i < arr.length; i++) {
+                fin[i] = (arr[i] == null) ? 0 : arr[i].byteValue();
+            }
+            return setValue(fin);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Sets a timestamp to this tag. The method converts the timestamp with the
+     * format of "yyyy:MM:dd kk:mm:ss" and calls {@link #setValue(String)}. This
+     * method will fail if the data type is not {@link #TYPE_ASCII} or the
+     * component count of this tag is not 20 or undefined.
+     *
+     * @param time the number of milliseconds since Jan. 1, 1970 GMT
+     * @return true on success
+     */
+    public boolean setTimeValue(long time) {
+        // synchronized on TIME_FORMAT as SimpleDateFormat is not thread safe
+        synchronized (TIME_FORMAT) {
+            return setValue(TIME_FORMAT.format(new Date(time)));
+        }
+    }
+
+    /**
+     * Gets the value as a String. This method should be used for tags of type
+     * {@link #TYPE_ASCII}.
+     *
+     * @return the value as a String, or null if the tag's value does not exist
+     *         or cannot be converted to a String.
+     */
+    public String getValueAsString() {
+        if (mValue == null) {
+            return null;
+        } else if (mValue instanceof String) {
+            return (String) mValue;
+        } else if (mValue instanceof byte[]) {
+            return new String((byte[]) mValue, US_ASCII);
+        }
+        return null;
+    }
+
+    /**
+     * Gets the value as a String. This method should be used for tags of type
+     * {@link #TYPE_ASCII}.
+     *
+     * @param defaultValue the String to return if the tag's value does not
+     *            exist or cannot be converted to a String.
+     * @return the tag's value as a String, or the defaultValue.
+     */
+    public String getValueAsString(String defaultValue) {
+        String s = getValueAsString();
+        if (s == null) {
+            return defaultValue;
+        }
+        return s;
+    }
+
+    /**
+     * Gets the value as a byte array. This method should be used for tags of
+     * type {@link #TYPE_UNDEFINED} or {@link #TYPE_UNSIGNED_BYTE}.
+     *
+     * @return the value as a byte array, or null if the tag's value does not
+     *         exist or cannot be converted to a byte array.
+     */
+    public byte[] getValueAsBytes() {
+        if (mValue instanceof byte[]) {
+            return (byte[]) mValue;
+        }
+        return null;
+    }
+
+    /**
+     * Gets the value as a byte. If there are more than 1 bytes in this value,
+     * gets the first byte. This method should be used for tags of type
+     * {@link #TYPE_UNDEFINED} or {@link #TYPE_UNSIGNED_BYTE}.
+     *
+     * @param defaultValue the byte to return if tag's value does not exist or
+     *            cannot be converted to a byte.
+     * @return the tag's value as a byte, or the defaultValue.
+     */
+    public byte getValueAsByte(byte defaultValue) {
+        byte[] b = getValueAsBytes();
+        if (b == null || b.length < 1) {
+            return defaultValue;
+        }
+        return b[0];
+    }
+
+    /**
+     * Gets the value as an array of Rationals. This method should be used for
+     * tags of type {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}.
+     *
+     * @return the value as as an array of Rationals, or null if the tag's value
+     *         does not exist or cannot be converted to an array of Rationals.
+     */
+    public Rational[] getValueAsRationals() {
+        if (mValue instanceof Rational[]) {
+            return (Rational[]) mValue;
+        }
+        return null;
+    }
+
+    /**
+     * Gets the value as a Rational. If there are more than 1 Rationals in this
+     * value, gets the first one. This method should be used for tags of type
+     * {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}.
+     *
+     * @param defaultValue the Rational to return if tag's value does not exist
+     *            or cannot be converted to a Rational.
+     * @return the tag's value as a Rational, or the defaultValue.
+     */
+    public Rational getValueAsRational(Rational defaultValue) {
+        Rational[] r = getValueAsRationals();
+        if (r == null || r.length < 1) {
+            return defaultValue;
+        }
+        return r[0];
+    }
+
+    /**
+     * Gets the value as a Rational. If there are more than 1 Rationals in this
+     * value, gets the first one. This method should be used for tags of type
+     * {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}.
+     *
+     * @param defaultValue the numerator of the Rational to return if tag's
+     *            value does not exist or cannot be converted to a Rational (the
+     *            denominator will be 1).
+     * @return the tag's value as a Rational, or the defaultValue.
+     */
+    public Rational getValueAsRational(long defaultValue) {
+        Rational defaultVal = new Rational(defaultValue, 1);
+        return getValueAsRational(defaultVal);
+    }
+
+    /**
+     * Gets the value as an array of ints. This method should be used for tags
+     * of type {@link #TYPE_UNSIGNED_SHORT}, {@link #TYPE_UNSIGNED_LONG}.
+     *
+     * @return the value as as an array of ints, or null if the tag's value does
+     *         not exist or cannot be converted to an array of ints.
+     */
+    public int[] getValueAsInts() {
+        if (mValue == null) {
+            return null;
+        } else if (mValue instanceof long[]) {
+            long[] val = (long[]) mValue;
+            int[] arr = new int[val.length];
+            for (int i = 0; i < val.length; i++) {
+                arr[i] = (int) val[i]; // Truncates
+            }
+            return arr;
+        }
+        return null;
+    }
+
+    /**
+     * Gets the value as an int. If there are more than 1 ints in this value,
+     * gets the first one. This method should be used for tags of type
+     * {@link #TYPE_UNSIGNED_SHORT}, {@link #TYPE_UNSIGNED_LONG}.
+     *
+     * @param defaultValue the int to return if tag's value does not exist or
+     *            cannot be converted to an int.
+     * @return the tag's value as a int, or the defaultValue.
+     */
+    public int getValueAsInt(int defaultValue) {
+        int[] i = getValueAsInts();
+        if (i == null || i.length < 1) {
+            return defaultValue;
+        }
+        return i[0];
+    }
+
+    /**
+     * Gets the value as an array of longs. This method should be used for tags
+     * of type {@link #TYPE_UNSIGNED_LONG}.
+     *
+     * @return the value as as an array of longs, or null if the tag's value
+     *         does not exist or cannot be converted to an array of longs.
+     */
+    public long[] getValueAsLongs() {
+        if (mValue instanceof long[]) {
+            return (long[]) mValue;
+        }
+        return null;
+    }
+
+    /**
+     * Gets the value or null if none exists. If there are more than 1 longs in
+     * this value, gets the first one. This method should be used for tags of
+     * type {@link #TYPE_UNSIGNED_LONG}.
+     *
+     * @param defaultValue the long to return if tag's value does not exist or
+     *            cannot be converted to a long.
+     * @return the tag's value as a long, or the defaultValue.
+     */
+    public long getValueAsLong(long defaultValue) {
+        long[] l = getValueAsLongs();
+        if (l == null || l.length < 1) {
+            return defaultValue;
+        }
+        return l[0];
+    }
+
+    /**
+     * Gets the tag's value or null if none exists.
+     */
+    public Object getValue() {
+        return mValue;
+    }
+
+    /**
+     * Gets a long representation of the value.
+     *
+     * @param defaultValue value to return if there is no value or value is a
+     *            rational with a denominator of 0.
+     * @return the tag's value as a long, or defaultValue if no representation
+     *         exists.
+     */
+    public long forceGetValueAsLong(long defaultValue) {
+        long[] l = getValueAsLongs();
+        if (l != null && l.length >= 1) {
+            return l[0];
+        }
+        byte[] b = getValueAsBytes();
+        if (b != null && b.length >= 1) {
+            return b[0];
+        }
+        Rational[] r = getValueAsRationals();
+        if (r != null && r.length >= 1 && r[0].getDenominator() != 0) {
+            return (long) r[0].toDouble();
+        }
+        return defaultValue;
+    }
+
+    /**
+     * Gets a string representation of the value.
+     */
+    public String forceGetValueAsString() {
+        if (mValue == null) {
+            return "";
+        } else if (mValue instanceof byte[]) {
+            if (mDataType == TYPE_ASCII) {
+                return new String((byte[]) mValue, US_ASCII);
+            } else {
+                return Arrays.toString((byte[]) mValue);
+            }
+        } else if (mValue instanceof long[]) {
+            if (((long[]) mValue).length == 1) {
+                return String.valueOf(((long[]) mValue)[0]);
+            } else {
+                return Arrays.toString((long[]) mValue);
+            }
+        } else if (mValue instanceof Object[]) {
+            if (((Object[]) mValue).length == 1) {
+                Object val = ((Object[]) mValue)[0];
+                if (val == null) {
+                    return "";
+                } else {
+                    return val.toString();
+                }
+            } else {
+                return Arrays.toString((Object[]) mValue);
+            }
+        } else {
+            return mValue.toString();
+        }
+    }
+
+    /**
+     * Gets the value for type {@link #TYPE_ASCII}, {@link #TYPE_LONG},
+     * {@link #TYPE_UNDEFINED}, {@link #TYPE_UNSIGNED_BYTE},
+     * {@link #TYPE_UNSIGNED_LONG}, or {@link #TYPE_UNSIGNED_SHORT}. For
+     * {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}, call
+     * {@link #getRational(int)} instead.
+     *
+     * @exception IllegalArgumentException if the data type is
+     *                {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}.
+     */
+    protected long getValueAt(int index) {
+        if (mValue instanceof long[]) {
+            return ((long[]) mValue)[index];
+        } else if (mValue instanceof byte[]) {
+            return ((byte[]) mValue)[index];
+        }
+        throw new IllegalArgumentException("Cannot get integer value from "
+                + convertTypeToString(mDataType));
+    }
+
+    /**
+     * Gets the {@link #TYPE_ASCII} data.
+     *
+     * @exception IllegalArgumentException If the type is NOT
+     *                {@link #TYPE_ASCII}.
+     */
+    protected String getString() {
+        if (mDataType != TYPE_ASCII) {
+            throw new IllegalArgumentException("Cannot get ASCII value from "
+                    + convertTypeToString(mDataType));
+        }
+        return new String((byte[]) mValue, US_ASCII);
+    }
+
+    /*
+     * Get the converted ascii byte. Used by ExifOutputStream.
+     */
+    protected byte[] getStringByte() {
+        return (byte[]) mValue;
+    }
+
+    /**
+     * Gets the {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL} data.
+     *
+     * @exception IllegalArgumentException If the type is NOT
+     *                {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}.
+     */
+    protected Rational getRational(int index) {
+        if ((mDataType != TYPE_RATIONAL) && (mDataType != TYPE_UNSIGNED_RATIONAL)) {
+            throw new IllegalArgumentException("Cannot get RATIONAL value from "
+                    + convertTypeToString(mDataType));
+        }
+        return ((Rational[]) mValue)[index];
+    }
+
+    /**
+     * Equivalent to getBytes(buffer, 0, buffer.length).
+     */
+    protected void getBytes(byte[] buf) {
+        getBytes(buf, 0, buf.length);
+    }
+
+    /**
+     * Gets the {@link #TYPE_UNDEFINED} or {@link #TYPE_UNSIGNED_BYTE} data.
+     *
+     * @param buf the byte array in which to store the bytes read.
+     * @param offset the initial position in buffer to store the bytes.
+     * @param length the maximum number of bytes to store in buffer. If length >
+     *            component count, only the valid bytes will be stored.
+     * @exception IllegalArgumentException If the type is NOT
+     *                {@link #TYPE_UNDEFINED} or {@link #TYPE_UNSIGNED_BYTE}.
+     */
+    protected void getBytes(byte[] buf, int offset, int length) {
+        if ((mDataType != TYPE_UNDEFINED) && (mDataType != TYPE_UNSIGNED_BYTE)) {
+            throw new IllegalArgumentException("Cannot get BYTE value from "
+                    + convertTypeToString(mDataType));
+        }
+        System.arraycopy(mValue, 0, buf, offset,
+                (length > mComponentCountActual) ? mComponentCountActual : length);
+    }
+
+    /**
+     * Gets the offset of this tag. This is only valid if this data size > 4 and
+     * contains an offset to the location of the actual value.
+     */
+    protected int getOffset() {
+        return mOffset;
+    }
+
+    /**
+     * Sets the offset of this tag.
+     */
+    protected void setOffset(int offset) {
+        mOffset = offset;
+    }
+
+    protected void setHasDefinedCount(boolean d) {
+        mHasDefinedDefaultComponentCount = d;
+    }
+
+    protected boolean hasDefinedCount() {
+        return mHasDefinedDefaultComponentCount;
+    }
+
+    private boolean checkBadComponentCount(int count) {
+        if (mHasDefinedDefaultComponentCount && (mComponentCountActual != count)) {
+            return true;
+        }
+        return false;
+    }
+
+    private static String convertTypeToString(short type) {
+        switch (type) {
+            case TYPE_UNSIGNED_BYTE:
+                return "UNSIGNED_BYTE";
+            case TYPE_ASCII:
+                return "ASCII";
+            case TYPE_UNSIGNED_SHORT:
+                return "UNSIGNED_SHORT";
+            case TYPE_UNSIGNED_LONG:
+                return "UNSIGNED_LONG";
+            case TYPE_UNSIGNED_RATIONAL:
+                return "UNSIGNED_RATIONAL";
+            case TYPE_UNDEFINED:
+                return "UNDEFINED";
+            case TYPE_LONG:
+                return "LONG";
+            case TYPE_RATIONAL:
+                return "RATIONAL";
+            default:
+                return "";
+        }
+    }
+
+    private boolean checkOverflowForUnsignedShort(int[] value) {
+        for (int v : value) {
+            if (v > UNSIGNED_SHORT_MAX || v < 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean checkOverflowForUnsignedLong(long[] value) {
+        for (long v : value) {
+            if (v < 0 || v > UNSIGNED_LONG_MAX) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean checkOverflowForUnsignedLong(int[] value) {
+        for (int v : value) {
+            if (v < 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean checkOverflowForUnsignedRational(Rational[] value) {
+        for (Rational v : value) {
+            if (v.getNumerator() < 0 || v.getDenominator() < 0
+                    || v.getNumerator() > UNSIGNED_LONG_MAX
+                    || v.getDenominator() > UNSIGNED_LONG_MAX) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean checkOverflowForRational(Rational[] value) {
+        for (Rational v : value) {
+            if (v.getNumerator() < LONG_MIN || v.getDenominator() < LONG_MIN
+                    || v.getNumerator() > LONG_MAX
+                    || v.getDenominator() > LONG_MAX) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj instanceof ExifTag) {
+            ExifTag tag = (ExifTag) obj;
+            if (tag.mTagId != this.mTagId
+                    || tag.mComponentCountActual != this.mComponentCountActual
+                    || tag.mDataType != this.mDataType) {
+                return false;
+            }
+            if (mValue != null) {
+                if (tag.mValue == null) {
+                    return false;
+                } else if (mValue instanceof long[]) {
+                    if (!(tag.mValue instanceof long[])) {
+                        return false;
+                    }
+                    return Arrays.equals((long[]) mValue, (long[]) tag.mValue);
+                } else if (mValue instanceof Rational[]) {
+                    if (!(tag.mValue instanceof Rational[])) {
+                        return false;
+                    }
+                    return Arrays.equals((Rational[]) mValue, (Rational[]) tag.mValue);
+                } else if (mValue instanceof byte[]) {
+                    if (!(tag.mValue instanceof byte[])) {
+                        return false;
+                    }
+                    return Arrays.equals((byte[]) mValue, (byte[]) tag.mValue);
+                } else {
+                    return mValue.equals(tag.mValue);
+                }
+            } else {
+                return tag.mValue == null;
+            }
+        }
+        return false;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return String.format("tag id: %04X\n", mTagId) + "ifd id: " + mIfd + "\ntype: "
+                + convertTypeToString(mDataType) + "\ncount: " + mComponentCountActual
+                + "\noffset: " + mOffset + "\nvalue: " + forceGetValueAsString() + "\n";
+    }
+
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/IfdData.java b/imagepicker/src/main/java/com/android/mms/exif/IfdData.java
new file mode 100644
index 0000000..992cc6f
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/IfdData.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class stores all the tags in an IFD.
+ *
+ * @see ExifData
+ * @see ExifTag
+ */
+class IfdData {
+
+    private final int mIfdId;
+    private final Map<Short, ExifTag> mExifTags = new HashMap<Short, ExifTag>();
+    private int mOffsetToNextIfd = 0;
+    private static final int[] sIfds = {
+            IfdId.TYPE_IFD_0, IfdId.TYPE_IFD_1, IfdId.TYPE_IFD_EXIF,
+            IfdId.TYPE_IFD_INTEROPERABILITY, IfdId.TYPE_IFD_GPS
+    };
+    /**
+     * Creates an IfdData with given IFD ID.
+     *
+     * @see IfdId#TYPE_IFD_0
+     * @see IfdId#TYPE_IFD_1
+     * @see IfdId#TYPE_IFD_EXIF
+     * @see IfdId#TYPE_IFD_GPS
+     * @see IfdId#TYPE_IFD_INTEROPERABILITY
+     */
+    IfdData(int ifdId) {
+        mIfdId = ifdId;
+    }
+
+    static protected int[] getIfds() {
+        return sIfds;
+    }
+
+    /**
+     * Get a array the contains all {@link ExifTag} in this IFD.
+     */
+    protected ExifTag[] getAllTags() {
+        return mExifTags.values().toArray(new ExifTag[mExifTags.size()]);
+    }
+
+    /**
+     * Gets the ID of this IFD.
+     *
+     * @see IfdId#TYPE_IFD_0
+     * @see IfdId#TYPE_IFD_1
+     * @see IfdId#TYPE_IFD_EXIF
+     * @see IfdId#TYPE_IFD_GPS
+     * @see IfdId#TYPE_IFD_INTEROPERABILITY
+     */
+    protected int getId() {
+        return mIfdId;
+    }
+
+    /**
+     * Gets the {@link ExifTag} with given tag id. Return null if there is no
+     * such tag.
+     */
+    protected ExifTag getTag(short tagId) {
+        return mExifTags.get(tagId);
+    }
+
+    /**
+     * Adds or replaces a {@link ExifTag}.
+     */
+    protected ExifTag setTag(ExifTag tag) {
+        tag.setIfd(mIfdId);
+        return mExifTags.put(tag.getTagId(), tag);
+    }
+
+    protected boolean checkCollision(short tagId) {
+        return mExifTags.get(tagId) != null;
+    }
+
+    /**
+     * Removes the tag of the given ID
+     */
+    protected void removeTag(short tagId) {
+        mExifTags.remove(tagId);
+    }
+
+    /**
+     * Gets the tags count in the IFD.
+     */
+    protected int getTagCount() {
+        return mExifTags.size();
+    }
+
+    /**
+     * Sets the offset of next IFD.
+     */
+    protected void setOffsetToNextIfd(int offset) {
+        mOffsetToNextIfd = offset;
+    }
+
+    /**
+     * Gets the offset of next IFD.
+     */
+    protected int getOffsetToNextIfd() {
+        return mOffsetToNextIfd;
+    }
+
+    /**
+     * Returns true if all tags in this two IFDs are equal. Note that tags of
+     * IFDs offset or thumbnail offset will be ignored.
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (obj instanceof IfdData) {
+            IfdData data = (IfdData) obj;
+            if (data.getId() == mIfdId && data.getTagCount() == getTagCount()) {
+                ExifTag[] tags = data.getAllTags();
+                for (ExifTag tag : tags) {
+                    if (ExifInterface.isOffsetTag(tag.getTagId())) {
+                        continue;
+                    }
+                    ExifTag tag2 = mExifTags.get(tag.getTagId());
+                    if (!tag.equals(tag2)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/IfdId.java b/imagepicker/src/main/java/com/android/mms/exif/IfdId.java
new file mode 100644
index 0000000..e9180a5
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/IfdId.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+/**
+ * The constants of the IFD ID defined in EXIF spec.
+ */
+public interface IfdId {
+    public static final int TYPE_IFD_0 = 0;
+    public static final int TYPE_IFD_1 = 1;
+    public static final int TYPE_IFD_EXIF = 2;
+    public static final int TYPE_IFD_INTEROPERABILITY = 3;
+    public static final int TYPE_IFD_GPS = 4;
+    /* This is used in ExifData to allocate enough IfdData */
+    static final int TYPE_IFD_COUNT = 5;
+
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/JpegHeader.java b/imagepicker/src/main/java/com/android/mms/exif/JpegHeader.java
new file mode 100644
index 0000000..d41b0ad
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/JpegHeader.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+class JpegHeader {
+    public static final short SOI =  (short) 0xFFD8;
+    public static final short APP1 = (short) 0xFFE1;
+    public static final short APP0 = (short) 0xFFE0;
+    public static final short EOI = (short) 0xFFD9;
+
+    /**
+     *  SOF (start of frame). All value between SOF0 and SOF15 is SOF marker except for DHT, JPG,
+     *  and DAC marker.
+     */
+    public static final short SOF0 = (short) 0xFFC0;
+    public static final short SOF15 = (short) 0xFFCF;
+    public static final short DHT = (short) 0xFFC4;
+    public static final short JPG = (short) 0xFFC8;
+    public static final short DAC = (short) 0xFFCC;
+
+    public static final boolean isSofMarker(short marker) {
+        return marker >= SOF0 && marker <= SOF15 && marker != DHT && marker != JPG
+                && marker != DAC;
+    }
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/OrderedDataOutputStream.java b/imagepicker/src/main/java/com/android/mms/exif/OrderedDataOutputStream.java
new file mode 100644
index 0000000..961c537
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/OrderedDataOutputStream.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+class OrderedDataOutputStream extends FilterOutputStream {
+    private final ByteBuffer mByteBuffer = ByteBuffer.allocate(4);
+
+    public OrderedDataOutputStream(OutputStream out) {
+        super(out);
+    }
+
+    public OrderedDataOutputStream setByteOrder(ByteOrder order) {
+        mByteBuffer.order(order);
+        return this;
+    }
+
+    public OrderedDataOutputStream writeShort(short value) throws IOException {
+        mByteBuffer.rewind();
+        mByteBuffer.putShort(value);
+        out.write(mByteBuffer.array(), 0, 2);
+        return this;
+    }
+
+    public OrderedDataOutputStream writeInt(int value) throws IOException {
+        mByteBuffer.rewind();
+        mByteBuffer.putInt(value);
+        out.write(mByteBuffer.array());
+        return this;
+    }
+
+    public OrderedDataOutputStream writeRational(Rational rational) throws IOException {
+        writeInt((int) rational.getNumerator());
+        writeInt((int) rational.getDenominator());
+        return this;
+    }
+}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/Rational.java b/imagepicker/src/main/java/com/android/mms/exif/Rational.java
new file mode 100644
index 0000000..8ab477c
--- /dev/null
+++ b/imagepicker/src/main/java/com/android/mms/exif/Rational.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.exif;
+
+import androidx.annotation.NonNull;
+
+/**
+ * The rational data type of EXIF tag. Contains a pair of longs representing the
+ * numerator and denominator of a Rational number.
+ */
+public class Rational {
+
+    private final long mNumerator;
+    private final long mDenominator;
+
+    /**
+     * Create a Rational with a given numerator and denominator.
+     *
+     * @param nominator
+     * @param denominator
+     */
+    public Rational(long nominator, long denominator) {
+        mNumerator = nominator;
+        mDenominator = denominator;
+    }
+
+    /**
+     * Create a copy of a Rational.
+     */
+    public Rational(Rational r) {
+        mNumerator = r.mNumerator;
+        mDenominator = r.mDenominator;
+    }
+
+    /**
+     * Gets the numerator of the rational.
+     */
+    public long getNumerator() {
+        return mNumerator;
+    }
+
+    /**
+     * Gets the denominator of the rational
+     */
+    public long getDenominator() {
+        return mDenominator;
+    }
+
+    /**
+     * Gets the rational value as type double. Will cause a divide-by-zero error
+     * if the denominator is 0.
+     */
+    public double toDouble() {
+        return mNumerator / (double) mDenominator;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        if (obj instanceof Rational) {
+            Rational data = (Rational) obj;
+            return mNumerator == data.mNumerator && mDenominator == data.mDenominator;
+        }
+        return false;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return mNumerator + "/" + mDenominator;
+    }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java
new file mode 100644
index 0000000..919402a
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java
@@ -0,0 +1,813 @@
+/***
+ Copyright (c) 2015-2016 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.annotation.TargetApi;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.ResultReceiver;
+import android.provider.MediaStore;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+
+import androidx.annotation.NonNull;
+
+import com.commonsware.cwac.cam2.util.Utils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+
+/**
+ * Base class for activities that integrate with CameraFragment
+ * for taking pictures or recording video.
+ */
+abstract public class AbstractCameraActivity extends Activity {
+    /**
+     * List<FlashMode> indicating the desired flash modes,
+     * or null for always taking the default. These are
+     * considered in priority-first order (i.e., we will use
+     * the first FlashMode if the device supports it, otherwise
+     * we will use the second FlashMode, ...). If there is no
+     * match, whatever the default device behavior is will be
+     * used.
+     */
+    public static final String EXTRA_FLASH_MODES =
+            "cwac_cam2_flash_modes";
+
+    /**
+     * True if we should allow the user to change the flash mode
+     * on the fly (if the camera supports it), false otherwise.
+     * Defaults to false.
+     */
+    public static final String EXTRA_ALLOW_SWITCH_FLASH_MODE =
+            "cwac_cam2_allow_switch_flash_mode";
+
+    /**
+     * A ResultReceiver to be invoked on any error that the library
+     * cannot handle internally.
+     */
+    public static final String EXTRA_UNHANDLED_ERROR_RECEIVER =
+            "cwac_cam2_unhandled_error_receiver";
+
+    /**
+     * Extra name for indicating what facing rule for the
+     * camera you wish to use. The value should be a
+     * CameraSelectionCriteria.Facing instance.
+     */
+    public static final String EXTRA_FACING = "cwac_cam2_facing";
+
+    /**
+     * Extra name for indicating that the requested facing
+     * must be an exact match, without gracefully degrading to
+     * whatever camera happens to be available. If set to true,
+     * requests to take a picture, for which the desired camera
+     * is not available, will be cancelled. Defaults to false.
+     */
+    public static final String EXTRA_FACING_EXACT_MATCH =
+            "cwac_cam2_facing_exact_match";
+
+    /**
+     * Extra name for indicating whether extra diagnostic
+     * information should be reported, particularly for errors.
+     * Default is false.
+     */
+    public static final String EXTRA_DEBUG_ENABLED = "cwac_cam2_debug";
+
+    /**
+     * Extra name for indicating if MediaStore should be updated
+     * to reflect a newly-taken picture. Only relevant if
+     * a file:// Uri is used. Default to false.
+     */
+    public static final String EXTRA_UPDATE_MEDIA_STORE =
+            "cwac_cam2_update_media_store";
+
+    /**
+     * DO NOT USE. Use EXTRA_FORCE_ENGINE instead, please.
+     */
+    @Deprecated
+    public static final String EXTRA_FORCE_CLASSIC = "cwac_cam2_force_classic";
+
+    /**
+     * If set to a CameraEngine.ID value (CLASSIC or CAMERA2), will
+     * force the use of that engine. If left null/unset, the default
+     * is based on what device we are running on.
+     */
+    public static final String EXTRA_FORCE_ENGINE = "cwac_cam2_force_engine";
+
+    /**
+     * If set to true, horizontally flips or mirrors the preview.
+     * Does not change the picture or video output. Used mostly for FFC,
+     * though will be honored for any camera. Defaults to false.
+     */
+    public static final String EXTRA_MIRROR_PREVIEW = "cwac_cam2_mirror_preview";
+
+    /**
+     * Extra name for focus mode to apply. Value should be one of the
+     * FocusMode enum values. Default is CONTINUOUS.
+     * If the desired focus mode is not available, the device default
+     * focus mode is used.
+     */
+    public static final String EXTRA_FOCUS_MODE = "cwac_cam2_focus_mode";
+
+    /**
+     * Extra name for orientation lock mode to apply. Value should be
+     * one of the OrientationLockMode values. Default, shockingly,
+     * is DEFAULT.
+     */
+    public static final String EXTRA_ORIENTATION_LOCK_MODE =
+            "cwac_cam2_olock_mode";
+
+    /**
+     * Extra name for whether the camera should allow zoom and
+     * how. Value should be a ZoomStyle (NONE, PINCH, SEEKBAR).
+     * Default is NONE.
+     */
+    public static final String EXTRA_ZOOM_STYLE =
+            "cwac_cam2_zoom_style";
+
+    /**
+     * Extra name for runtime permission policy. If true, we check
+     * for runtime permissions and fail fast if they are not already
+     * granted. If false, if we lack runtime permissions (and need them
+     * based on API level), we request them ourselves. Defaults to true.
+     */
+    public static final String EXTRA_FAIL_IF_NO_PERMISSION =
+            "cwac_cam2_fail_if_no_permission";
+
+    /**
+     * Extra name for whether the camera should show a "rule of thirds"
+     * overlay above the camera preview. Defaults to false.
+     */
+    public static final String EXTRA_SHOW_RULE_OF_THIRDS_GRID =
+            "cwac_cam2_show_rule_of_thirds_grid";
+
+    /**
+     * @return true if the activity wants FEATURE_ACTION_BAR_OVERLAY,
+     * false otherwise
+     */
+    abstract protected boolean needsOverlay();
+
+    /**
+     * @return false if we should hide the action bar outright
+     * (ignored if needsOverlay() returns true)
+     */
+    abstract protected boolean needsActionBar();
+
+    /**
+     * @return true if we are recording a video, false if we are
+     * taking a still picture
+     */
+    abstract protected boolean isVideo();
+
+    /**
+     * @return a CameraFragment for the given circumstances
+     */
+    abstract protected CameraFragment buildFragment();
+
+    /**
+     * @return array of the names of the permissions needed by
+     * this activity
+     */
+    abstract protected String[] getNeededPermissions();
+
+    /**
+     * Configure the CameraEngine for things that are specific
+     * to a subclass.
+     *
+     * @param engine the CameraEngine to configure
+     */
+    abstract protected void configEngine(CameraEngine engine);
+
+    protected static final String TAG_CAMERA = CameraFragment.class.getCanonicalName();
+    private static final int REQUEST_PERMS = 13401;
+    protected CameraFragment cameraFrag;
+    public static final EventBus BUS = new EventBus();
+
+    /**
+     * Standard lifecycle method, serving as the main entry
+     * point of the activity.
+     *
+     * @param savedInstanceState the state of a previous instance
+     */
+    @TargetApi(23)
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Utils.validateEnvironment(this, failIfNoPermissions());
+
+        OrientationLockMode olockMode =
+                (OrientationLockMode) getIntent().getSerializableExtra(EXTRA_ORIENTATION_LOCK_MODE);
+
+        lockOrientation(olockMode);
+
+        if (needsOverlay()) {
+            getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
+
+            // the following is nasty stuff to get rid of the action
+            // bar drop shadow, which still exists on some devices
+            // despite going into overlay mode (Samsung Galaxy S3, I'm
+            // looking at you)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                ActionBar ab = getActionBar();
+
+                if (ab != null) {
+                    getActionBar().setElevation(0);
+                }
+            } else {
+                View v = ((ViewGroup) getWindow().getDecorView()).getChildAt(0);
+
+                if (v != null) {
+                    v.setWillNotDraw(true);
+                }
+            }
+
+        } else if (!needsActionBar()) {
+            ActionBar ab = getActionBar();
+
+            if (ab != null) {
+                ab.hide();
+            }
+        }
+
+        if (useRuntimePermissions()) {
+            String[] perms = netPermissions(getNeededPermissions());
+
+            if (perms.length == 0) {
+                init();
+            } else if (!failIfNoPermissions()) {
+                requestPermissions(perms, REQUEST_PERMS);
+            } else {
+                throw new IllegalStateException("We lack the necessary permissions!");
+            }
+        } else {
+            init();
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        String[] perms = netPermissions(getNeededPermissions());
+
+        if (perms.length == 0) {
+            init();
+        } else {
+            setResult(RESULT_CANCELED);
+            finish();
+        }
+    }
+
+    /**
+     * Standard lifecycle method, for when the fragment moves into
+     * the started state. Passed along to the CameraController.
+     */
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        BUS.register(this);
+    }
+
+    /**
+     * Standard lifecycle method, for when the fragment moves into
+     * the stopped state. Passed along to the CameraController.
+     */
+    @Override
+    public void onStop() {
+        BUS.unregister(this);
+
+        if (cameraFrag != null) {
+            if (isChangingConfigurations()) {
+                cameraFrag.stopVideoRecording();
+            } else {
+                cameraFrag.shutdown();
+            }
+        }
+
+        super.onStop();
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_CAMERA) {
+            cameraFrag.performCameraAction();
+
+            return (true);
+        }
+
+        return (super.onKeyUp(keyCode, event));
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(CameraController.NoSuchCameraEvent event) {
+        finish();
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(CameraController.ControllerDestroyedEvent event) {
+        finish();
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(CameraEngine.CameraTwoGenericEvent event) {
+        finish();
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(CameraEngine.DeepImpactEvent event) {
+        finish();
+    }
+
+    protected Uri getOutputUri() {
+        Uri output = null;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            ClipData clipData = getIntent().getClipData();
+
+            if (clipData != null && clipData.getItemCount() > 0) {
+                output = clipData.getItemAt(0).getUri();
+            }
+        }
+
+        if (output == null) {
+            output = getIntent().getParcelableExtra(MediaStore.EXTRA_OUTPUT);
+        }
+
+        return (output);
+    }
+
+    protected void init() {
+        cameraFrag = (CameraFragment) getFragmentManager().findFragmentByTag(TAG_CAMERA);
+
+        boolean fragNeedsToBeAdded = false;
+
+        if (cameraFrag == null) {
+            cameraFrag = buildFragment();
+            fragNeedsToBeAdded = true;
+        }
+
+        FocusMode focusMode =
+                (FocusMode) getIntent().getSerializableExtra(EXTRA_FOCUS_MODE);
+        boolean allowChangeFlashMode =
+                getIntent().getBooleanExtra(EXTRA_ALLOW_SWITCH_FLASH_MODE, false);
+        ResultReceiver onError =
+                getIntent().getParcelableExtra(EXTRA_UNHANDLED_ERROR_RECEIVER);
+
+        CameraController ctrl =
+                new CameraController(focusMode, onError,
+                        allowChangeFlashMode, isVideo());
+
+        cameraFrag.setController(ctrl);
+        cameraFrag
+                .setMirrorPreview(getIntent()
+                        .getBooleanExtra(EXTRA_MIRROR_PREVIEW, false));
+
+        Facing facing =
+                (Facing) getIntent().getSerializableExtra(EXTRA_FACING);
+
+        if (facing == null) {
+            facing = Facing.BACK;
+        }
+
+        boolean match = getIntent()
+                .getBooleanExtra(EXTRA_FACING_EXACT_MATCH, false);
+        CameraSelectionCriteria criteria =
+                new CameraSelectionCriteria.Builder()
+                        .facing(facing)
+                        .facingExactMatch(match)
+                        .isVideo(isVideo())
+                        .build();
+        CameraEngine.ID forcedEngineId =
+                (CameraEngine.ID) getIntent().getSerializableExtra(EXTRA_FORCE_ENGINE);
+
+        ctrl.setEngine(CameraEngine.buildInstance(this, forcedEngineId), criteria);
+        ctrl.getEngine().setDebug(getIntent().getBooleanExtra(EXTRA_DEBUG_ENABLED, false));
+        configEngine(ctrl.getEngine());
+
+        if (fragNeedsToBeAdded) {
+            getFragmentManager()
+                    .beginTransaction()
+                    .add(android.R.id.content, cameraFrag, TAG_CAMERA)
+                    .commit();
+        }
+    }
+
+    boolean canSwitchSources() {
+        return (!getIntent().getBooleanExtra(EXTRA_FACING_EXACT_MATCH, false));
+    }
+
+    protected void lockOrientation(OrientationLockMode mode) {
+        if (mode == null || mode == OrientationLockMode.DEFAULT) {
+            int orientation = getResources().getConfiguration().orientation;
+
+            if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                setRequestedOrientation(SCREEN_ORIENTATION_LANDSCAPE);
+            } else if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                setRequestedOrientation(SCREEN_ORIENTATION_PORTRAIT);
+            } else {
+                setRequestedOrientation(SCREEN_ORIENTATION_UNSPECIFIED);
+            }
+        } else if (mode == OrientationLockMode.LANDSCAPE) {
+            setRequestedOrientation(SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+        } else {
+            setRequestedOrientation(
+                    SCREEN_ORIENTATION_SENSOR_PORTRAIT);
+        }
+    }
+
+    protected Intent buildResultIntent() {
+        return (new Intent());
+    }
+
+    @TargetApi(23)
+    private boolean hasPermission(String perm) {
+        if (useRuntimePermissions()) {
+            return (checkSelfPermission(perm) == PackageManager.PERMISSION_GRANTED);
+        }
+
+        return (true);
+    }
+
+    private boolean useRuntimePermissions() {
+        return (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1);
+    }
+
+    private boolean failIfNoPermissions() {
+        return (getIntent().getBooleanExtra(EXTRA_FAIL_IF_NO_PERMISSION, true));
+    }
+
+    private String[] netPermissions(String[] wanted) {
+        ArrayList<String> result = new ArrayList<String>();
+
+        for (String perm : wanted) {
+            if (!hasPermission(perm)) {
+                result.add(perm);
+            }
+        }
+
+        return (result.toArray(new String[result.size()]));
+    }
+
+    public enum Quality {
+        LOW(0), HIGH(1);
+
+        private final int value;
+
+        private Quality(int value) {
+            this.value = value;
+        }
+
+        int getValue() {
+            return (value);
+        }
+    }
+
+    abstract public static class IntentBuilder<T extends IntentBuilder> {
+        abstract public Intent buildChooserBaseIntent();
+
+        protected final Intent result;
+        private final Context ctxt;
+
+        /**
+         * Standard constructor. May throw a runtime exception
+         * if the environment is not set up properly (see
+         * validateEnvironment() on Utils).
+         *
+         * @param ctxt any Context will do
+         */
+        public IntentBuilder(Context ctxt, Class clazz) {
+            this.ctxt = ctxt.getApplicationContext();
+            result = new Intent(ctxt, clazz);
+        }
+
+        /**
+         * Returns the Intent defined by the builder.
+         *
+         * @return the Intent to use to start the activity
+         */
+        public Intent build() {
+            Utils.validateEnvironment(ctxt,
+                    result.getBooleanExtra(EXTRA_FAIL_IF_NO_PERMISSION, true));
+
+            return (result);
+        }
+
+        /**
+         * Returns an ACTION_CHOOSER Intent, to offer a choice
+         * between this library's activity and existing camera
+         * apps.
+         *
+         * @param title title for chooser dialog, or null
+         * @return the Intent to use to start the activity
+         */
+        public Intent buildChooser(CharSequence title) {
+            Intent original = build();
+
+            Intent toChooseFrom = buildChooserBaseIntent();
+
+            if (original.hasExtra(MediaStore.EXTRA_OUTPUT)) {
+                toChooseFrom.putExtra(MediaStore.EXTRA_OUTPUT,
+                        (Bundle) original.getParcelableExtra(MediaStore.EXTRA_OUTPUT));
+            }
+
+            Intent chooser = Intent.createChooser(toChooseFrom, title);
+
+            chooser.putExtra(Intent.EXTRA_INITIAL_INTENTS,
+                    new Intent[]{original});
+
+            return (chooser);
+        }
+
+        /**
+         * Indicates what camera should be used as the starting
+         * point. Defaults to the rear-facing camera.
+         *
+         * @param facing which camera to use
+         * @return the builder, for further configuration
+         */
+        public T facing(Facing facing) {
+            result.putExtra(EXTRA_FACING, facing);
+
+            return ((T) this);
+        }
+
+        /**
+         * Indicates that the desired facing value for the camera
+         * must be an exact match (and, if not, cancel the request).
+         *
+         * @return the builder, for further configuration
+         */
+        public T facingExactMatch() {
+            result.putExtra(EXTRA_FACING_EXACT_MATCH, true);
+
+            return ((T) this);
+        }
+
+        /**
+         * Call if you want extra diagnostic information dumped to
+         * LogCat. Not ideal for use in production.
+         *
+         * @return the builder, for further configuration
+         */
+        public T debug() {
+            result.putExtra(EXTRA_DEBUG_ENABLED, true);
+
+            return ((T) this);
+        }
+
+        /**
+         * Indicates where to write the picture to. Defaults to
+         * returning a thumbnail bitmap in the "data" extra, as
+         * with ACTION_IMAGE_CAPTURE. Note that you need to have
+         * write access to the supplied file.
+         *
+         * @param f file in which to write the picture
+         * @return the builder, for further configuration
+         */
+        public T to(File f) {
+            return ((T) to(Uri.fromFile(f)));
+        }
+
+        /**
+         * Indicates where to write the picture to. Defaults to
+         * returning a thumbnail bitmap in the "data" extra, as
+         * with ACTION_IMAGE_CAPTURE. Note that you need to have
+         * write access to the supplied Uri.
+         *
+         * @param output Uri to which to write the picture
+         * @return the builder, for further configuration
+         */
+        public T to(Uri output) {
+            result.putExtra(MediaStore.EXTRA_OUTPUT, output);
+
+            return ((T) this);
+        }
+
+        /**
+         * Indicates that the picture that is taken should be
+         * passed over to MediaStore for indexing. By default,
+         * this does not happen automatically and is the responsibility
+         * of your app, should the image be reachable by MediaStore
+         * in the first place. This setting is only relevant for file://
+         * Uri values.
+         *
+         * @return the builder, for further configuration
+         */
+        public T updateMediaStore() {
+            result.putExtra(EXTRA_UPDATE_MEDIA_STORE, true);
+
+            return ((T) this);
+        }
+
+        /**
+         * Forces the use of a specific engine based on its ID. Default
+         * is an engine chosen by the device we are running on.
+         *
+         * @param engineId CLASSIC or CAMERA2
+         * @return the builder, for further configuration
+         */
+        public T forceEngine(CameraEngine.ID engineId) {
+            result.putExtra(EXTRA_FORCE_ENGINE, engineId);
+
+            return ((T) this);
+        }
+
+        @Deprecated
+        public T forceClassic() {
+            return (forceEngine(CameraEngine.ID.CLASSIC));
+        }
+
+        /**
+         * Horizontally flips or mirrors the preview images.
+         *
+         * @return the builder, for further configuration
+         */
+        public T mirrorPreview() {
+            result.putExtra(EXTRA_MIRROR_PREVIEW, true);
+
+            return ((T) this);
+        }
+
+        /**
+         * Sets the desired focus mode. Default is CONTINUOUS.
+         *
+         * @return the builder, for further configuration
+         */
+        public T focusMode(FocusMode focusMode) {
+            result.putExtra(EXTRA_FOCUS_MODE, focusMode);
+
+            return ((T) this);
+        }
+
+        /**
+         * Sets the desired flash mode. This is a suggestion; if
+         * the device does not support this mode, the device default
+         * behavior will be used.
+         *
+         * @param mode the desired flash mode
+         * @return the builder, for further configuration
+         */
+        public T flashMode(FlashMode mode) {
+            return (flashModes(new FlashMode[]{mode}));
+        }
+
+        /**
+         * Sets the desired flash modes, in priority-first order
+         * (the first flash mode will be used if supported, otherwise
+         * the second flash mode will be used if supported, ...).
+         * These are a suggestion; if none of these modes are supported,
+         * the default device behavior will be used.
+         *
+         * @param modes the flash modes to try
+         * @return the builder, for further configuration
+         */
+        public T flashModes(FlashMode[] modes) {
+            return (flashModes(Arrays.asList(modes)));
+        }
+
+        /**
+         * Sets the desired flash modes, in priority-first order
+         * (the first flash mode will be used if supported, otherwise
+         * the second flash mode will be used if supported, ...).
+         * These are a suggestion; if none of these modes are supported,
+         * the default device behavior will be used.
+         *
+         * @param modes the flash modes to try
+         * @return the builder, for further configuration
+         */
+        public T flashModes(List<FlashMode> modes) {
+            result.putExtra(EXTRA_FLASH_MODES,
+                    new ArrayList<FlashMode>(modes));
+
+            return ((T) this);
+        }
+
+        /**
+         * Call if we should allow the user to change the flash mode
+         * on the fly (if the camera supports it).
+         */
+        public T allowSwitchFlashMode() {
+            result.putExtra(EXTRA_ALLOW_SWITCH_FLASH_MODE, true);
+
+            return ((T) this);
+        }
+
+        /**
+         * Indicates the video quality to use for recording this
+         * video. Matches EXTRA_VIDEO_QUALITY, except uses an enum
+         * for type safety. Note that this is also used for still
+         * image quality, despite the name of the extra.
+         *
+         * @param q LOW or HIGH
+         * @return the builder, for further configuration
+         */
+        public T quality(Quality q) {
+            result.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, q.getValue());
+
+            return ((T) this);
+        }
+
+        /**
+         * Provides a ResultReceiver, which will be invoked on any
+         * error that the library cannot handle itself.
+         *
+         * @param rr a ResultReceiver to get error information
+         * @return the builder, for further configuration
+         */
+        public T onError(ResultReceiver rr) {
+            result.putExtra(EXTRA_UNHANDLED_ERROR_RECEIVER, rr);
+
+            return ((T) this);
+        }
+
+        /**
+         * Specifies an OrientationLockMode to apply to the camera
+         * operation.
+         *
+         * @param mode an OrientationLockMode value
+         * @return the builder, for further configuration
+         */
+        public T orientationLockMode(OrientationLockMode mode) {
+            result.putExtra(EXTRA_ORIENTATION_LOCK_MODE, mode);
+
+            return ((T) this);
+        }
+
+        /**
+         * Call to configure the ZoomStyle to be used. Default
+         * is NONE.
+         *
+         * @return the builder, for further configuration
+         */
+        public T zoomStyle(ZoomStyle zoomStyle) {
+            result.putExtra(EXTRA_ZOOM_STYLE, zoomStyle);
+
+            return ((T) this);
+        }
+
+        /**
+         * Call to request that the library request permissions from the
+         * user, rather than that being handled by the app.
+         *
+         * @return the builder, for further configuration
+         */
+        public T requestPermissions() {
+            result.putExtra(EXTRA_FAIL_IF_NO_PERMISSION, false);
+
+            return ((T) this);
+        }
+
+        /**
+         * Call to request that we show a "rule of thirds" grid over the camera
+         * preview.
+         *
+         * @return the builder, for further configuration
+         */
+        public T showRuleOfThirdsGrid() {
+            result.putExtra(EXTRA_SHOW_RULE_OF_THIRDS_GRID, true);
+
+            return ((T) this);
+        }
+    }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractImageProcessor.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractImageProcessor.java
new file mode 100644
index 0000000..93d58b4
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractImageProcessor.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.content.Context;
+
+abstract public class AbstractImageProcessor implements ImageProcessor {
+  private final String tag;
+  private final Context ctxt;
+
+  public AbstractImageProcessor(Context ctxt) {
+    this(ctxt, null);
+  }
+
+  public AbstractImageProcessor(Context ctxt, String tag) {
+    this.ctxt=ctxt.getApplicationContext();
+    this.tag=tag;
+  }
+
+  @Override
+  public String getTag() {
+    return(tag==null ? getClass().getCanonicalName() : tag);
+  }
+
+  protected Context getContext() {
+    return(ctxt);
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraActivity.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraActivity.java
new file mode 100644
index 0000000..5886217
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraActivity.java
@@ -0,0 +1,341 @@
+/***
+ Copyright (c) 2015-2016 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.MediaStore;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Stock activity for taking pictures. Supports the same
+ * protocol, in terms of extras and return data, as does
+ * ACTION_IMAGE_CAPTURE.
+ */
+public class CameraActivity extends AbstractCameraActivity
+        implements ConfirmationFragment.Contract {
+
+    /**
+     * Extra name for indicating whether a confirmation screen
+     * should appear after taking the picture, or whether taking
+     * the picture should immediately return said picture. Defaults
+     * to true, meaning that the user should confirm the picture.
+     */
+    public static final String EXTRA_CONFIRM = "cwac_cam2_confirm";
+
+    /**
+     * Extra name for whether a preview frame should be saved
+     * to getExternalCacheDir() at the point when a picture
+     * is taken. This is for debugging purposes, to compare
+     * the preview frame with both the taken picture and what
+     * you see on the activity's preview. It is very unlikely
+     * that you will want this enabled in a production app.
+     * Defaults to false.
+     */
+    public static final String EXTRA_DEBUG_SAVE_PREVIEW_FRAME =
+            "cwac_cam2_save_preview";
+
+    /**
+     * Extra name for how much heap space we should try to use
+     * to load the picture for the confirmation screen. Should
+     * be a `float` greater than 0.0f and less than 1.0f.
+     * Defaults to not being used.
+     */
+    public static final String EXTRA_CONFIRMATION_QUALITY =
+            "cwac_cam2_confirmation_quality";
+
+    /**
+     * Extra name for boolean indicating if we should skip the
+     * default logic to rotate the image based on the EXIF orientation
+     * tag. Defaults to false (meaning: do the rotation if needed).
+     */
+    public static final String EXTRA_SKIP_ORIENTATION_NORMALIZATION =
+            "cwac_cam2_skip_orientation_normalization";
+
+    /**
+     * Extra name for duration of countdown timer, in seconds. If negative, 0,
+     * or missing, no countdown timer will be used. If positive, a countdown
+     * will be displayed on-screen, and the picture will be taken automatically
+     * when the countdown completes, if the user has not already taken a picture.
+     */
+    public static final String EXTRA_TIMER = "cwac_cam2_timer";
+
+    private static final String TAG_CONFIRM = ConfirmationFragment.class.getCanonicalName();
+    private static final String[] PERMS = {Manifest.permission.CAMERA};
+    private ConfirmationFragment confirmFrag;
+    private boolean needsThumbnail = false;
+    private boolean isDestroyed = false;
+
+    @Override
+    protected void onDestroy() {
+        isDestroyed = true;
+
+        super.onDestroy();
+    }
+
+    @Override
+    protected String[] getNeededPermissions() {
+        return (PERMS);
+    }
+
+    @Override
+    protected void init() {
+        super.init();
+
+        confirmFrag = (ConfirmationFragment) getFragmentManager().findFragmentByTag(TAG_CONFIRM);
+
+        Uri output = getOutputUri();
+
+        needsThumbnail = (output == null);
+
+        if (confirmFrag == null) {
+            confirmFrag =
+                    ConfirmationFragment
+                            .newInstance(normalizeOrientation());
+            getFragmentManager()
+                    .beginTransaction()
+                    .add(android.R.id.content, confirmFrag, TAG_CONFIRM)
+                    .commit();
+        }
+
+        if (!cameraFrag.isVisible() && !confirmFrag.isVisible()) {
+            getFragmentManager()
+                    .beginTransaction()
+                    .hide(confirmFrag)
+                    .show(cameraFrag)
+                    .commit();
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(CameraEngine.PictureTakenEvent event) {
+        if (event.exception == null) {
+            if (getIntent().getBooleanExtra(EXTRA_CONFIRM, true)) {
+                confirmFrag.setImage(event.getImageContext(),
+                        getIntent().getExtras().getFloat(EXTRA_CONFIRMATION_QUALITY));
+
+                getFragmentManager()
+                        .beginTransaction()
+                        .hide(cameraFrag)
+                        .show(confirmFrag)
+                        .commit();
+            } else {
+                completeRequest(event.getImageContext(), true);
+            }
+        } else {
+            finish();
+        }
+    }
+
+    @Override
+    public void retakePicture() {
+        getFragmentManager()
+                .beginTransaction()
+                .hide(confirmFrag)
+                .show(cameraFrag)
+                .commit();
+    }
+
+    @Override
+    public void completeRequest(ImageContext imageContext, boolean isOK) {
+        if (!isOK) {
+            setResult(RESULT_CANCELED);
+            finish();
+        } else {
+            if (needsThumbnail) {
+                final Intent result = buildResultIntent();
+
+                result.putExtra("data",
+                        imageContext.buildResultThumbnail(normalizeOrientation()));
+
+                findViewById(android.R.id.content).post(() -> {
+                    setResult(RESULT_OK, result);
+                    removeFragments();
+                });
+            } else {
+                findViewById(android.R.id.content).post(() -> {
+                    setResult(RESULT_OK, buildResultIntent().setData(getOutputUri()));
+                    removeFragments();
+                });
+            }
+        }
+    }
+
+    @Override
+    protected boolean needsOverlay() {
+        return (true);
+    }
+
+    @Override
+    protected boolean needsActionBar() {
+        return (true);
+    }
+
+    @Override
+    protected boolean isVideo() {
+        return (false);
+    }
+
+    @Override
+    protected void configEngine(CameraEngine engine) {
+        if (getIntent()
+                .getBooleanExtra(EXTRA_DEBUG_SAVE_PREVIEW_FRAME, false)) {
+            engine
+                    .setDebugSavePreviewFile(new File(getExternalCacheDir(),
+                            "cam2-preview.jpg"));
+        }
+
+        List<FlashMode> flashModes =
+                (List<FlashMode>) getIntent().getSerializableExtra(EXTRA_FLASH_MODES);
+
+        if (flashModes == null) {
+            flashModes = new ArrayList<FlashMode>();
+        }
+
+        if (flashModes != null) {
+            engine.setPreferredFlashModes(flashModes);
+        }
+    }
+
+    @Override
+    protected CameraFragment buildFragment() {
+        return (CameraFragment.newPictureInstance(getOutputUri(),
+                getIntent().getBooleanExtra(EXTRA_UPDATE_MEDIA_STORE, false),
+                getIntent().getIntExtra(MediaStore.EXTRA_VIDEO_QUALITY, 1),
+                (ZoomStyle) getIntent().getSerializableExtra(EXTRA_ZOOM_STYLE),
+                getIntent().getBooleanExtra(EXTRA_FACING_EXACT_MATCH, false),
+                getIntent().getBooleanExtra(EXTRA_SKIP_ORIENTATION_NORMALIZATION, false),
+                getIntent().getIntExtra(EXTRA_TIMER, 0),
+                getIntent().getBooleanExtra(EXTRA_SHOW_RULE_OF_THIRDS_GRID, false)));
+    }
+
+    private void removeFragments() {
+        if (!isDestroyed) {
+            getFragmentManager()
+                    .beginTransaction()
+                    .remove(confirmFrag)
+                    .remove(cameraFrag)
+                    .commit();
+        }
+    }
+
+    private boolean normalizeOrientation() {
+        boolean result = !getIntent()
+                .getBooleanExtra(EXTRA_SKIP_ORIENTATION_NORMALIZATION, false);
+
+        return (result);
+    }
+
+    /**
+     * Class to build an Intent used to start the CameraActivity.
+     * Call setComponent() on the Intent if you are using your
+     * own subclass of CameraActivity.
+     */
+    public static class IntentBuilder
+            extends AbstractCameraActivity.IntentBuilder<IntentBuilder> {
+        /**
+         * Standard constructor. May throw a runtime exception
+         * if the environment is not set up properly (see
+         * validateEnvironment() on Utils).
+         *
+         * @param ctxt any Context will do
+         */
+        public IntentBuilder(Context ctxt) {
+            super(ctxt, CameraActivity.class);
+        }
+
+        @Override
+        public Intent buildChooserBaseIntent() {
+            return (new Intent(MediaStore.ACTION_IMAGE_CAPTURE));
+        }
+
+        /**
+         * Call to skip the confirmation screen, so once the user
+         * takes the picture, you get control back right away.
+         *
+         * @return the builder, for further configuration
+         */
+        public IntentBuilder skipConfirm() {
+            result.putExtra(EXTRA_CONFIRM, false);
+
+            return (this);
+        }
+
+        /**
+         * Call to skip examining the picture for the EXIF orientation
+         * tag and rotating the image if needed.
+         *
+         * @return the builder, for further configuration
+         */
+        public IntentBuilder skipOrientationNormalization() {
+            result.putExtra(EXTRA_SKIP_ORIENTATION_NORMALIZATION, true);
+
+            return (this);
+        }
+
+        public IntentBuilder debugSavePreviewFrame() {
+            result.putExtra(EXTRA_DEBUG_SAVE_PREVIEW_FRAME, true);
+
+            return (this);
+        }
+
+        /**
+         * Call to set the quality factor for the confirmation screen.
+         * Value should be greater than 0.0f and below 1.0f, and
+         * represents the fraction of the app's heap size that we
+         * should be willing to use for loading the confirmation
+         * image. Defaults to not being used.
+         *
+         * @param quality something in (0.0f, 1.0f] range
+         * @return the builder, for further configuration
+         */
+        public IntentBuilder confirmationQuality(float quality) {
+            if (quality <= 0.0f || quality > 1.0f) {
+                throw new IllegalArgumentException("Quality outside (0.0f, 1.0f] range!");
+            }
+
+            result.putExtra(EXTRA_CONFIRMATION_QUALITY, quality);
+
+            return (this);
+        }
+
+        /**
+         * Call to set a countdown timer for taking the picture. The picture will
+         * be taken after the specified number of seconds automatically, unless
+         * the activity is destroyed already (e.g., user already took a picture).
+         *
+         * @param duration time to wait before taking picture, in seconds
+         * @return the builder, for further configuration
+         */
+        public IntentBuilder timer(int duration) {
+            if (duration <= 0) {
+                throw new IllegalArgumentException("Timer duration must be positive");
+            }
+
+            result.putExtra(EXTRA_TIMER, duration);
+
+            return (this);
+        }
+    }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConfigurator.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConfigurator.java
new file mode 100644
index 0000000..135e12f
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConfigurator.java
@@ -0,0 +1,22 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+/**
+ * Stub base interface for all configurators, mostly for type
+ * safety.
+ */
+public interface CameraConfigurator {
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConstraints.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConstraints.java
new file mode 100644
index 0000000..3d16422
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConstraints.java
@@ -0,0 +1,511 @@
+/***
+ Copyright (c) 2016 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.media.CamcorderProfile;
+import android.os.Build;
+import com.commonsware.cwac.cam2.util.Size;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+public class CameraConstraints {
+  private static final ArrayList<CameraConstraints> CONSTRAINTS=
+    new ArrayList<>();
+  private static final CameraConstraints DEVICE_CONSTRAINT;
+  private final Pattern manufacturer;
+  private final Pattern product;
+  private final Pattern model;
+  private final boolean supportsCameraTwo;
+  private final int highCamcorderProfile;
+  private final boolean disableFocusMode;
+  private final int cameraDisplayOrientation;
+  private final boolean supportsFFC;
+  private final boolean supportsFFCVideo;
+  private final boolean supportsRFC;
+  private final boolean supportsRFCVideo;
+  private final ArrayList<Size> previewFFCSizeWhitelist;
+  private final ArrayList<Size> previewRFCSizeWhitelist;
+  private final ArrayList<Size> pictureFFCSizeWhitelist;
+  private final ArrayList<Size> pictureRFCSizeWhitelist;
+
+  static {
+    add(new Builder()
+      .product("sdk_phone_x86")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("Amazon")
+      .product("full_ford")
+      .supportsCameraTwo(false)
+      .highCamcorderProfile(CamcorderProfile.QUALITY_1080P)
+      .build());
+    add(new Builder()
+      .manufacturer("asus")
+      .product("razor")
+      .supportsCameraTwo(false)
+      .supportsRFCVideo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("asus")
+      .product("US_epad")
+      .highCamcorderProfile(CamcorderProfile.QUALITY_480P)
+      .build());
+    add(new Builder()
+      .manufacturer("htc")
+      .product("volantis")
+      .disableFocusMode(true)
+      .build());
+    add(new Builder()
+      .manufacturer("HTC")
+      .product("htc_mecha")
+      .supportsFFC(false)
+      .supportsFFCVideo(false)
+      .supportsRFCVideo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("htc")
+      .product("volantisg")
+      .disableFocusMode(true)
+      .build());
+    add(new Builder()
+      .manufacturer("HUAWEI")
+      .product("KIW-L24")
+      .supportsCameraTwo(false)
+      .highCamcorderProfile(CamcorderProfile.QUALITY_1080P)
+      .build());
+    add(new Builder()
+      .manufacturer("LGE")
+      .product("bullhead")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("LGE")
+      .product("g3_tmo_us")
+      .supportsFFCVideo(false)
+      .supportsRFCVideo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("LGE")
+      .product("hammerhead")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("LGE")
+      .product("palman")
+      .supportsCameraTwo(false)
+      .previewFFCSizeWhitelist(new Size(1280,720))
+      .build());
+    add(new Builder()
+      .manufacturer("LGE")
+      .product("p1_global_com")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("LGE")
+      .product("p1_usc_us")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("LGE")
+      .product("pplus_tmo_us")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("motorola")
+      .product("surnia_retca")
+      .supportsCameraTwo(false)
+      .previewRFCSizeWhitelist(new Size(1280,720))
+      .build());
+    add(new Builder()
+      .manufacturer("NVIDIA")
+      .product("sb_na_wf")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("OnePlus")
+      .model("ONE E1005")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("samsung")
+      .product("baffinssvj")
+      .previewRFCSizeWhitelist(new Size(1280,720))
+      .previewFFCSizeWhitelist(new Size(720,480))
+      .build());
+    add(new Builder()
+      .manufacturer("samsung")
+      .product("chagallwifixx")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("samsung")
+      .product("ha3gub")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("samsung")
+      .product("mantaray")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("samsung")
+      .product("m0xx")
+      .highCamcorderProfile(CamcorderProfile.QUALITY_QCIF)
+      .build());
+    add(new Builder()
+      .manufacturer("samsung")
+      .product("serranoltexx")
+      .previewRFCSizeWhitelist(new Size(960, 720))
+      .supportsFFC(false)
+      .highCamcorderProfile(CamcorderProfile.QUALITY_480P)
+      .build());
+    add(new Builder()
+      .manufacturer("samsung")
+      .product("sf2wifixx")
+      .cameraDisplayOrientation(0)
+      .build());
+    add(new Builder()
+      .manufacturer("samsung")
+      .product("t03gxx")
+      .supportsFFCVideo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("samsung")
+      .product("zerofltexx")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("Sony")
+      .product("C1505")
+      .supportsFFCVideo(false)
+      .supportsRFCVideo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("Sony")
+      .product("C6603")
+      .disableFocusMode(true)
+      .highCamcorderProfile(CamcorderProfile.QUALITY_480P)
+      .build());
+    add(new Builder()
+      .manufacturer("Sony")
+      .product("C6802")
+      .disableFocusMode(true)
+      .build());
+    add(new Builder()
+      .manufacturer("Sony")
+      .product("D5803")
+      .disableFocusMode(true)
+      .highCamcorderProfile(CamcorderProfile.QUALITY_480P)
+      .build());
+    add(new Builder()
+      .manufacturer("Sony")
+      .product("E2115")
+      .highCamcorderProfile(CamcorderProfile.QUALITY_480P)
+      .build());
+    add(new Builder()
+      .manufacturer("Spectralink")
+      .product("cyclops_6dq")
+      .highCamcorderProfile(CamcorderProfile.QUALITY_1080P)
+      .previewRFCSizeWhitelist(new Size(1920,1080))
+      .pictureRFCSizeWhitelist(new Size(1920,1080))
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("Wileyfox")
+      .product("Swift")
+      .supportsCameraTwo(false)
+      .build());
+    add(new Builder()
+      .manufacturer("LGE")
+      .supportsCameraTwo(false)
+      .build());
+
+    CameraConstraints match=null;
+
+    for (CameraConstraints m : CONSTRAINTS) {
+      if (m.isMatch()) {
+        match=m;
+        break;
+      }
+    }
+
+    DEVICE_CONSTRAINT=match;
+  }
+
+  public static void add(CameraConstraints matcher) {
+    CONSTRAINTS.add(matcher);
+  }
+
+  public static CameraConstraints get() {
+    return(DEVICE_CONSTRAINT);
+  }
+
+  private CameraConstraints(Pattern manufacturer,
+                            Pattern product, Pattern model,
+                            boolean supportsCameraTwo,
+                            int highCamcorderProfile,
+                            boolean disableFocusMode,
+                            int cameraDisplayOrientation,
+                            boolean supportsFFC,
+                            boolean supportsFFCVideo,
+                            boolean supportsRFC,
+                            boolean supportsRFCVideo,
+                            ArrayList<Size> previewFFCSizeWhitelist,
+                            ArrayList<Size> previewRFCSizeWhitelist,
+                            ArrayList<Size> pictureFFCSizeWhitelist,
+                            ArrayList<Size> pictureRFCSizeWhitelist) {
+    this.manufacturer=manufacturer;
+    this.product=product;
+    this.model=model;
+    this.supportsCameraTwo=supportsCameraTwo;
+    this.highCamcorderProfile=highCamcorderProfile;
+    this.disableFocusMode=disableFocusMode;
+    this.cameraDisplayOrientation=cameraDisplayOrientation;
+    this.supportsFFC=supportsFFC;
+    this.supportsFFCVideo=supportsFFCVideo;
+    this.supportsRFC=supportsRFC;
+    this.supportsRFCVideo=supportsRFCVideo;
+    this.previewFFCSizeWhitelist=previewFFCSizeWhitelist;
+    this.previewRFCSizeWhitelist=previewRFCSizeWhitelist;
+    this.pictureFFCSizeWhitelist=pictureFFCSizeWhitelist;
+    this.pictureRFCSizeWhitelist=pictureRFCSizeWhitelist;
+  }
+
+  public boolean isMatch() {
+    boolean result=true;
+
+/*
+android.util.Log.e("20160618", Build.MANUFACTURER);
+android.util.Log.e("20160618", Build.PRODUCT);
+android.util.Log.e("20160618", Build.MODEL);
+*/
+
+    if (manufacturer!=null) {
+      result=manufacturer.matcher(Build.MANUFACTURER).matches();
+    }
+
+    if (result && product!=null) {
+      result=product.matcher(Build.PRODUCT).matches();
+    }
+
+    if (result && model!=null) {
+      result=model.matcher(Build.MODEL).matches();
+    }
+
+    return(result);
+  }
+
+  public boolean supportsCameraTwo() {
+    return(supportsCameraTwo);
+  }
+
+  public int getHighCamcorderProfile() {
+    return(highCamcorderProfile);
+  }
+
+  public boolean getDisableFocusMode() {
+    return(disableFocusMode);
+  }
+
+  public int getCameraDisplayOrientation() {
+    return(cameraDisplayOrientation);
+  }
+
+  public boolean supportsFFC() {
+    return(supportsFFC);
+  }
+
+  public boolean supportsFFCVideo() {
+    return(supportsFFCVideo);
+  }
+
+  public boolean supportsRFC() {
+    return(supportsRFC);
+  }
+
+  public boolean supportsRFCVideo() {
+    return(supportsRFCVideo);
+  }
+
+  public List<Size> getPreviewFFCSizeWhitelist() {
+    return(previewFFCSizeWhitelist);
+  }
+
+  public List<Size> getPreviewRFCSizeWhitelist() {
+    return(previewRFCSizeWhitelist);
+  }
+
+  public List<Size> getPictureFFCSizeWhitelist() {
+    return(pictureFFCSizeWhitelist);
+  }
+
+  public List<Size> getPictureRFCSizeWhitelist() {
+    return(pictureRFCSizeWhitelist);
+  }
+
+  public static class Builder {
+    private Pattern manufacturer;
+    private Pattern product;
+    private Pattern model;
+    private boolean supportsCameraTwo=false;
+    private int highCamcorderProfile=CamcorderProfile.QUALITY_HIGH;
+    private boolean disableFocusMode=false;
+    private int cameraDisplayOrientation=-1;
+    private boolean supportsFFC=true;
+    private boolean supportsFFCVideo=true;
+    private boolean supportsRFC=true;
+    private boolean supportsRFCVideo=true;
+    private ArrayList<Size> previewFFCSizeWhitelist;
+    private ArrayList<Size> previewRFCSizeWhitelist;
+    private ArrayList<Size> pictureFFCSizeWhitelist;
+    private ArrayList<Size> pictureRFCSizeWhitelist;
+
+    public Builder manufacturer(String mfr) {
+      return(manufacturer(Pattern.compile(mfr)));
+    }
+
+    public Builder manufacturer(Pattern manufacturer) {
+      this.manufacturer=manufacturer;
+
+      return(this);
+    }
+
+    public Builder product(String product) {
+      return(product(Pattern.compile(product)));
+    }
+
+    public Builder product(Pattern product) {
+      this.product=product;
+
+      return(this);
+    }
+
+    public Builder model(String model) {
+      return(model(Pattern.compile(model)));
+    }
+
+    public Builder model(Pattern model) {
+      this.model=model;
+
+      return(this);
+    }
+
+    public Builder supportsCameraTwo(boolean supportsCameraTwo) {
+      this.supportsCameraTwo=supportsCameraTwo;
+
+      return(this);
+    }
+
+    public Builder highCamcorderProfile(int highCamcorderProfile) {
+      this.highCamcorderProfile=highCamcorderProfile;
+
+      return(this);
+    }
+
+    public Builder disableFocusMode(boolean disableFocusMode) {
+      this.disableFocusMode=disableFocusMode;
+
+      return(this);
+    }
+
+    public Builder cameraDisplayOrientation(int cameraDisplayOrientation) {
+      this.cameraDisplayOrientation=cameraDisplayOrientation;
+
+      return(this);
+    }
+
+    public Builder supportsFFC(boolean supportsFFC) {
+      this.supportsFFC=supportsFFC;
+
+      return(this);
+    }
+
+    public Builder supportsFFCVideo(boolean supportsFFCVideo) {
+      this.supportsFFCVideo=supportsFFCVideo;
+
+      return(this);
+    }
+
+    public Builder supportsRFC(boolean supportsRFC) {
+      this.supportsRFC=supportsRFC;
+
+      return(this);
+    }
+
+    public Builder supportsRFCVideo(boolean supportsRFCVideo) {
+      this.supportsRFCVideo=supportsRFCVideo;
+
+      return(this);
+    }
+
+    public Builder previewFFCSizeWhitelist(Size... sizes) {
+      if (previewFFCSizeWhitelist==null) {
+        previewFFCSizeWhitelist=new ArrayList<>();
+      }
+
+      for (Size size : sizes) {
+        previewFFCSizeWhitelist.add(size);
+      }
+
+      return(this);
+    }
+
+    public Builder previewRFCSizeWhitelist(Size... sizes) {
+      if (previewRFCSizeWhitelist==null) {
+        previewRFCSizeWhitelist=new ArrayList<>();
+      }
+
+      for (Size size : sizes) {
+        previewRFCSizeWhitelist.add(size);
+      }
+
+      return(this);
+    }
+
+    public Builder pictureFFCSizeWhitelist(Size... sizes) {
+      if (pictureFFCSizeWhitelist==null) {
+        pictureFFCSizeWhitelist=new ArrayList<>();
+      }
+
+      for (Size size : sizes) {
+        pictureFFCSizeWhitelist.add(size);
+      }
+
+      return(this);
+    }
+
+    public Builder pictureRFCSizeWhitelist(Size... sizes) {
+      if (pictureRFCSizeWhitelist==null) {
+        pictureRFCSizeWhitelist=new ArrayList<>();
+      }
+
+      for (Size size : sizes) {
+        pictureRFCSizeWhitelist.add(size);
+      }
+
+      return(this);
+    }
+
+    public CameraConstraints build() {
+      return(new CameraConstraints(manufacturer, product, model,
+        supportsCameraTwo, highCamcorderProfile, disableFocusMode,
+        cameraDisplayOrientation, supportsFFC, supportsFFCVideo,
+        supportsRFC, supportsRFCVideo, previewFFCSizeWhitelist,
+        previewRFCSizeWhitelist, pictureFFCSizeWhitelist,
+        pictureRFCSizeWhitelist));
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraController.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraController.java
new file mode 100644
index 0000000..6339e4b
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraController.java
@@ -0,0 +1,510 @@
+/***
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you
+ * may
+ * not use this file except in compliance with the License. You may
+ * obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing,
+ * software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions
+ * and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.content.res.Configuration;
+import android.graphics.ImageFormat;
+import android.graphics.SurfaceTexture;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.ResultReceiver;
+import android.view.View;
+import com.commonsware.cwac.cam2.plugin.FlashModePlugin;
+import com.commonsware.cwac.cam2.plugin.FocusModePlugin;
+import com.commonsware.cwac.cam2.plugin.OrientationPlugin;
+import com.commonsware.cwac.cam2.plugin.SizeAndFormatPlugin;
+import com.commonsware.cwac.cam2.util.Size;
+import com.commonsware.cwac.cam2.util.Utils;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Queue;
+
+/**
+ * Controller for camera-related functions, designed to be used
+ * by CameraFragment or the equivalent.
+ */
+public class CameraController implements CameraView.StateCallback {
+  private final boolean allowChangeFlashMode;
+  private CameraEngine engine;
+  private CameraSession session;
+  private List<CameraDescriptor> cameras=null;
+  private int currentCamera=0;
+  private final HashMap<CameraDescriptor, CameraView> previews=
+    new HashMap<CameraDescriptor, CameraView>();
+  private Queue<CameraView> availablePreviews=null;
+  private boolean switchPending=false;
+  private boolean isVideoRecording=false;
+  private final FocusMode focusMode;
+  private final boolean isVideo;
+  private FlashModePlugin flashModePlugin;
+  private int zoomLevel=0;
+  private int quality=0;
+  private final ResultReceiver onError;
+
+  public CameraController(FocusMode focusMode,
+                          ResultReceiver onError,
+                          boolean allowChangeFlashMode,
+                          boolean isVideo) {
+    this.onError=onError;
+    this.focusMode=focusMode==null ?
+      FocusMode.CONTINUOUS : focusMode;
+    this.isVideo=isVideo;
+    this.allowChangeFlashMode=allowChangeFlashMode;
+  }
+
+  /**
+   * @return the engine being used by this fragment to access
+   * the camera(s) on the device
+   */
+  public CameraEngine getEngine() {
+    return (engine);
+  }
+
+  /**
+   * Setter for the engine. Must be called before onCreateView()
+   * is called, preferably shortly after constructing the
+   * fragment.
+   *
+   * @param engine the engine to be used by this fragment to access
+   * the camera(s) on the device
+   */
+  public void setEngine(CameraEngine engine,
+                        CameraSelectionCriteria criteria) {
+    this.engine=engine;
+
+    AbstractCameraActivity.BUS.register(this);
+
+    engine.loadCameraDescriptors(criteria);
+  }
+
+  public int getNumberOfCameras() {
+    return (cameras==null ? 0 : cameras.size());
+  }
+
+  /**
+   * Call this from onStart() of an activity or fragment, or from
+   * an equivalent point in time. If the CameraView is ready,
+   * the preview should begin; otherwise, the preview will
+   * begin after the CameraView is ready.
+   */
+  public void start() {
+    if (cameras!=null) {
+      CameraDescriptor camera=cameras.get(currentCamera);
+      CameraView cv=getPreview(camera);
+
+      if (cv.isAvailable()) {
+        open();
+      }
+    }
+  }
+
+  /**
+   * Call this from onStop() of an activity or fragment, or
+   * from an equivalent point in time, to indicate that you want
+   * the camera preview to stop.
+   */
+  public void stop() throws Exception {
+    if (session!=null) {
+      stopVideoRecording(true);
+
+      CameraSession temp=session;
+
+      session=null;
+      engine.close(temp);
+      // session.destroy(); -- moved into engines
+    }
+  }
+
+  /**
+   * Call this from onDestroy() of an activity or fragment,
+   * or from an equivalent point in time, to tear down the
+   * entire controller. A fresh controller should
+   * be created if you want to use the camera again in the future.
+   */
+  public void destroy() {
+    AbstractCameraActivity.BUS.post(
+      new ControllerDestroyedEvent(this));
+    AbstractCameraActivity.BUS.unregister(this);
+  }
+
+  /**
+   * Call to switch to the next camera in sequence. Most
+   * devices have only two cameras, and so calling this will
+   * switch the preview and pictures to the camera other than
+   * the one presently being used.
+   */
+  public void switchCamera() throws Exception {
+    if (session!=null) {
+      getPreview(session.getDescriptor()).setVisibility(
+        View.INVISIBLE);
+      switchPending=true;
+      stop();
+    }
+  }
+
+  /**
+   * Supplies CameraView objects for each camera. After this,
+   * we can open() the camera.
+   *
+   * @param cameraViews a list of CameraViews
+   */
+  public void setCameraViews(Queue<CameraView> cameraViews) {
+    availablePreviews=cameraViews;
+    previews.clear();
+
+    for (CameraView cv : cameraViews) {
+      cv.setStateCallback(this);
+    }
+
+    open(); // in case visible CameraView is already ready
+  }
+
+  /**
+   * Public because Java interfaces are intrinsically public.
+   * This method is not part of the class' API and should not
+   * be used by third-party developers.
+   *
+   * @param cv the CameraView that is now ready
+   */
+  @Override
+  public void onReady(CameraView cv) {
+    if (cameras!=null) {
+      open();
+    }
+  }
+
+  /**
+   * Public because Java interfaces are intrinsically public.
+   * This method is not part of the class' API and should not
+   * be used by third-party developers.
+   *
+   * @param cv the CameraView that is now destroyed
+   */
+  @Override
+  public void onDestroyed(CameraView cv) throws Exception {
+    stop();
+  }
+
+  /**
+   * Takes a picture, in accordance with the details supplied
+   * in the PictureTransaction. Subscribe to the
+   * PictureTakenEvent to get the results of the picture.
+   *
+   * @param xact a PictureTransaction describing what should be taken
+   */
+  public void takePicture(PictureTransaction xact) {
+    if (session!=null) {
+      AbstractCameraActivity.BUS.post(new PictureCaptureStartEvent());
+      engine.takePicture(session, xact);
+    }
+  }
+
+  public void recordVideo(VideoTransaction xact) throws Exception {
+    if (session!=null) {
+      engine.recordVideo(session, xact);
+      isVideoRecording=true;
+    }
+  }
+
+  public void stopVideoRecording(boolean abandon) throws Exception {
+    if (session!=null && isVideoRecording) {
+      try {
+        engine.stopVideoRecording(session, abandon);
+      }
+      finally {
+        isVideoRecording=false;
+      }
+    }
+  }
+
+  public void setQuality(int quality) {
+    this.quality=quality;
+  }
+
+  public boolean canToggleFlashMode() {
+    return (allowChangeFlashMode &&
+      engine.supportsDynamicFlashModes() &&
+      engine.hasMoreThanOneEligibleFlashMode());
+  }
+
+  public FlashMode getCurrentFlashMode() {
+    return (session.getCurrentFlashMode());
+  }
+
+  public boolean supportsZoom() {
+    return (engine.supportsZoom(session));
+  }
+
+  public int getCurrentCamera() {
+    return (currentCamera);
+  }
+
+  public void setCurrentCamera(int currentCamera) {
+    this.currentCamera=currentCamera;
+  }
+
+  public boolean changeZoom(int delta) {
+    zoomLevel+=delta;
+
+    return (handleZoom());
+  }
+
+  public boolean setZoom(int zoomLevel) {
+    this.zoomLevel=zoomLevel;
+
+    return (handleZoom());
+  }
+
+  private boolean handleZoom() {
+    if (zoomLevel<0) {
+      zoomLevel=0;
+    }
+    else if (zoomLevel>100) {
+      zoomLevel=100;
+    }
+
+    return (engine.zoomTo(session, zoomLevel));
+  }
+
+  private CameraView getPreview(CameraDescriptor camera) {
+    CameraView result=previews.get(camera);
+
+    if (result==null && availablePreviews!=null) {
+      result=availablePreviews.remove();
+      previews.put(camera, result);
+    }
+
+    return (result);
+  }
+
+  private int getNextCameraIndex() {
+    int next=currentCamera+1;
+
+    if (next==cameras.size()) {
+      next=0;
+    }
+
+    return (next);
+  }
+
+  private void open() {
+    if (session==null) {
+      Size previewSize=null;
+      CameraDescriptor camera=cameras.get(currentCamera);
+      CameraView cv=getPreview(camera);
+      Size pictureSize;
+
+      if (quality>0) {
+        pictureSize=Utils.getLargestPictureSize(camera);
+      }
+      else {
+        pictureSize=Utils.getSmallestPictureSize(camera);
+      }
+
+      if (camera!=null && cv.getWidth()>0 && cv.getHeight()>0) {
+        previewSize=Utils.chooseOptimalSize(camera.getPreviewSizes(),
+          cv.getWidth(), cv.getHeight(), pictureSize);
+      }
+
+      SurfaceTexture texture=cv.getSurfaceTexture();
+
+      if (previewSize!=null && texture!=null) {
+        if (Build.VERSION.SDK_INT>=
+          Build.VERSION_CODES.JELLY_BEAN_MR1) {
+          texture.setDefaultBufferSize(previewSize.getWidth(),
+            previewSize.getHeight());
+        }
+
+        flashModePlugin=new FlashModePlugin();
+
+        session=engine
+          .buildSession(cv.getContext(), camera)
+          .addPlugin(new SizeAndFormatPlugin(previewSize,
+            pictureSize, ImageFormat.JPEG))
+          .addPlugin(new OrientationPlugin(cv.getContext()))
+          .addPlugin(
+            new FocusModePlugin(cv.getContext(), focusMode, isVideo))
+          .addPlugin(flashModePlugin)
+          .build();
+
+        session.setPreviewSize(previewSize);
+        engine.open(session, texture);
+      }
+    }
+  }
+
+  @SuppressWarnings("unused")
+  @Subscribe(threadMode=ThreadMode.MAIN)
+  public void onEventMainThread(
+    CameraEngine.CameraDescriptorsEvent event) {
+    if (event.exception!=null) {
+      postError(ErrorConstants.ERROR_LIST_CAMERAS, event.exception);
+    }
+
+    if (event.descriptors.size()>0) {
+      cameras=event.descriptors;
+      AbstractCameraActivity.BUS.post(
+        new ControllerReadyEvent(this, cameras.size()));
+    }
+    else {
+      AbstractCameraActivity.BUS.post(new NoSuchCameraEvent());
+    }
+  }
+
+  @SuppressWarnings("unused")
+  @Subscribe(threadMode=ThreadMode.MAIN)
+  public void onEventMainThread(CameraEngine.OpenedEvent event) {
+    if (event.exception!=null) {
+      // handled at fragment level
+    }
+    else {
+      CameraDescriptor camera=cameras.get(currentCamera);
+      CameraView cv=getPreview(camera);
+
+      if (cv!=null) {
+        boolean shouldSwapPreviewDimensions=
+          cv
+            .getContext()
+            .getResources()
+            .getConfiguration().orientation==
+            Configuration.ORIENTATION_PORTRAIT;
+        Size virtualPreviewSize=session.getPreviewSize();
+        /*
+         * Size will always be like this: 4032x3024, 2688x1512 or 800x600, so in portrait mode,
+         * it is mandatory to swap these values or preview will stretch
+         */
+        if (shouldSwapPreviewDimensions) {
+          virtualPreviewSize=
+            new Size(session.getPreviewSize().getHeight(),
+              session.getPreviewSize().getWidth());
+        }
+
+        cv.setPreviewSize(virtualPreviewSize);
+      }
+    }
+  }
+
+  @SuppressWarnings("unused")
+  @Subscribe(threadMode=ThreadMode.MAIN)
+  public void onEventMainThread(CameraEngine.ClosedEvent event) {
+    if (event.exception!=null) {
+      postError(ErrorConstants.ERROR_CLOSE_CAMERA, event.exception);
+      AbstractCameraActivity.BUS.post(new NoSuchCameraEvent());
+    }
+    else {
+      if (switchPending) {
+        switchPending=false;
+        currentCamera=getNextCameraIndex();
+        getPreview(cameras.get(currentCamera))
+          .setVisibility(View.VISIBLE);
+        open();
+      }
+    }
+  }
+
+  @SuppressWarnings("unused")
+  @Subscribe(threadMode=ThreadMode.MAIN)
+  public void onEventMainThread(
+    CameraEngine.OrientationChangedEvent event) {
+    if (engine!=null) {
+      engine.handleOrientationChange(session, event);
+    }
+  }
+
+  @SuppressWarnings("unused")
+  @Subscribe(threadMode=ThreadMode.MAIN)
+  public void onEventMainThread(CameraEngine.DeepImpactEvent event) {
+    postError(ErrorConstants.ERROR_MISC, event.exception);
+  }
+
+  public void postError(int resultCode, Throwable e) {
+    if (onError!=null) {
+      Bundle resultData=new Bundle();
+      StringWriter sw=new StringWriter();
+
+      e.printStackTrace(new PrintWriter(sw));
+      resultData
+        .putString(ErrorConstants.RESULT_STACK_TRACE,
+          sw.toString());
+      onError.send(resultCode, resultData);
+    }
+  }
+
+  /**
+   * Raised if there are no available cameras on this
+   * device. Consider using uses-feature elements in the
+   * manifest, so your app only runs on devices that have
+   * a camera, if you need a camera.
+   */
+  public static class NoSuchCameraEvent {
+
+  }
+
+  /**
+   * Event raised when the controller has its cameras
+   * and is ready for use. Clients should then turn
+   * around and call setCameraViews() to complete the process
+   * and start showing the first preview.
+   */
+  public static class ControllerReadyEvent {
+    final private int cameraCount;
+    final private CameraController ctlr;
+
+    private ControllerReadyEvent(CameraController ctlr,
+                                 int cameraCount) {
+      this.cameraCount=cameraCount;
+      this.ctlr=ctlr;
+    }
+
+    public int getNumberOfCameras() {
+      return (cameraCount);
+    }
+
+    public boolean isEventForController(CameraController ctlr) {
+      return (this.ctlr==ctlr);
+    }
+  }
+
+  /**
+   * Event raised when the controller has its cameras
+   * and is ready for use. Clients should then turn
+   * around and call setCameraViews() to complete the process
+   * and start showing the first preview.
+   */
+  public static class ControllerDestroyedEvent {
+    private final CameraController ctlr;
+
+    ControllerDestroyedEvent(CameraController ctlr) {
+      this.ctlr=ctlr;
+    }
+
+    public CameraController getDestroyedController() {
+      return (ctlr);
+    }
+  }
+
+  public static class PictureCaptureStartEvent {
+
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraDescriptor.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraDescriptor.java
new file mode 100644
index 0000000..b760087
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraDescriptor.java
@@ -0,0 +1,49 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import com.commonsware.cwac.cam2.util.Size;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A representation of a camera. Specific camera engines will
+ * have their own descriptors, which they can use for tracking
+ * IDs or other information about the camera. From the standpoint
+ * of the public API, a descriptor should be fairly opaque, supplying
+ * information about the camera capabilities, but nothing more.
+ */
+public interface CameraDescriptor {
+  /**
+   * @return The possible preview sizes for the camera, in no
+   * particular order
+   */
+  List<Size> getPreviewSizes();
+
+  /**
+   * @return The possible picture sizes for the camera, in no
+   * particular order
+   */
+  List<Size> getPictureSizes();
+
+  /**
+   * Indicates if the camera (and this library) supports a
+   * particular image format for pictures.
+   *
+   * @param format an ImageFormat value (e.g., ImageFormat.JPEG)
+   * @return true if supported, false otherwise
+   */
+  boolean isPictureFormatSupported(int format);
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java
new file mode 100644
index 0000000..e440316
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java
@@ -0,0 +1,439 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.os.Build;
+import android.util.Log;
+import org.greenrobot.eventbus.EventBus;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Base class for camera engines, which abstract out camera
+ * functionality for different APIs (e.g., android.hardware.Camera,
+ * android.hardware.camera2.*).
+ */
+abstract public class CameraEngine {
+  private static final int CORE_POOL_SIZE=1;
+  private static final int MAX_POOL_SIZE=Runtime.getRuntime().availableProcessors();
+  private static final int KEEP_ALIVE_SECONDS=60;
+  private static volatile CameraEngine singletonClassic=null;
+  private static volatile CameraEngine singletonTwo=null;
+  private EventBus bus=AbstractCameraActivity.BUS;
+  private boolean isDebug=false;
+  private LinkedBlockingQueue<Runnable> queue=new LinkedBlockingQueue<Runnable>();
+  private ThreadPoolExecutor pool;
+  private File savePreviewFile=null;
+  protected List<FlashMode> preferredFlashModes;
+  protected ArrayList<FlashMode> eligibleFlashModes=
+    new ArrayList<FlashMode>();
+
+  public enum ID {
+    CLASSIC,
+    CAMERA2
+  }
+
+  private static class CrashableEvent {
+    /**
+     * The exception that was raised when trying to process
+     * the request, or null if no such exception was raised.
+     */
+    public final Throwable exception;
+
+    public CrashableEvent() {
+      this(null);
+    }
+
+    public CrashableEvent(Throwable e) {
+      if (e!=null) {
+        Log.e("CWAC-Cam2", "Exception in camera processing", e);
+      }
+
+      this.exception=e;
+    }
+  }
+
+  /**
+   * Event raised when camera descriptors are ready for use.
+   * Subscribe to this event if you use loadCameraDescriptors()
+   * to get the results. May include an exception if there was
+   * an exception accessing the camera.
+   *
+   * Note that the descriptors will be in a ranked order based
+   * on your requested CameraSelectionCriteria, with the best
+   * match as the 0th element of the list.
+   */
+  public static class CameraDescriptorsEvent extends CrashableEvent {
+    /**
+     * The camera descriptors loaded in response to a call
+     * to loadCameraDescriptors()
+     */
+    public final List<CameraDescriptor> descriptors;
+
+    public CameraDescriptorsEvent(List<CameraDescriptor> descriptors) {
+      this.descriptors=descriptors;
+    }
+
+    public CameraDescriptorsEvent(Exception exception) {
+      super(exception);
+      this.descriptors=null;
+    }
+  }
+
+  /**
+   * Event raised when the camera has been opened.
+   * Subscribe to this event if you use open()
+   * to to find out when the open has succeeded.
+   * May include an exception if there was
+   * an exception accessing the camera.
+   */
+  public static class OpenedEvent extends CrashableEvent {
+    public OpenedEvent() {
+      super();
+    }
+
+    public OpenedEvent(Exception exception) {
+      super(exception);
+    }
+  }
+
+  /**
+   * Event raised when the camera has been closed.
+   * Subscribe to this event if you use close()
+   * to to find out when the close has completed.
+   * May include an exception if there was
+   * an exception closing the camera.
+   */
+  public static class ClosedEvent extends CrashableEvent {
+    public ClosedEvent() {
+      super();
+    }
+
+    public ClosedEvent(Exception exception) {
+      super(exception);
+    }
+  }
+
+  /**
+   * Used for errors happening deep in the engines or elsewhere
+   * (e.g., JPEGWriter ran out of disk space)
+   */
+  public static class DeepImpactEvent extends CrashableEvent {
+    public DeepImpactEvent(Throwable exception) {
+      super(exception);
+    }
+  }
+
+  public static class OrientationChangedEvent {
+
+  }
+
+  public static class SmoothZoomCompletedEvent {
+
+  }
+
+  /**
+   * Event raised when picture is taken, as a result of a
+   * takePicture() call. May include an exception if there was
+   * an exception accessing the camera.
+   */
+  public static class PictureTakenEvent extends CrashableEvent {
+    private ImageContext imageContext;
+    private PictureTransaction xact;
+
+    public PictureTakenEvent(PictureTransaction xact,
+                             ImageContext imageContext) {
+      super();
+      this.xact=xact;
+      this.imageContext=imageContext;
+    }
+
+    public PictureTakenEvent(Exception exception) {
+      super(exception);
+    }
+
+    public ImageContext getImageContext() {
+      return(imageContext);
+    }
+
+    public PictureTransaction getPictureTransaction() {
+      return(xact);
+    }
+  }
+
+  /**
+   * Event raised when picture is taken, as a result of a
+   * takePicture() call. May include an exception if there was
+   * an exception accessing the camera.
+   */
+  public static class VideoTakenEvent extends CrashableEvent {
+    private VideoTransaction xact;
+
+    public VideoTakenEvent(VideoTransaction xact) {
+      super();
+      this.xact=xact;
+    }
+
+    public VideoTakenEvent(Exception exception) {
+      super(exception);
+    }
+
+    public VideoTransaction getVideoTransaction() {
+      return(xact);
+    }
+  }
+
+  /**
+   * Base class for all ¯\_(ツ)_/¯ errors triggered by camera2
+   * API operations that we really should surface to callers,
+   * but either are not tied to specific requests or happen
+   * asynchronously with respect to the request. Usually, these
+   * are bad. However, they frequently do not have useful
+   * error information associated with them, because, well,
+   * that would have been useful.
+   */
+  public static class CameraTwoGenericEvent {
+
+  }
+
+  /**
+   * Event raised if there is a problem starting up the
+   * CameraTwoEngine preview. The error field is the value passed
+   * into onError() of a CameraDevice.StateCallback object and
+   * probably means something to somebody.
+   */
+  public static class CameraTwoPreviewErrorEvent
+    extends CameraTwoGenericEvent {
+    public final int error;
+
+    CameraTwoPreviewErrorEvent(int error) {
+      this.error=error;
+    }
+  }
+
+  /**
+   * Event raised if there is a different sort of problem
+   * starting up the CameraTwoEngine preview. This will be
+   * triggered by a CameraCaptureSession.StateCallback,
+   * and there is no error information of note.
+   */
+  public static class CameraTwoPreviewFailureEvent
+    extends CameraTwoGenericEvent {
+  }
+
+  /**
+   * Create a CameraSession.Builder to build a CameraSession
+   * for a given CameraDescriptor. On the Builder is where you
+   * indicate your desired preview size, picture size, and
+   * so forth.
+   *
+   * @param ctxt an Android Context for accessing system stuff
+   * @param descriptor the CameraDescriptor for which we want
+   *                   a session
+   * @return a Builder to build that session
+   */
+  abstract public CameraSession.Builder buildSession(Context ctxt,
+                                                     CameraDescriptor descriptor);
+
+  /**
+   * Loads a roster of the available cameras for this engine,
+   * ranked based on the supplied criteria. Subscribe
+   * to the CameraDescriptorsEvent to get the results of this
+   * call asynchronously.
+   *
+   * @param criteria preferred camera capabilities, or
+   *                 null for a default ranking
+   */
+  abstract public void loadCameraDescriptors(CameraSelectionCriteria criteria);
+
+  /**
+   * Open the requested camera and show a preview on the supplied
+   * surface. Subscribe to the OpenEvent to find out when this
+   * work is completed.
+   *
+   * @param session the session for the camera of interest
+   * @param texture the preview surface
+   */
+  abstract public void open(CameraSession session,
+                            SurfaceTexture texture);
+
+  /**
+   * Close the open camera. Subscribe to the ClosedEvent to
+   * find out when this work is completed. Note that this
+   * method may be synchronous or asynchronous.
+   *
+   * @param session the session for the camera of interest
+   */
+  abstract public void close(CameraSession session);
+
+  /**
+   * Take a picture, on the supplied camera, using the picture
+   * configuration from the supplied transaction. Posts a
+   * PictureTakenEvent when the request is completed, successfully
+   * or unsuccessfully.
+   *
+   * @param session the session for the camera of interest
+   * @param xact the configuration of the picture to take
+   */
+  abstract public void takePicture(CameraSession session,
+                                   PictureTransaction xact);
+
+  abstract public void recordVideo(CameraSession session,
+      VideoTransaction xact) throws Exception;
+
+  abstract public void stopVideoRecording(CameraSession session,
+                                          boolean abandon) throws Exception;
+
+  abstract public void handleOrientationChange(CameraSession session,
+                                               OrientationChangedEvent event);
+
+  /**
+   * @return true if the engine supports changing flash modes
+   * on the fly, false otherwise
+   */
+  abstract public boolean supportsDynamicFlashModes();
+
+  /**
+   * @return true if this camera supports zoom, false otherwise
+   */
+  abstract public boolean supportsZoom(CameraSession session);
+
+  /**
+   * Sets the zoom level for the camera.
+   *
+   * @param session the session for the camera of interest
+   * @param zoomLevel 0-100, 100=max zoom
+   * @return true if "smooth zoom" (and should not request
+   * zoom until complete), false otherwise
+   */
+  abstract public boolean zoomTo(CameraSession session,
+                                   int zoomLevel);
+
+  /**
+   * Builds a CameraEngine instance based on the device's
+   * API level.
+   *
+   * @param ctxt any Context will do
+   * @param forcedEngineId if not null, use this engine always
+   * @return a new CameraEngine instance
+   */
+  synchronized public static CameraEngine buildInstance(Context ctxt,
+                                                        ID forcedEngineId) {
+    CameraEngine result;
+    boolean useCameraTwo;
+
+    if (forcedEngineId==ID.CLASSIC) {
+      useCameraTwo=false;
+    }
+    else if (forcedEngineId==ID.CAMERA2) {
+      useCameraTwo=true;
+    }
+    else {
+      useCameraTwo=Build.VERSION.SDK_INT>=Build.VERSION_CODES.LOLLIPOP;
+
+      CameraConstraints constraints=CameraConstraints.get();
+
+      if (constraints!=null) {
+        useCameraTwo=useCameraTwo && constraints.supportsCameraTwo();
+      }
+    }
+
+    if (useCameraTwo) {
+      if (singletonTwo==null) {
+        singletonTwo=new CameraTwoEngine(ctxt);
+      }
+
+      result=singletonTwo;
+    }
+    else {
+      if (singletonClassic==null) {
+        singletonClassic=new ClassicCameraEngine(ctxt);
+      }
+
+      result=singletonClassic;
+    }
+
+    return(result);
+  }
+
+  /**
+   * Sets the event bus to use, where the default is the
+   * default event bus supplied by the EventBus class.
+   *
+   * @param bus the bus to use for events
+   */
+  public void setBus(EventBus bus) {
+    this.bus=bus;
+  }
+
+  /**
+   * @return the bus to use for events
+   */
+  public EventBus getBus() {
+    return(bus);
+  }
+
+  /**
+   * Sets whether or not exceptions should be logged, in addition
+   * to being included in relevant events. The default is false.
+   *
+   * @param isDebug true if exceptions should be logged, false otherwise
+   */
+  public void setDebug(boolean isDebug) {
+    this.isDebug=isDebug;
+  }
+
+  /**
+   * @return true if exceptions should be logged, false otherwise
+   */
+  public boolean isDebug() {
+    return(isDebug);
+  }
+
+  public void setDebugSavePreviewFile(File savePreviewFile) {
+    this.savePreviewFile=savePreviewFile;
+  }
+
+  public File savePreviewFile() {
+    return(savePreviewFile);
+  }
+
+  public ThreadPoolExecutor getThreadPool() {
+    if (pool==null) {
+      pool=new ThreadPoolExecutor(CORE_POOL_SIZE, MAX_POOL_SIZE,
+          KEEP_ALIVE_SECONDS, TimeUnit.SECONDS, queue);
+    }
+
+    return(pool);
+  }
+
+  public void setThreadPool(ThreadPoolExecutor pool) {
+    this.pool=pool;
+  }
+
+  public void setPreferredFlashModes(List<FlashMode> flashModes) {
+    preferredFlashModes=flashModes;
+  }
+
+  boolean hasMoreThanOneEligibleFlashMode() {
+    return(eligibleFlashModes.size()>1);
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java
new file mode 100644
index 0000000..fce021b
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java
@@ -0,0 +1,723 @@
+/***
+ * Copyright (c) 2015-2016 CommonsWare, LLC
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you
+ * may
+ * not use this file except in compliance with the License. You may
+ * obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing,
+ * software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions
+ * and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.app.ActionBar;
+import android.app.Fragment;
+import android.content.Context;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.ScaleGestureDetector;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.OvershootInterpolator;
+import android.widget.Chronometer;
+import android.widget.ImageView;
+import android.widget.SeekBar;
+
+import com.github.clans.fab.FloatingActionButton;
+import com.github.clans.fab.FloatingActionMenu;
+
+import net.yazeed44.imagepicker.library.R;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.io.File;
+import java.util.LinkedList;
+
+/**
+ * Fragment for displaying a camera preview, with hooks to allow
+ * you (or the user) to take a picture.
+ */
+public class CameraFragment extends Fragment
+        implements ReverseChronometer.Listener {
+    private static final String ARG_OUTPUT = "output";
+    private static final String ARG_UPDATE_MEDIA_STORE =
+            "updateMediaStore";
+    private static final String ARG_SKIP_ORIENTATION_NORMALIZATION
+            = "skipOrientationNormalization";
+    private static final String ARG_IS_VIDEO = "isVideo";
+    private static final String ARG_QUALITY = "quality";
+    private static final String ARG_SIZE_LIMIT = "sizeLimit";
+    private static final String ARG_DURATION_LIMIT = "durationLimit";
+    private static final String ARG_ZOOM_STYLE = "zoomStyle";
+    private static final String ARG_FACING_EXACT_MATCH =
+            "facingExactMatch";
+    private static final String ARG_CHRONOTYPE = "chronotype";
+    private static final String ARG_RULE_OF_THIRDS = "ruleOfThirds";
+    private static final String ARG_TIMER_DURATION = "timerDuration";
+    private static final int PINCH_ZOOM_DELTA = 20;
+    private CameraController ctlr;
+    private ViewGroup previewStack;
+    private FloatingActionButton fabPicture;
+    private FloatingActionButton fabSwitch;
+    private View progress;
+    private boolean isVideoRecording = false;
+    private boolean mirrorPreview = false;
+    private ScaleGestureDetector scaleDetector;
+    private boolean inSmoothPinchZoom = false;
+    private SeekBar zoomSlider;
+    private Chronometer chronometer;
+    private ReverseChronometer reverseChronometer;
+
+    public static CameraFragment newPictureInstance(Uri output,
+                                                    boolean updateMediaStore,
+                                                    int quality,
+                                                    ZoomStyle zoomStyle,
+                                                    boolean facingExactMatch,
+                                                    boolean skipOrientationNormalization,
+                                                    int timerDuration,
+                                                    boolean ruleOfThirds) {
+        CameraFragment f = new CameraFragment();
+        Bundle args = new Bundle();
+
+        args.putParcelable(ARG_OUTPUT, output);
+        args.putBoolean(ARG_UPDATE_MEDIA_STORE, updateMediaStore);
+        args.putBoolean(ARG_SKIP_ORIENTATION_NORMALIZATION,
+                skipOrientationNormalization);
+        args.putInt(ARG_QUALITY, quality);
+        args.putBoolean(ARG_IS_VIDEO, false);
+        args.putSerializable(ARG_ZOOM_STYLE, zoomStyle);
+        args.putBoolean(ARG_FACING_EXACT_MATCH, facingExactMatch);
+        args.putInt(ARG_TIMER_DURATION, timerDuration);
+        args.putBoolean(ARG_RULE_OF_THIRDS, ruleOfThirds);
+        f.setArguments(args);
+
+        return (f);
+    }
+
+    public static CameraFragment newVideoInstance(Uri output,
+                                                  boolean updateMediaStore,
+                                                  int quality,
+                                                  int sizeLimit,
+                                                  int durationLimit,
+                                                  ZoomStyle zoomStyle,
+                                                  boolean facingExactMatch,
+                                                  ChronoType chronoType,
+                                                  boolean ruleOfThirds) {
+        CameraFragment f = new CameraFragment();
+        Bundle args = new Bundle();
+
+        args.putParcelable(ARG_OUTPUT, output);
+        args.putBoolean(ARG_UPDATE_MEDIA_STORE, updateMediaStore);
+        args.putBoolean(ARG_IS_VIDEO, true);
+        args.putInt(ARG_QUALITY, quality);
+        args.putInt(ARG_SIZE_LIMIT, sizeLimit);
+        args.putInt(ARG_DURATION_LIMIT, durationLimit);
+        args.putSerializable(ARG_ZOOM_STYLE, zoomStyle);
+        args.putBoolean(ARG_FACING_EXACT_MATCH, facingExactMatch);
+        args.putBoolean(ARG_RULE_OF_THIRDS, ruleOfThirds);
+
+        if (durationLimit > 0 || chronoType != ChronoType.COUNT_DOWN) {
+            args.putSerializable(ARG_CHRONOTYPE, chronoType);
+        }
+
+        f.setArguments(args);
+
+        return (f);
+    }
+
+    /**
+     * Standard fragment entry point.
+     *
+     * @param savedInstanceState State of a previous instance
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setRetainInstance(true);
+        scaleDetector =
+                new ScaleGestureDetector(getActivity().getApplicationContext(),
+                        scaleListener);
+    }
+
+    /**
+     * Standard lifecycle method, passed along to the CameraController.
+     */
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        AbstractCameraActivity.BUS.register(this);
+
+        if (ctlr != null) {
+            ctlr.start();
+        }
+    }
+
+    @Override
+    public void onHiddenChanged(boolean isHidden) {
+        super.onHiddenChanged(isHidden);
+
+        if (!isHidden) {
+            ActionBar ab = getActivity().getActionBar();
+
+            if (ab != null) {
+                ab.setBackgroundDrawable(getActivity()
+                        .getResources()
+                        .getDrawable(
+                                R.drawable.cwac_cam2_action_bar_bg_transparent));
+                ab.setTitle("");
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    ab.setDisplayHomeAsUpEnabled(false);
+                } else {
+                    ab.setDisplayShowHomeEnabled(false);
+                    ab.setHomeButtonEnabled(false);
+                }
+            }
+
+            if (fabPicture != null) {
+                fabPicture.setEnabled(true);
+                fabSwitch.setEnabled(canSwitchSources());
+            }
+        }
+    }
+
+    /**
+     * Standard lifecycle method, for when the fragment moves into
+     * the stopped state. Passed along to the CameraController.
+     */
+    @Override
+    public void onStop() {
+        stopChronometers();
+
+        if (ctlr != null) {
+            try {
+                ctlr.stop();
+            } catch (Exception e) {
+                ctlr.postError(ErrorConstants.ERROR_STOPPING, e);
+                Log.e(getClass().getSimpleName(),
+                        "Exception stopping controller", e);
+            }
+        }
+
+        AbstractCameraActivity.BUS.unregister(this);
+
+        super.onStop();
+    }
+
+    /**
+     * Standard lifecycle method, for when the fragment is utterly,
+     * ruthlessly destroyed. Passed along to the CameraController,
+     * because why should the fragment have all the fun?
+     */
+    @Override
+    public void onDestroy() {
+        if (ctlr != null) {
+            ctlr.destroy();
+        }
+
+        super.onDestroy();
+    }
+
+    /**
+     * Standard callback method to create the UI managed by
+     * this fragment.
+     *
+     * @param inflater           Used to inflate layouts
+     * @param container          Parent of the fragment's UI (eventually)
+     * @param savedInstanceState State of a previous instance
+     * @return the UI being managed by this fragment
+     */
+    @Override
+    public View onCreateView(LayoutInflater inflater,
+                             ViewGroup container,
+                             Bundle savedInstanceState) {
+        View v =
+                inflater.inflate(R.layout.cwac_cam2_fragment, container, false);
+
+        previewStack =
+                (ViewGroup) v.findViewById(R.id.cwac_cam2_preview_stack);
+
+        progress = v.findViewById(R.id.cwac_cam2_progress);
+        fabPicture =
+                (FloatingActionButton) v.findViewById(R.id.cwac_cam2_picture);
+        reverseChronometer =
+                (ReverseChronometer) v.findViewById(R.id.rchrono);
+
+        if (isVideo()) {
+            fabPicture.setImageResource(R.drawable.cwac_cam2_ic_videocam);
+            chronometer = (Chronometer) v.findViewById(R.id.chrono);
+        }
+
+        fabPicture.setOnClickListener(view -> performCameraAction());
+
+        fabSwitch = (FloatingActionButton) v.findViewById(
+                R.id.cwac_cam2_switch_camera);
+        fabSwitch.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                progress.setVisibility(View.VISIBLE);
+                fabSwitch.setEnabled(false);
+
+                try {
+                    ctlr.switchCamera();
+                } catch (Exception e) {
+                    ctlr.postError(ErrorConstants.ERROR_SWITCHING_CAMERAS, e);
+                    Log.e(getClass().getSimpleName(),
+                            "Exception switching camera", e);
+                }
+            }
+        });
+
+        changeMenuIconAnimation(
+                (FloatingActionMenu) v.findViewById(R.id.cwac_cam2_settings));
+
+        onHiddenChanged(false); // hack, since this does not get
+        // called on initial display
+
+        fabPicture.setEnabled(false);
+        fabSwitch.setEnabled(false);
+
+        if (ctlr != null && ctlr.getNumberOfCameras() > 0) {
+            prepController();
+        }
+
+        if (showRuleOfThirds()) {
+            v.findViewById(R.id.rule_of_thirds).setVisibility(View.VISIBLE);
+        }
+
+        return (v);
+    }
+
+    @Override
+    public void onCountdownCompleted() {
+        takePicture();
+    }
+
+    public void shutdown() {
+        if (isVideoRecording) {
+            stopVideoRecording(true);
+        } else {
+            progress.setVisibility(View.VISIBLE);
+
+            if (ctlr != null) {
+                try {
+                    ctlr.stop();
+                } catch (Exception e) {
+                    ctlr.postError(ErrorConstants.ERROR_STOPPING, e);
+                    Log.e(getClass().getSimpleName(),
+                            "Exception stopping controller", e);
+                }
+            }
+        }
+    }
+
+    /**
+     * @return the CameraController this fragment delegates to
+     */
+    public CameraController getController() {
+        return (ctlr);
+    }
+
+    /**
+     * Establishes the controller that this fragment delegates to
+     *
+     * @param ctlr the controller that this fragment delegates to
+     */
+    public void setController(CameraController ctlr) {
+        int currentCamera = -1;
+
+        if (this.ctlr != null) {
+            currentCamera = this.ctlr.getCurrentCamera();
+        }
+
+        this.ctlr = ctlr;
+        ctlr.setQuality(getArguments().getInt(ARG_QUALITY, 1));
+
+        if (currentCamera > -1) {
+            ctlr.setCurrentCamera(currentCamera);
+        }
+    }
+
+    /**
+     * Indicates if we should mirror the preview or not. Defaults
+     * to false.
+     *
+     * @param mirror true if we should horizontally mirror the
+     *               preview, false otherwise
+     */
+    public void setMirrorPreview(boolean mirror) {
+        this.mirrorPreview = mirror;
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(
+            CameraController.ControllerReadyEvent event) {
+        if (event.isEventForController(ctlr)) {
+            prepController();
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(CameraEngine.OpenedEvent event) {
+        if (event.exception == null) {
+            progress.setVisibility(View.GONE);
+            fabSwitch.setEnabled(canSwitchSources());
+            fabPicture.setEnabled(true);
+            zoomSlider = (SeekBar) getView().findViewById(R.id.cwac_cam2_zoom);
+
+            int timerDuration = getArguments().getInt(ARG_TIMER_DURATION);
+
+            if (timerDuration > 0) {
+                reverseChronometer.setVisibility(View.VISIBLE);
+                reverseChronometer.setOverallDuration(timerDuration);
+                reverseChronometer.setListener(this);
+                reverseChronometer.reset();
+                reverseChronometer.run();
+            }
+
+            if (ctlr.supportsZoom()) {
+                if (getZoomStyle() == ZoomStyle.PINCH) {
+                    previewStack.setOnTouchListener(
+                            (v, event1) -> (scaleDetector.onTouchEvent(event1)));
+                } else if (getZoomStyle() == ZoomStyle.SEEKBAR) {
+                    zoomSlider.setVisibility(View.VISIBLE);
+                    zoomSlider.setOnSeekBarChangeListener(seekListener);
+                }
+            } else {
+                previewStack.setOnTouchListener(null);
+                zoomSlider.setVisibility(View.GONE);
+            }
+        } else {
+            ctlr.postError(ErrorConstants.ERROR_OPEN_CAMERA,
+                    event.exception);
+            getActivity().finish();
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(CameraEngine.VideoTakenEvent event) {
+        isVideoRecording = false;
+        stopChronometers();
+
+        if (event.exception == null) {
+            if (getArguments().getBoolean(ARG_UPDATE_MEDIA_STORE, false)) {
+                final Context app = getActivity().getApplicationContext();
+                Uri output = getArguments().getParcelable(ARG_OUTPUT);
+                final String path = output.getPath();
+
+                new Thread() {
+                    @Override
+                    public void run() {
+                        SystemClock.sleep(2000);
+                        MediaScannerConnection.scanFile(app,
+                                new String[]{path}, new String[]{"video/mp4"},
+                                null);
+                    }
+                }.start();
+            }
+
+            isVideoRecording = false;
+            setVideoFABToNormal();
+        } else if (getActivity().isFinishing()) {
+            shutdown();
+        } else {
+            ctlr.postError(ErrorConstants.ERROR_VIDEO_TAKEN,
+                    event.exception);
+            getActivity().finish();
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(
+            CameraEngine.SmoothZoomCompletedEvent event) {
+        inSmoothPinchZoom = false;
+        zoomSlider.setEnabled(true);
+    }
+
+    protected void performCameraAction() {
+        if (isVideo()) {
+            recordVideo();
+        } else {
+            takePicture();
+        }
+    }
+
+    private void takePicture() {
+        Uri output = getArguments().getParcelable(ARG_OUTPUT);
+
+        PictureTransaction.Builder b = new PictureTransaction.Builder();
+
+        if (output != null) {
+            b.toUri(getActivity(), output,
+                    getArguments().getBoolean(ARG_UPDATE_MEDIA_STORE, false),
+                    getArguments().getBoolean(ARG_SKIP_ORIENTATION_NORMALIZATION,
+                            false));
+        }
+
+        fabPicture.setEnabled(false);
+        fabSwitch.setEnabled(false);
+        ctlr.takePicture(b.build());
+    }
+
+    private void recordVideo() {
+        if (isVideoRecording) {
+            stopVideoRecording(false);
+        } else {
+            try {
+                VideoTransaction.Builder b =
+                        new VideoTransaction.Builder();
+                Uri output = getArguments().getParcelable(ARG_OUTPUT);
+
+                b.to(new File(output.getPath()))
+                        .quality(getArguments().getInt(ARG_QUALITY, 1))
+                        .sizeLimit(getArguments().getInt(ARG_SIZE_LIMIT, 0))
+                        .durationLimit(
+                                getArguments().getInt(ARG_DURATION_LIMIT, 0));
+
+                ctlr.recordVideo(b.build());
+                isVideoRecording = true;
+                fabPicture.setImageResource(
+                        R.drawable.cwac_cam2_ic_stop);
+                fabPicture.setColorNormalResId(
+                        R.color.cwac_cam2_recording_fab);
+                fabPicture.setColorPressedResId(
+                        R.color.cwac_cam2_recording_fab_pressed);
+                fabSwitch.setEnabled(false);
+                configureChronometer();
+            } catch (Exception e) {
+                Log.e(getClass().getSimpleName(),
+                        "Exception recording video", e);
+                // TODO: um, do something here
+            }
+        }
+    }
+
+    public void stopVideoRecording() {
+        stopVideoRecording(true);
+    }
+
+    private void stopVideoRecording(boolean abandon) {
+        setVideoFABToNormal();
+
+        try {
+            ctlr.stopVideoRecording(abandon);
+        } catch (Exception e) {
+            ctlr.postError(ErrorConstants.ERROR_STOPPING_VIDEO, e);
+            Log.e(getClass().getSimpleName(),
+                    "Exception stopping recording of video", e);
+        } finally {
+            isVideoRecording = false;
+        }
+    }
+
+    private void setVideoFABToNormal() {
+        fabPicture.setImageResource(
+                R.drawable.cwac_cam2_ic_videocam);
+        fabPicture.setColorNormalResId(
+                R.color.cwac_cam2_picture_fab);
+        fabPicture.setColorPressedResId(
+                R.color.cwac_cam2_picture_fab_pressed);
+        fabSwitch.setEnabled(canSwitchSources());
+    }
+
+    private boolean canSwitchSources() {
+        if (isVideo() && !CameraConstraints.get().supportsFFCVideo()) {
+            return (false);
+        }
+
+        return (!getArguments().getBoolean(ARG_FACING_EXACT_MATCH,
+                false));
+    }
+
+    private boolean isVideo() {
+        return (getArguments().getBoolean(ARG_IS_VIDEO, false));
+    }
+
+    private boolean showRuleOfThirds() {
+        return (getArguments().getBoolean(ARG_RULE_OF_THIRDS, false));
+    }
+
+    private ChronoType getChronoType() {
+        ChronoType chronoType =
+                (ChronoType) getArguments().getSerializable(ARG_CHRONOTYPE);
+
+        if (chronoType == null) {
+            chronoType = ChronoType.NONE;
+        }
+
+        return (chronoType);
+    }
+
+    private void configureChronometer() {
+        chronometer.setBase(SystemClock.elapsedRealtime());
+
+        if (getChronoType() == ChronoType.COUNT_UP) {
+            chronometer.setVisibility(View.VISIBLE);
+            chronometer.start();
+        } else if (getChronoType() == ChronoType.COUNT_DOWN) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                chronometer.setVisibility(View.VISIBLE);
+                chronometer.setBase(SystemClock.elapsedRealtime() +
+                        getArguments().getInt(ARG_DURATION_LIMIT, 0));
+                chronometer.setCountDown(true);
+                chronometer.start();
+            } else {
+                reverseChronometer.setVisibility(View.VISIBLE);
+                reverseChronometer
+                        .setOverallDuration(getArguments()
+                                .getInt(ARG_DURATION_LIMIT, 0) / 1000);
+                reverseChronometer.reset();
+                reverseChronometer.run();
+            }
+        }
+    }
+
+    private void stopChronometers() {
+        if (chronometer != null) {
+            chronometer.stop();
+        }
+
+        if (reverseChronometer != null) {
+            reverseChronometer.setListener(null);
+            reverseChronometer.stop();
+        }
+    }
+
+    private void prepController() {
+        LinkedList<CameraView> cameraViews = new LinkedList<CameraView>();
+        CameraView cv = (CameraView) previewStack.getChildAt(0);
+
+        cv.setMirror(mirrorPreview);
+        cameraViews.add(cv);
+
+        for (int i = 1; i < ctlr.getNumberOfCameras(); i++) {
+            cv = new CameraView(getActivity());
+            cv.setVisibility(View.INVISIBLE);
+            cv.setMirror(mirrorPreview);
+            previewStack.addView(cv);
+            cameraViews.add(cv);
+        }
+
+        ctlr.setCameraViews(cameraViews);
+    }
+
+    // based on https://goo.gl/3IUM8K
+
+    private void changeMenuIconAnimation(
+            final FloatingActionMenu menu) {
+        AnimatorSet set = new AnimatorSet();
+        final ImageView v = menu.getMenuIconView();
+        ObjectAnimator scaleOutX =
+                ObjectAnimator.ofFloat(v, "scaleX", 1.0f, 0.2f);
+        ObjectAnimator scaleOutY =
+                ObjectAnimator.ofFloat(v, "scaleY", 1.0f, 0.2f);
+        ObjectAnimator scaleInX =
+                ObjectAnimator.ofFloat(v, "scaleX", 0.2f, 1.0f);
+        ObjectAnimator scaleInY =
+                ObjectAnimator.ofFloat(v, "scaleY", 0.2f, 1.0f);
+
+        scaleOutX.setDuration(50);
+        scaleOutY.setDuration(50);
+
+        scaleInX.setDuration(150);
+        scaleInY.setDuration(150);
+        scaleInX.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                v.setImageResource(menu.isOpened()
+                        ? R.drawable.cwac_cam2_ic_action_settings
+                        : R.drawable.cwac_cam2_ic_close);
+                // yes, that seems backwards, but it works
+                // presumably, opened state not yet toggled
+            }
+        });
+
+        set.play(scaleOutX).with(scaleOutY);
+        set.play(scaleInX).with(scaleInY).after(scaleOutX);
+        set.setInterpolator(new OvershootInterpolator(2));
+        menu.setIconToggleAnimatorSet(set);
+    }
+
+    private ZoomStyle getZoomStyle() {
+        ZoomStyle result =
+                (ZoomStyle) getArguments().getSerializable(ARG_ZOOM_STYLE);
+
+        if (result == null) {
+            result = ZoomStyle.NONE;
+        }
+
+        return (result);
+    }
+
+    private ScaleGestureDetector.OnScaleGestureListener scaleListener =
+            new ScaleGestureDetector.SimpleOnScaleGestureListener() {
+                @Override
+                public void onScaleEnd(ScaleGestureDetector detector) {
+                    float scale = detector.getScaleFactor();
+                    int delta;
+
+                    if (scale > 1.0f) {
+                        delta = PINCH_ZOOM_DELTA;
+                    } else if (scale < 1.0f) {
+                        delta = -1 * PINCH_ZOOM_DELTA;
+                    } else {
+                        return;
+                    }
+
+                    if (!inSmoothPinchZoom) {
+                        if (ctlr.changeZoom(delta)) {
+                            inSmoothPinchZoom = true;
+                        }
+                    }
+                }
+            };
+
+    private SeekBar.OnSeekBarChangeListener seekListener =
+            new SeekBar.OnSeekBarChangeListener() {
+                @Override
+                public void onProgressChanged(SeekBar seekBar,
+                                              int progress,
+                                              boolean fromUser) {
+                    if (fromUser) {
+                        if (ctlr.setZoom(progress)) {
+                            seekBar.setEnabled(false);
+                        }
+                    }
+                }
+
+                @Override
+                public void onStartTrackingTouch(SeekBar seekBar) {
+                    // no-op
+                }
+
+                @Override
+                public void onStopTrackingTouch(SeekBar seekBar) {
+                    // no-op
+                }
+            };
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraPlugin.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraPlugin.java
new file mode 100644
index 0000000..c469aed
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraPlugin.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+/**
+ * A plugin for configuration camera behavior. A CameraSession
+ * will hold onto a chain of these.
+ * <p/>
+ * Changing plugins, either by reconfiguring plugin instances or
+ * by changing the chain, is not supported once the CameraSession
+ * is created. Create a new session with the new plugins.
+ * This is to minimize compatibility issues where changing the
+ * behavior of the camera on the fly breaks the camera.
+ */
+public interface CameraPlugin {
+  /**
+   * Returns a CameraConfigurator of a given class for this
+   * plugin. Plugins ideally should support both ClassicCameraConfigurator
+   * and CameraTwoConfigurator, though that is up to the plugin.
+   * <p/>
+   * Configurators should be fairly cheap objects to instantiate.
+   * While at the moment they are only used once per session,
+   * that may not be true in the future, and they are not being cached.
+   *
+   * @param type ClassicCameraConfigurator.class or
+   *             CameraTwoConfigurator.class, indicating which type
+   *             of configurator to create
+   * @param <T> ClassicCameraConfigurator or CameraTwoConfigurator
+   * @return instance of the designated configurator class, or
+   *           null if that type is not supported
+   */
+  <T extends CameraConfigurator> T buildConfigurator(Class<T> type);
+
+  /**
+   * Validates whether or not the plugin is valid for this
+   * CameraSession. Throw a runtime exception if it is not.
+   *
+   * @param session the session to validate against
+   */
+  void validate(CameraSession session);
+
+  void destroy();
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSelectionCriteria.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSelectionCriteria.java
new file mode 100644
index 0000000..7b7dff3
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSelectionCriteria.java
@@ -0,0 +1,109 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+/**
+ * Representation of criteria used to select a camera from
+ * available cameras on the device. Used with CameraEngine
+ * for finding a subset of interesting cameras.
+ */
+public class CameraSelectionCriteria {
+  private Facing facing;
+  private boolean facingExactMatch=false;
+  private boolean isVideo=false;
+
+  /**
+   * Getter method for the facing value, indicating if we
+   * want the camera to be front-facing, back-facing, or
+   * any direction.
+   *
+   * @return the facing value
+   */
+  public Facing getFacing() {
+    return(facing);
+  }
+
+  /**
+   * @return true if the requested facing camera must be an
+   * exact match, false otherwise
+   */
+  public boolean getFacingExactMatch() {
+    return(facingExactMatch);
+  }
+
+  /**
+   * @return true if this will be used for video
+   */
+  public boolean isVideo() {
+    return(isVideo);
+  }
+
+  /**
+   * Class to create instances of CameraSelectionCriteria via
+   * a fluent, builder-style API.
+   */
+  public static class Builder {
+    final private CameraSelectionCriteria criteria=new CameraSelectionCriteria();
+
+    /**
+     * Setter for the facing value, indicating if we
+     * want the camera to be front-facing, back-facing, or
+     * any direction.
+     *
+     * @param facing the facing value
+     * @return the builder, for chained calls
+     */
+    public Builder facing(Facing facing) {
+      criteria.facing=facing;
+
+      return(this);
+    }
+
+    /**
+     * Setter for indicating if the requested facing value must
+     * be an exact match or not. Defaults to false.
+     *
+     * @param match true if must be an exact match, false otherwise
+     * @return the builder, for chained calls
+     */
+    public Builder facingExactMatch(boolean match) {
+      criteria.facingExactMatch=match;
+
+      return(this);
+    }
+
+    /**
+     * Setting for indicating if we will be using this camera for video
+     *
+     * @param isVideo true if the camera will be used for video, false otherwise
+     * @return the builder, for chained calls
+     */
+    public Builder isVideo(boolean isVideo) {
+      criteria.isVideo=isVideo;
+
+      return(this);
+    }
+
+    /**
+     * Returns the fabricated criteria
+     *
+     * @return the criteria defined via calls on the builder
+     */
+    public CameraSelectionCriteria build() {
+      return(criteria);
+    }
+  }
+
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java
new file mode 100644
index 0000000..1e3bd84
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java
@@ -0,0 +1,128 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.content.Context;
+import com.commonsware.cwac.cam2.util.Size;
+import java.util.ArrayList;
+
+/**
+ * Class representing a session with a camera. While
+ * a CameraDescriptor is simply a declaration of "there exists
+ * a camera with these capabilities", CameraSession indicates
+ * what you want to have happen with a particular camera, for
+ * general operation. This is roughly analogous to Camera.Parameters
+ * in the classic Camera API.
+ *
+ * To create instances, call buildSession() on an
+ * instance of a CameraEngine, then use the resulting
+ * CameraSession.Builder to describe what you want, followed
+ * by a call to build() to give you the actual CameraSession.
+ */
+public class CameraSession {
+  private final CameraDescriptor descriptor;
+  private Context ctxt;
+  private final ArrayList<CameraPlugin> plugins=new ArrayList<CameraPlugin>();
+  private Size previewSize;
+  private FlashMode currentFlashMode;
+
+  /**
+   * Constructor.
+   *
+   * @param ctxt an Android Context to use for accessing system stuff
+   * @param descriptor the camera to use for this session
+   */
+  CameraSession(Context ctxt, CameraDescriptor descriptor) {
+    this.ctxt=ctxt.getApplicationContext();
+    this.descriptor=descriptor;
+  }
+
+  /**
+   * @return an Android Context suitable for looking up filesystem
+   * paths and the like
+   */
+  public Context getContext() {
+    return(ctxt);
+  }
+
+  /**
+   * @return the camera to use for this session
+   */
+  public CameraDescriptor getDescriptor() {
+    return(descriptor);
+  }
+
+  /**
+   * @return the roster of plugins configured for this session
+   */
+  protected ArrayList<CameraPlugin> getPlugins() {
+    return(plugins);
+  }
+
+  public void destroy() {
+    for (CameraPlugin plugin : getPlugins()) {
+      plugin.destroy();
+    }
+  }
+
+  public Size getPreviewSize() {
+    return(previewSize);
+  }
+
+  public void setPreviewSize(Size previewSize) {
+    this.previewSize=previewSize;
+  }
+
+  public FlashMode getCurrentFlashMode() {
+    return(currentFlashMode);
+  }
+
+  void setCurrentFlashMode(FlashMode currentFlashMode) {
+    this.currentFlashMode=currentFlashMode;
+  }
+
+  /**
+   * Class to build an instance of a CameraSession. Get an instance
+   * from buildSession() on your chosen CameraEngine.
+   */
+  abstract public static class Builder {
+    protected final CameraSession session;
+
+    protected Builder(CameraSession session) {
+      this.session=session;
+    }
+
+    /**
+     * Adds a plugin to the chain of plugins for this session.
+     * Pre-configure the plugin before adding.
+     *
+     * @param plugin a CameraPlugin instance
+     * @return the Builder, for chained calls
+     */
+    public Builder addPlugin(CameraPlugin plugin) {
+      plugin.validate(session);
+      session.plugins.add(plugin);
+
+      return(this);
+    }
+
+    /**
+     * @return the CameraSession, configured as you requested
+     */
+    public CameraSession build() {
+      return(session);
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoConfigurator.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoConfigurator.java
new file mode 100644
index 0000000..d2e75e6
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoConfigurator.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.media.ImageReader;
+
+/**
+ * Camera configurator for the CameraTwoEngine, to be used as
+ * part of a CameraPlugin for configuring camera behavior.
+ */
+public interface CameraTwoConfigurator extends CameraConfigurator {
+  /**
+   * @return an ImageReader to be used by the CameraTwoEngine,
+   * or null if this configurator is not responsible for creating
+   * the ImageReader
+   */
+  ImageReader buildImageReader();
+
+  /**
+   * Updates a CaptureRequest to reflect what the plugin needs.
+   *
+   * @param cc CameraCharacteristics for the camera being used
+   * @param facingFront true if the camera is front-facing, false
+   *                    otherwise
+   * @param captureBuilder the builder for the request, to be
+   *                       configured
+   */
+  void addToCaptureRequest(CameraSession session,
+                           CameraCharacteristics cc,
+                           boolean facingFront,
+                           CaptureRequest.Builder captureBuilder);
+
+  /**
+   * Updates a preview CaptureRequest to reflect what the plugin needs.
+   *
+   * @param cc CameraCharacteristics for the camera being used
+   * @param captureBuilder the builder for the request, to be
+   *                       configured
+   */
+  void addToPreviewRequest(CameraSession session,
+                           CameraCharacteristics cc,
+                           CaptureRequest.Builder captureBuilder);
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java
new file mode 100644
index 0000000..197b3b4
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java
@@ -0,0 +1,924 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.ImageFormat;
+import android.graphics.Rect;
+import android.graphics.SurfaceTexture;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureFailure;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.TotalCaptureResult;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.media.Image;
+import android.media.ImageReader;
+import android.media.MediaActionSound;
+import android.os.Build;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.util.Log;
+import android.view.Surface;
+
+import androidx.annotation.NonNull;
+
+import com.commonsware.cwac.cam2.util.Size;
+import org.greenrobot.eventbus.EventBus;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Implementation of a CameraEngine that supports the
+ * Android 5.0+ android.hardware.camera2 API.
+ */
+@SuppressWarnings("ResourceType")
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+public class CameraTwoEngine extends CameraEngine {
+  private final Context ctxt;
+  private CameraManager mgr;
+  final private HandlerThread handlerThread=new HandlerThread(getClass().getSimpleName(),
+      android.os.Process.THREAD_PRIORITY_BACKGROUND);
+  final private Handler handler;
+  final private Semaphore lock=new Semaphore(1);
+//  private CountDownLatch closeLatch=null;
+  private MediaActionSound shutter=new MediaActionSound();
+  private List<Descriptor> descriptors=null;
+
+  /**
+   * Standard constructor
+   *
+   * @param ctxt any Context will do
+   */
+  public CameraTwoEngine(Context ctxt) {
+    this.ctxt=ctxt.getApplicationContext();
+    mgr=(CameraManager)this.ctxt.
+        getSystemService(Context.CAMERA_SERVICE);
+    handlerThread.start();
+    handler=new Handler(handlerThread.getLooper());
+    shutter.load(MediaActionSound.SHUTTER_CLICK);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public CameraSession.Builder buildSession(Context ctxt, CameraDescriptor descriptor) {
+    return(new SessionBuilder(ctxt, descriptor));
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void loadCameraDescriptors(final CameraSelectionCriteria criteria) {
+    getThreadPool().execute(new Runnable() {
+      @Override
+      public void run() {
+        if (descriptors==null) {
+          List<Descriptor> result=new ArrayList<Descriptor>();
+
+          try {
+            for (String cameraId : mgr.getCameraIdList()) {
+              CameraCharacteristics cc=
+                mgr.getCameraCharacteristics(cameraId);
+              Descriptor camera=new Descriptor(cameraId, cc);
+              StreamConfigurationMap map=cc.get(
+                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+              android.util.Size[] rawSizes=
+                map.getOutputSizes(SurfaceTexture.class);
+              CameraConstraints constraint=CameraConstraints.get();
+
+              camera.setFacingFront(
+                cc.get(CameraCharacteristics.LENS_FACING)==
+                  CameraCharacteristics.LENS_FACING_FRONT);
+
+              List<Size> sizes=null;
+
+              if (constraint!=null) {
+                if (camera.isFacingFront) {
+                  sizes=constraint.getPreviewFFCSizeWhitelist();
+                }
+                else {
+                  sizes=constraint.getPreviewRFCSizeWhitelist();
+                }
+              }
+
+              if (sizes==null) {
+                sizes=new ArrayList<Size>();
+
+                for (android.util.Size size : rawSizes) {
+                  if (size.getWidth()<2160 &&
+                    size.getHeight()<2160) {
+                    sizes.add(
+                      new Size(size.getWidth(), size.getHeight()));
+                  }
+                }
+              }
+
+              camera.setPreviewSizes(sizes);
+              sizes=null;
+
+              if (constraint!=null) {
+                if (camera.isFacingFront) {
+                  sizes=constraint.getPictureFFCSizeWhitelist();
+                }
+                else {
+                  sizes=constraint.getPictureRFCSizeWhitelist();
+                }
+              }
+
+              if (sizes==null) {
+                sizes=new ArrayList<>();
+
+                for (android.util.Size size : map.getOutputSizes(ImageFormat.JPEG)) {
+                  sizes.add(new Size(size.getWidth(), size.getHeight()));
+                }
+              }
+
+              camera.setPictureSizes(sizes);
+              result.add(camera);
+            }
+
+            descriptors=result;
+          }
+          catch (CameraAccessException e) {
+            getBus().post(
+              new CameraEngine.CameraDescriptorsEvent(e));
+
+            if (isDebug()) {
+              Log.e(getClass().getSimpleName(),
+                "Exception accessing camera", e);
+            }
+          }
+        }
+
+        List<CameraDescriptor> result=
+          new ArrayList<CameraDescriptor>();
+
+        for (Descriptor camera : descriptors) {
+          if ((!criteria.getFacingExactMatch() ||
+            camera.getScore(criteria)>0) &&
+            !criteria.isVideo() ||
+            (camera.isFacingFront && CameraConstraints.get().supportsFFCVideo()) ||
+            (!camera.isFacingFront && CameraConstraints.get().supportsRFCVideo())) {
+            result.add(camera);
+          }
+        }
+
+        Collections.sort(result,
+                (descriptor, t1) -> {
+                  Descriptor lhs=(Descriptor)descriptor;
+                  Descriptor rhs=(Descriptor)t1;
+
+                  // descending, so invert normal side-ness
+
+                  return (Integer.compare(rhs.getScore(criteria),
+                    lhs.getScore(criteria)));
+                });
+
+        getBus().post(
+          new CameraEngine.CameraDescriptorsEvent(result));
+      }
+    });
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void open(final CameraSession session,
+                   final SurfaceTexture texture) {
+    getThreadPool().execute(new Runnable() {
+      @Override
+      public void run() {
+        Descriptor camera=(Descriptor)session.getDescriptor();
+
+        try {
+          CameraCharacteristics cc=
+            mgr.getCameraCharacteristics(camera.getId());
+
+          eligibleFlashModes.clear();
+
+          int[] availModes=cc.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES);
+
+          for (FlashMode flashMode : preferredFlashModes) {
+            for (int rawFlashMode : availModes) {
+              if (rawFlashMode==flashMode.getCameraTwoMode()) {
+                eligibleFlashModes.add(flashMode);
+                break;
+              }
+            }
+          }
+
+          if (eligibleFlashModes.isEmpty()) {
+            for (int rawFlashMode : availModes) {
+              FlashMode flashMode=FlashMode.lookupCameraTwoMode(
+                rawFlashMode);
+
+              if (flashMode!=null) {
+                eligibleFlashModes.add(flashMode);
+              }
+            }
+          }
+
+          session.setCurrentFlashMode(eligibleFlashModes.get(0));
+
+          if (!lock.tryAcquire(2500, TimeUnit.MILLISECONDS)) {
+            throw new RuntimeException("Time out waiting to lock camera opening.");
+          }
+
+          mgr.openCamera(camera.getId(),
+              new InitPreviewTransaction(session, new Surface(texture)),
+              handler);
+        }
+        catch (Exception e) {
+          getBus().post(new OpenedEvent(e));
+
+          if (isDebug()) {
+            Log.e(getClass().getSimpleName(), "Exception opening camera", e);
+          }
+        }
+      }
+    });
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void close(final CameraSession session) {
+    final Session s=(Session)session;
+
+    try {
+      lock.acquire();
+
+      if (s.captureSession != null) {
+        // closeLatch=new CountDownLatch(1);
+        s.captureSession.close();
+        // closeLatch.await(2, TimeUnit.SECONDS);
+        s.captureSession=null;
+      }
+
+      if (s.cameraDevice != null) {
+        s.cameraDevice.close();
+        s.cameraDevice=null;
+      }
+
+      if (s.reader != null) {
+        s.reader.close();
+      }
+
+      s.setClosed(true);
+
+      Descriptor camera=(Descriptor)session.getDescriptor();
+
+      camera.setDevice(null);
+      session.destroy();
+      getBus().post(new ClosedEvent());
+    }
+    catch (Exception e) {
+      getBus().post(new ClosedEvent(e));
+    }
+    finally {
+      lock.release();
+    }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public void takePicture(CameraSession session,
+                          PictureTransaction xact) {
+    final Session s=(Session)session;
+
+    s.reader.setOnImageAvailableListener(new TakePictureTransaction(session.getContext(), getBus(), xact),
+        handler);
+
+    getThreadPool().execute(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          // This is how to tell the camera to lock focus.
+          s.previewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
+              CameraMetadata.CONTROL_AF_TRIGGER_START);
+          s.captureSession.setRepeatingRequest(
+            s.previewRequestBuilder.build(),
+            new RequestCaptureTransaction(s),
+            handler);
+        }
+        catch (Exception e) {
+          getBus().post(new PictureTakenEvent(e));
+
+          if (isDebug()) {
+            Log.e(getClass().getSimpleName(), "Exception taking picture", e);
+          }
+        }
+      }
+    });
+  }
+
+  @Override
+  public void handleOrientationChange(CameraSession session,
+                                      OrientationChangedEvent event) {
+    // TODO
+  }
+
+  @Override
+  public void recordVideo(CameraSession session, VideoTransaction xact) {
+    // TODO
+  }
+
+  @Override
+  public void stopVideoRecording(CameraSession session, boolean abandon) {
+    // TODO
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public boolean supportsDynamicFlashModes() {
+    return(true);
+  }
+
+  @Override
+  public boolean supportsZoom(CameraSession session) {
+    boolean result=false;
+    Descriptor descriptor=(Descriptor)session.getDescriptor();
+
+    try {
+      CameraCharacteristics cc=
+        mgr.getCameraCharacteristics(descriptor.cameraId);
+
+      float maxZoom=cc.get(
+        CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
+
+      result=(maxZoom>=1.0f);
+    }
+    catch (CameraAccessException e) {
+      getBus().post(new DeepImpactEvent(e));
+    }
+
+    return(result);
+  }
+
+  @Override
+  public boolean zoomTo(CameraSession session,
+                         int zoomLevel) {
+    final Session s=(Session)session;
+
+    if (session!=null) {
+      final Descriptor descriptor=(Descriptor)session.getDescriptor();
+
+      if (s.previewRequest!=null) {
+        try {
+          final CameraCharacteristics cc=
+            mgr.getCameraCharacteristics(descriptor.cameraId);
+          final float maxZoom=
+            cc.get(
+              CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
+
+          // if <=1, zoom not possible, so eat the the event
+          if (maxZoom>1.0f) {
+            float zoomTo=1.0f+((float)zoomLevel*(maxZoom-1.0f)/100.0f);
+            Rect zoomRect=cropRegionForZoom(cc, zoomTo);
+
+            s.previewRequestBuilder
+              .set(CaptureRequest.SCALER_CROP_REGION, zoomRect);
+            s.setZoomRect(zoomRect);
+            s.previewRequest=s.previewRequestBuilder.build();
+            s.captureSession.setRepeatingRequest(s.previewRequest,
+              null, handler);
+          }
+        }
+        catch (CameraAccessException e) {
+          getBus().post(new DeepImpactEvent(e));
+        }
+      }
+    }
+
+    return(false);
+  }
+
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+  private static Rect cropRegionForZoom(CameraCharacteristics cc,
+                                        float zoomTo) {
+    Rect sensor=
+      cc.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
+    int sensorCenterX=sensor.width()/2;
+    int sensorCenterY=sensor.height()/2;
+    int deltaX=(int)(0.5f*sensor.width()/zoomTo);
+    int deltaY=(int)(0.5f*sensor.height()/zoomTo);
+
+    return(new Rect(
+      sensorCenterX-deltaX,
+      sensorCenterY-deltaY,
+      sensorCenterX+deltaX,
+      sensorCenterY+deltaY));
+  }
+
+  private class InitPreviewTransaction extends CameraDevice.StateCallback {
+    private final Session s;
+    private final Surface surface;
+
+    InitPreviewTransaction(CameraSession session, Surface surface) {
+      this.s=(Session)session;
+      this.surface=surface;
+    }
+
+    @Override
+    public void onOpened(@NonNull CameraDevice cameraDevice) {
+      lock.release();
+      s.cameraDevice=cameraDevice;
+      s.reader=s.buildImageReader();
+
+      Descriptor camera=(Descriptor)s.getDescriptor();
+
+      camera.setDevice(cameraDevice);
+
+      try {
+        cameraDevice.createCaptureSession(
+            Arrays.asList(surface, s.reader.getSurface()),
+            new StartPreviewTransaction(s, surface), handler);
+      }
+      catch (CameraAccessException e) {
+        getBus().post(new OpenedEvent(e));
+      }
+      catch (IllegalStateException e2) {
+        getBus().post(new DeepImpactEvent(e2));
+      }
+    }
+
+    @Override
+    public void onDisconnected(CameraDevice cameraDevice) {
+      lock.release();
+      cameraDevice.close();
+    }
+
+    @Override
+    public void onError(CameraDevice cameraDevice, int i) {
+      lock.release();
+      cameraDevice.close();
+      getBus().post(new CameraTwoPreviewErrorEvent(i));
+    }
+
+    @Override
+    public void onClosed(@NonNull CameraDevice camera) {
+      super.onClosed(camera);
+
+/*
+      if (closeLatch != null) {
+        closeLatch.countDown();
+      }
+*/
+    }
+  }
+
+  private class StartPreviewTransaction extends CameraCaptureSession.StateCallback {
+    private final Surface surface;
+    private final Session s;
+
+    StartPreviewTransaction(CameraSession session, Surface surface) {
+      this.s=(Session)session;
+      this.surface=surface;
+    }
+
+    @Override
+    public void onConfigured(@NonNull CameraCaptureSession session) {
+      try {
+        if (!s.isClosed()) {
+          s.captureSession=session;
+
+          s.previewRequestBuilder=session.getDevice().createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+          s.previewRequestBuilder.addTarget(surface);
+          s.previewRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
+              CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
+          s.previewRequestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
+              CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
+
+          Descriptor camera=(Descriptor)s.getDescriptor();
+          CameraCharacteristics cc=mgr.getCameraCharacteristics(camera.cameraId);
+
+          if (s.getZoomRect()!=null) {
+            s
+              .previewRequestBuilder
+              .set(CaptureRequest.SCALER_CROP_REGION,
+                s.getZoomRect());
+          }
+
+          s.addToPreviewRequest(cc, s.previewRequestBuilder);
+
+          s.previewRequest=s.previewRequestBuilder.build();
+
+          session.setRepeatingRequest(s.previewRequest, null, handler);
+
+          getBus().post(new OpenedEvent());
+        }
+      }
+      catch (CameraAccessException e) {
+        getBus().post(new OpenedEvent(e));
+      }
+      catch (IllegalStateException e) {
+        if (isDebug()) {
+          Log.w(getClass().getSimpleName(), "Exception resetting focus", e);
+        }
+      }
+    }
+
+    @Override
+    public void onConfigureFailed(@NonNull CameraCaptureSession session) {
+      getBus().post(new CameraTwoPreviewFailureEvent());
+    }
+  }
+
+  private class RequestCaptureTransaction extends CameraCaptureSession.CaptureCallback {
+    private final Session s;
+    boolean isWaitingForFocus=true;
+    boolean isWaitingForPrecapture=false;
+    boolean haveWeStartedCapture=false;
+
+    RequestCaptureTransaction(CameraSession session) {
+      this.s=(Session)session;
+    }
+
+    @Override
+    public void onCaptureProgressed(@NonNull CameraCaptureSession session,
+                                    @NonNull CaptureRequest request, @NonNull CaptureResult partialResult) {
+      capture(partialResult);
+    }
+
+    @Override
+    public void onCaptureFailed(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, @NonNull CaptureFailure failure) {
+      getBus().post(new PictureTakenEvent(new RuntimeException("generic camera2 capture failure")));
+    }
+
+    @Override
+    public void onCaptureCompleted(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, @NonNull TotalCaptureResult result) {
+      capture(result);
+    }
+
+    private void capture(CaptureResult result) {
+      if (isWaitingForFocus) {
+        isWaitingForFocus=false;
+
+        Integer autoFocusState=result.get(CaptureResult.CONTROL_AF_STATE);
+
+        if (autoFocusState!=null &&
+            (CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED == autoFocusState ||
+              CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED == autoFocusState)) {
+          Integer state=result.get(CaptureResult.CONTROL_AE_STATE);
+
+          if (state == null ||
+              state == CaptureResult.CONTROL_AE_STATE_CONVERGED) {
+            isWaitingForPrecapture=false;
+            haveWeStartedCapture=true;
+            capture(s);
+          } else {
+            isWaitingForPrecapture=true;
+            precapture(s);
+          }
+        }
+      }
+      else if (isWaitingForPrecapture) {
+        Integer state=result.get(CaptureResult.CONTROL_AE_STATE);
+
+        if (state == null ||
+            state == CaptureResult.CONTROL_AE_STATE_PRECAPTURE ||
+            state == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) {
+          isWaitingForPrecapture=false;
+        }
+      }
+      else if (!haveWeStartedCapture) {
+        Integer state=result.get(CaptureResult.CONTROL_AE_STATE);
+
+        if (state == null ||
+            state != CaptureResult.CONTROL_AE_STATE_PRECAPTURE) {
+          haveWeStartedCapture=true;
+          capture(s);
+        }
+      }
+    }
+
+    private void precapture(Session s) {
+      try {
+        s.previewRequestBuilder.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
+            CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_START);
+        s.captureSession.capture(s.previewRequestBuilder.build(), this,
+            handler);
+      }
+      catch (Exception e) {
+        getBus().post(new PictureTakenEvent(e));
+
+        if (isDebug()) {
+          Log.e(getClass().getSimpleName(), "Exception running precapture", e);
+        }
+      }
+    }
+
+    private void capture(Session s) {
+      try {
+        CaptureRequest.Builder captureBuilder=
+            s.cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+
+        captureBuilder.addTarget(s.reader.getSurface());
+        captureBuilder.set(CaptureRequest.CONTROL_AF_MODE,
+            CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
+        captureBuilder.set(CaptureRequest.CONTROL_AE_MODE,
+            CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
+
+        Descriptor camera=(Descriptor)s.getDescriptor();
+        CameraCharacteristics cc=mgr.getCameraCharacteristics(camera.cameraId);
+
+        if (s.getZoomRect()!=null) {
+          captureBuilder
+            .set(CaptureRequest.SCALER_CROP_REGION,
+              s.getZoomRect());
+        }
+
+        s.addToCaptureRequest(cc, camera.isFacingFront, captureBuilder);
+
+        s.captureSession.stopRepeating();
+        s.captureSession.capture(captureBuilder.build(),
+            new CapturePictureTransaction(s), null);
+      }
+      catch (Exception e) {
+        getBus().post(new PictureTakenEvent(e));
+
+        if (isDebug()) {
+          Log.e(getClass().getSimpleName(), "Exception running capture", e);
+        }
+      }
+    }
+  }
+
+  private class CapturePictureTransaction
+    extends CameraCaptureSession.CaptureCallback {
+    private final Session s;
+
+    CapturePictureTransaction(CameraSession session) {
+      this.s=(Session)session;
+    }
+
+    @Override
+    public void onCaptureStarted(@NonNull CameraCaptureSession session,
+                                 @NonNull CaptureRequest request,
+                                 long timestamp, long frameNumber) {
+      super.onCaptureStarted(session, request, timestamp, frameNumber);
+
+      shutter.play(MediaActionSound.SHUTTER_CLICK);
+    }
+
+    @Override
+    public void onCaptureCompleted(@NonNull CameraCaptureSession session,
+                                   @NonNull CaptureRequest request,
+                                   @NonNull TotalCaptureResult result) {
+      // TODO: something useful with the picture
+      unlockFocus();
+    }
+
+    @Override
+    public void onCaptureFailed(@NonNull CameraCaptureSession session,
+                                @NonNull CaptureRequest request,
+                                @NonNull CaptureFailure failure) {
+      getBus()
+        .post(new PictureTakenEvent(new RuntimeException("generic camera2 capture failure")));
+    }
+
+    private void unlockFocus() {
+      try {
+        if (!s.isClosed()) {
+          s.previewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
+              CameraMetadata.CONTROL_AF_TRIGGER_CANCEL);
+          s.previewRequestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
+              CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
+
+          CameraCaptureSession session=s.captureSession;
+
+          if (session!=null) {
+            session.capture(s.previewRequestBuilder.build(), null,
+              handler);
+            session.setRepeatingRequest(s.previewRequest, null,
+              handler);
+          }
+        }
+      }
+      catch (CameraAccessException e) {
+        getBus().post(new PictureTakenEvent(e));
+
+        if (isDebug()) {
+          Log.e(getClass().getSimpleName(), "Exception resetting focus", e);
+        }
+      }
+      catch (IllegalStateException e) {
+        getBus().post(new DeepImpactEvent(e));
+
+        if (isDebug()) {
+          Log.w(getClass().getSimpleName(), "Exception resetting focus", e);
+        }
+      }
+    }
+  }
+
+  private static class AreaComparator implements Comparator<Size> {
+    @Override
+    public int compare(Size lhs, Size rhs) {
+      long lhArea=(long)lhs.getWidth() * lhs.getHeight();
+      long rhArea=(long)rhs.getWidth() * rhs.getHeight();
+
+      return(Long.signum(lhArea - rhArea));
+    }
+  }
+
+  static class Descriptor implements CameraDescriptor {
+    private final String cameraId;
+    private CameraDevice device;
+    private List<Size> pictureSizes;
+    private List<Size> previewSizes;
+    private boolean isFacingFront;
+    private final Integer facing;
+
+    private Descriptor(String cameraId, CameraCharacteristics cc) {
+      this.cameraId=cameraId;
+      facing=cc.get(CameraCharacteristics.LENS_FACING);
+    }
+
+    public String getId() {
+      return (cameraId);
+    }
+
+    private void setDevice(CameraDevice device) {
+      this.device=device;
+    }
+
+    private CameraDevice getDevice() {
+      return (device);
+    }
+
+    @Override
+    public boolean isPictureFormatSupported(int format) {
+      return(ImageFormat.JPEG == format);
+    }
+
+    @Override
+    public List<Size> getPreviewSizes() {
+      return(previewSizes);
+    }
+
+    private void setPreviewSizes(List<Size> sizes) {
+      previewSizes=sizes;
+    }
+
+    @Override
+    public List<Size> getPictureSizes() {
+      return(pictureSizes);
+    }
+
+    private void setPictureSizes(List<Size> sizes) {
+      pictureSizes=sizes;
+    }
+
+    private void setFacingFront(boolean isFacingFront) {
+      this.isFacingFront=isFacingFront;
+    }
+
+    private int getScore(CameraSelectionCriteria criteria) {
+      int score=10;
+
+      if (criteria != null) {
+        if ((criteria.getFacing().isFront() &&
+            facing!=CameraCharacteristics.LENS_FACING_FRONT) ||
+            (!criteria.getFacing().isFront() &&
+                facing!=CameraCharacteristics.LENS_FACING_BACK)) {
+          score=0;
+        }
+      }
+
+      return(score);
+    }
+  }
+
+  private static class Session extends CameraSession {
+    CameraDevice cameraDevice=null;
+    CameraCaptureSession captureSession=null;
+    CaptureRequest.Builder previewRequestBuilder=null;
+    CaptureRequest previewRequest;
+    ImageReader reader;
+    boolean isClosed=false;
+    Rect zoomRect=null;
+
+    private Session(Context ctxt, CameraDescriptor descriptor) {
+      super(ctxt, descriptor);
+    }
+
+    ImageReader buildImageReader() {
+      ImageReader result=null;
+
+      for (CameraPlugin plugin : getPlugins()) {
+        CameraTwoConfigurator configurator=plugin.buildConfigurator(CameraTwoConfigurator.class);
+
+        if (configurator!=null) {
+          result=configurator.buildImageReader();
+        }
+
+        if (result!=null) break;
+      }
+
+      return(result);
+    }
+
+    void addToCaptureRequest(CameraCharacteristics cc,
+                             boolean isFacingFront,
+                             CaptureRequest.Builder captureBuilder) {
+      for (CameraPlugin plugin : getPlugins()) {
+        CameraTwoConfigurator configurator=plugin.buildConfigurator(CameraTwoConfigurator.class);
+
+        if (configurator!=null) {
+          configurator.addToCaptureRequest(this, cc, isFacingFront, captureBuilder);
+        }
+      }
+    }
+
+    void addToPreviewRequest(CameraCharacteristics cc,
+                             CaptureRequest.Builder captureBuilder) {
+      for (CameraPlugin plugin : getPlugins()) {
+        CameraTwoConfigurator configurator=plugin.buildConfigurator(CameraTwoConfigurator.class);
+
+        if (configurator!=null) {
+          configurator.addToPreviewRequest(this, cc, captureBuilder);
+        }
+      }
+    }
+
+    boolean isClosed() {
+      return(isClosed);
+    }
+
+    void setClosed(boolean isClosed) {
+      this.isClosed=isClosed;
+    }
+
+    Rect getZoomRect() {
+      return(zoomRect);
+    }
+
+    void setZoomRect(Rect zoomRect) {
+      this.zoomRect=zoomRect;
+    }
+  }
+
+  private static class SessionBuilder extends CameraSession.Builder {
+    private SessionBuilder(Context ctxt, CameraDescriptor descriptor) {
+      super(new Session(ctxt, descriptor));
+    }
+  }
+
+  private static class TakePictureTransaction implements ImageReader.OnImageAvailableListener {
+    private final EventBus bus;
+    private final PictureTransaction xact;
+    private final Context ctxt;
+
+    TakePictureTransaction(Context ctxt, EventBus bus, PictureTransaction xact) {
+      this.bus=bus;
+      this.xact=xact;
+      this.ctxt=ctxt.getApplicationContext();
+    }
+
+    @Override
+    public void onImageAvailable(ImageReader imageReader) {
+      Image image=imageReader.acquireNextImage();
+      ByteBuffer buffer=image.getPlanes()[0].getBuffer();
+      byte[] bytes=new byte[buffer.remaining()];
+
+      buffer.get(bytes);
+      image.close();
+
+      bus.post(new PictureTakenEvent(xact,
+        xact.process(new ImageContext(ctxt, bytes))));
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraView.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraView.java
new file mode 100644
index 0000000..a6d949c
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraView.java
@@ -0,0 +1,231 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Matrix;
+import android.graphics.RectF;
+import android.graphics.SurfaceTexture;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Surface;
+import android.view.TextureView;
+import android.view.WindowManager;
+import com.commonsware.cwac.cam2.util.Size;
+
+/**
+ * Class responsible for rendering preview frames on the UI
+ * as a View for the user to see and interact with. Also handles
+ * maintaining aspect ratios and dealing with full-bleed previews.
+ */
+public class CameraView extends TextureView implements TextureView.SurfaceTextureListener {
+  public interface StateCallback {
+    void onReady(CameraView cv);
+    void onDestroyed(CameraView cv) throws Exception;
+  }
+
+  /**
+   * The requested size of the preview frames, or null to just
+   * use the size of the view itself
+   */
+  private Size previewSize;
+  private StateCallback stateCallback;
+  private boolean mirror=false;
+
+  /**
+   * Constructor, used for creating instances from Java code.
+   *
+   * @param context the Activity that will host this View
+   */
+  public CameraView(Context context) {
+    super(context, null);
+    initListener();
+  }
+
+  /**
+   * Constructor, used by layout inflation.
+   *
+   * @param context the Activity that will host this View
+   * @param attrs the parsed attributes from the layout resource tag
+   */
+  public CameraView(Context context, AttributeSet attrs) {
+    super(context, attrs, 0);
+    initListener();
+  }
+
+  /**
+   * Constructor, used by... something.
+   *
+   * @param context the Activity that will host this View
+   * @param attrs the parsed attributes from the layout resource tag
+   * @param defStyle "An attribute in the current theme that
+   *                 contains a reference to a style resource
+   *                 that supplies default values for the view.
+   *                 Can be 0 to not look for defaults."
+   */
+  public CameraView(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+    initListener();
+  }
+
+  /**
+   * @return the requested preview size
+   */
+  public Size getPreviewSize() {
+    return(previewSize);
+  }
+
+  /**
+   * @param previewSize the requested preview size
+   */
+  public void setPreviewSize(Size previewSize) {
+    this.previewSize=previewSize;
+
+    enterTheMatrix();
+    requestLayout();
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+    int width=MeasureSpec.getSize(widthMeasureSpec);
+    int height=MeasureSpec.getSize(heightMeasureSpec);
+    boolean isFullBleed=true;
+
+    if (previewSize==null) {
+      setMeasuredDimension(width, height);
+    }
+    else {
+      if (isFullBleed) {
+        if (width>height*previewSize.getWidth()/previewSize.getHeight()) {
+          setMeasuredDimension(width,
+            width*previewSize.getHeight()/previewSize.getWidth());
+        }
+        else {
+          setMeasuredDimension(height*previewSize.getWidth()/previewSize.getHeight(),
+            height);
+        }
+      }
+      else {
+        if (width<height*previewSize.getWidth()/previewSize.getHeight()) {
+          setMeasuredDimension(width,
+            width*previewSize.getHeight()/previewSize.getWidth());
+        }
+        else {
+          setMeasuredDimension(height*previewSize.getWidth()/previewSize.getHeight(),
+            height);
+        }
+      }
+    }
+  }
+
+  public void setStateCallback(StateCallback cb) {
+    stateCallback=cb;
+  }
+
+  public void setMirror(boolean mirror) {
+    this.mirror=mirror;
+  }
+
+  private void initListener() {
+    setSurfaceTextureListener(this);
+  }
+
+  @Override
+  public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int i, int i1) {
+    if (stateCallback!=null) {
+      stateCallback.onReady(this);
+    }
+  }
+
+  @Override
+  public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture, int i, int i1) {
+    enterTheMatrix();
+  }
+
+  @Override
+  public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
+    if (stateCallback!=null) {
+      try {
+        stateCallback.onDestroyed(this);
+      }
+      catch (Exception e) {
+        Log.e(getClass().getSimpleName(),
+          "Exception destroying state", e);
+      }
+    }
+
+    return(false);
+  }
+
+  @Override
+  public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
+
+  }
+
+  private void enterTheMatrix() {
+    if (previewSize!=null) {
+      adjustAspectRatio(previewSize.getWidth(),
+          previewSize.getHeight(),
+          ((Activity)getContext()).getWindowManager().getDefaultDisplay().getRotation());
+    }
+  }
+
+  // based on https://github.com/googlesamples/android-Camera2Basic/blob/master/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
+
+  private void adjustAspectRatio(int previewWidth,
+                                 int previewHeight,
+                                 int rotation) {
+    Matrix txform=new Matrix();
+    int viewWidth=getWidth();
+    int viewHeight=getHeight();
+    RectF rectView=new RectF(0, 0, viewWidth, viewHeight);
+    float viewCenterX=rectView.centerX();
+    float viewCenterY=rectView.centerY();
+    RectF rectPreview=new RectF(0, 0, previewHeight, previewWidth);
+    float previewCenterX=rectPreview.centerX();
+    float previewCenterY=rectPreview.centerY();
+
+    if (Surface.ROTATION_90==rotation ||
+      Surface.ROTATION_270==rotation) {
+      rectPreview.offset(viewCenterX-previewCenterX,
+        viewCenterY-previewCenterY);
+
+      txform.setRectToRect(rectView, rectPreview,
+        Matrix.ScaleToFit.FILL);
+
+      float scale=Math.max((float)viewHeight/previewHeight,
+        (float)viewWidth/previewWidth);
+
+      txform.postScale(scale, scale, viewCenterX, viewCenterY);
+      txform.postRotate(90*(rotation-2), viewCenterX,
+        viewCenterY);
+    }
+    else {
+      if (Surface.ROTATION_180==rotation) {
+        txform.postRotate(180, viewCenterX, viewCenterY);
+      }
+    }
+
+    if (mirror) {
+      txform.postScale(-1, 1, viewCenterX, viewCenterY);
+    }
+
+    setTransform(txform);
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ChronoType.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ChronoType.java
new file mode 100644
index 0000000..a833b82
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ChronoType.java
@@ -0,0 +1,27 @@
+/***
+ Copyright (c) 2016 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+/**
+ * Whether there should be a timer shown on the video recording
+ * preview screen, and, if so, whether it counts down the remaining
+ * time on a time-limited recording or whether it counts up for how
+ * long the current recording is.
+ */
+public enum ChronoType {
+  NONE,
+  COUNT_DOWN,
+  COUNT_UP
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraConfigurator.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraConfigurator.java
new file mode 100644
index 0000000..6028f4c
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraConfigurator.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.hardware.Camera;
+import android.media.MediaRecorder;
+
+/**
+ * Camera configurator for the ClassicCameraEngine, to be used as
+ * part of a CameraPlugin for configuring camera behavior.
+ */
+public interface ClassicCameraConfigurator extends CameraConfigurator {
+  /**
+   * Update the Camera.Parameters based on whatever this particular
+   * configurator is set up to do.
+   *
+   * @param info CameraInfo for the camera that we are configuring
+   * @param camera the camera we are configuring
+   * @param params the current camera parameters, as originally
+   *               retrieved from the camera and as modified by
+   *               prior configurators in the chain
+   * @return the same Camera.Parameters as was passed in as params,
+   * just with modified contents
+   */
+  Camera.Parameters configureStillCamera(CameraSession session,
+                                         Camera.CameraInfo info,
+                                         Camera camera,
+                                         Camera.Parameters params);
+
+  void configureRecorder(CameraSession session,
+                         int cameraId,
+                         VideoTransaction xact,
+                         MediaRecorder recorder);
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java
new file mode 100644
index 0000000..98db183
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java
@@ -0,0 +1,643 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.content.Context;
+import android.graphics.ImageFormat;
+import android.graphics.Rect;
+import android.graphics.SurfaceTexture;
+import android.graphics.YuvImage;
+import android.hardware.Camera;
+import android.media.MediaRecorder;
+import android.os.Build;
+import android.util.Log;
+import com.commonsware.cwac.cam2.util.Size;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Implementation of a CameraEngine that supports the
+ * original android.hardware.Camera API.
+ */
+@SuppressWarnings("deprecation")
+public class ClassicCameraEngine extends CameraEngine
+    implements MediaRecorder.OnInfoListener,
+    Camera.PreviewCallback, Camera.OnZoomChangeListener {
+  private final Context ctxt;
+  private List<Descriptor> descriptors=null;
+  private MediaRecorder recorder;
+  private VideoTransaction xact;
+  private int previewWidth, previewHeight;
+  private int previewFormat;
+
+  public ClassicCameraEngine(Context ctxt) {
+    this.ctxt=ctxt.getApplicationContext();
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public CameraSession.Builder buildSession(Context ctxt, CameraDescriptor descriptor) {
+    return(new SessionBuilder(ctxt, descriptor));
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public void loadCameraDescriptors(final CameraSelectionCriteria criteria) {
+    getThreadPool().execute(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          if (descriptors == null) {
+            int count=Camera.getNumberOfCameras();
+            List<Descriptor> result=new ArrayList<Descriptor>();
+            Camera.CameraInfo info=new Camera.CameraInfo();
+
+            for (int cameraId=0; cameraId<count; cameraId++) {
+              Camera.getCameraInfo(cameraId, info);
+              CameraConstraints constraint=CameraConstraints.get();
+
+              if (constraint!=null) {
+                if (!constraint.supportsFFC() && info.facing==
+                  Camera.CameraInfo.CAMERA_FACING_FRONT) {
+                  break;
+                }
+
+                if (!constraint.supportsRFC() && info.facing==
+                  Camera.CameraInfo.CAMERA_FACING_BACK) {
+                  break;
+                }
+              }
+
+              Descriptor descriptor=new Descriptor(cameraId, info);
+
+              Camera camera=Camera.open(descriptor.getCameraId());
+              Camera.Parameters params=camera.getParameters();
+
+              if (params!=null) {
+                List<Size> sizes=null;
+
+                if (constraint!=null) {
+                  if (info.facing==Camera.CameraInfo.CAMERA_FACING_FRONT) {
+                    sizes=constraint.getPreviewFFCSizeWhitelist();
+                  }
+                  else {
+                    sizes=constraint.getPreviewRFCSizeWhitelist();
+                  }
+                }
+
+                if (sizes==null) {
+                  sizes=new ArrayList<>();
+
+                  for (Camera.Size size : params.getSupportedPreviewSizes()) {
+                    if (size.height<2160 && size.width<2160) {
+                      sizes.add(new Size(size.width, size.height));
+//  Log.e("20161211", String.format("%d %d x %d", info.facing, size.width, size.height));
+                    }
+                  }
+                }
+
+                descriptor.setPreviewSizes(sizes);
+                sizes=null;
+
+                if (constraint!=null) {
+                  if (info.facing==Camera.CameraInfo.CAMERA_FACING_FRONT) {
+                    sizes=constraint.getPictureFFCSizeWhitelist();
+                  }
+                  else {
+                    sizes=constraint.getPictureRFCSizeWhitelist();
+                  }
+                }
+
+                if (sizes==null) {
+                  sizes=new ArrayList<>();
+
+                  for (Camera.Size size : params.getSupportedPictureSizes()) {
+                    if (!"samsung".equals(Build.MANUFACTURER) ||
+                      !"jflteuc".equals(Build.PRODUCT) ||
+                      size.width<2048) {
+                      sizes.add(new Size(size.width, size.height));
+                    }
+                  }
+                }
+
+                descriptor.setPictureSizes(sizes);
+                result.add(descriptor);
+              }
+
+              camera.release();
+            }
+
+            descriptors=result;
+          }
+
+          List<CameraDescriptor> result=
+            new ArrayList<CameraDescriptor>();
+
+          for (Descriptor descriptor : descriptors) {
+            if ((!criteria.getFacingExactMatch() ||
+              descriptor.getScore(criteria)>0) &&
+              !criteria.isVideo() ||
+              (descriptor.facing==Camera.CameraInfo.CAMERA_FACING_FRONT &&
+              CameraConstraints.get().supportsFFCVideo()) ||
+              (descriptor.facing!=Camera.CameraInfo.CAMERA_FACING_FRONT &&
+                CameraConstraints.get().supportsRFCVideo())) {
+              result.add(descriptor);
+            }
+          }
+
+          Collections.sort(result,
+                  (descriptor, t1) -> {
+                    Descriptor lhs=(Descriptor)descriptor;
+                    Descriptor rhs=(Descriptor)t1;
+
+                    // descending, so invert normal side-ness
+
+                    int lhScore=rhs.getScore(criteria);
+                    int rhScore=lhs.getScore(criteria);
+
+                    // from Integer.compare(), which is new to API Level 19
+
+                    return (lhScore<rhScore ? -1 :
+                      (lhScore==rhScore ? 0 : 1));
+                  });
+
+          getBus().post(
+            new CameraEngine.CameraDescriptorsEvent(result));
+        }
+        catch (Exception e) {
+          getBus().post(new DeepImpactEvent(e));
+
+          if (isDebug()) {
+            Log.w(getClass().getSimpleName(), "Exception opening camera", e);
+          }
+        }
+      }
+    });
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void close(final CameraSession session) {
+    Descriptor descriptor=(Descriptor)session.getDescriptor();
+    Camera camera=descriptor.getCamera();
+
+    if (camera != null) {
+      camera.stopPreview();
+      camera.release();
+      descriptor.setCamera(null);
+    }
+
+    session.destroy();
+    getBus().post(new ClosedEvent());
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void takePicture(final CameraSession session, final PictureTransaction xact) {
+    getThreadPool().execute(new Runnable() {
+      @Override
+      public void run() {
+        Descriptor descriptor=(Descriptor)session.getDescriptor();
+        Camera camera=descriptor.getCamera();
+
+        if (savePreviewFile()!=null) {
+          camera.setOneShotPreviewCallback(ClassicCameraEngine.this);
+
+          Camera.Parameters parameters=camera.getParameters();
+
+          previewWidth=parameters.getPreviewSize().width;
+          previewHeight=parameters.getPreviewSize().height;
+          previewFormat=parameters.getPreviewFormat();
+        }
+
+        try {
+          camera.takePicture(() -> {
+            // empty plays a sound -- go figure
+          }, null,
+              new TakePictureTransaction(session.getContext(), xact));
+        }
+        catch (Exception e) {
+          getBus().post(new PictureTakenEvent(e));
+
+          if (isDebug()) {
+            Log.e(getClass().getSimpleName(), "Exception taking picture", e);
+          }
+        }
+      }
+    });
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void open(final CameraSession session,
+                   final SurfaceTexture texture) {
+    getThreadPool().execute(new Runnable() {
+      @Override
+      public void run() {
+        Descriptor descriptor=(Descriptor)session.getDescriptor();
+        Camera camera=descriptor.getCamera();
+
+        if (camera == null) {
+          camera=Camera.open(descriptor.getCameraId());
+          descriptor.setCamera(camera);
+        }
+
+        Camera.Parameters params=camera.getParameters();
+        List<String> rawFlashModes=params.getSupportedFlashModes();
+
+        eligibleFlashModes.clear();
+
+        if (rawFlashModes!=null && preferredFlashModes!=null) {
+          for (FlashMode flashMode : preferredFlashModes) {
+            for (String rawFlashMode : rawFlashModes) {
+              if (rawFlashMode.equals(
+                flashMode.getClassicMode())) {
+                eligibleFlashModes.add(flashMode);
+                break;
+              }
+            }
+          }
+
+          if (eligibleFlashModes.isEmpty()) {
+            for (String rawFlashMode : rawFlashModes) {
+              FlashMode flashMode=
+                FlashMode.lookupClassicMode(rawFlashMode);
+
+              if (flashMode!=null) {
+                eligibleFlashModes.add(flashMode);
+              }
+            }
+          }
+
+          session.setCurrentFlashMode(eligibleFlashModes.get(0));
+        }
+
+        try {
+          camera.setParameters(((Session)session).configureStillCamera(
+            false));
+          camera.setPreviewTexture(texture);
+          camera.startPreview();
+          getBus().post(new OpenedEvent());
+        }
+        catch (Exception e) {
+          camera.release();
+          descriptor.setCamera(null);
+          getBus().post(new OpenedEvent(e));
+
+          if (isDebug()) {
+            Log.e(getClass().getSimpleName(), "Exception opening camera", e);
+          }
+        }
+      }
+    });
+  }
+
+  @Override
+  public void recordVideo(CameraSession session,
+                          VideoTransaction xact) throws Exception {
+    Descriptor descriptor=(Descriptor)session.getDescriptor();
+    Camera camera=descriptor.getCamera();
+
+    if (camera!=null) {
+      camera.stopPreview();
+      camera.unlock();
+
+      try {
+        recorder=new MediaRecorder();
+        recorder.setCamera(camera);
+        recorder.setAudioSource(
+          MediaRecorder.AudioSource.CAMCORDER);
+        recorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
+
+        ((Session)session).configureRecorder(xact, recorder);
+
+        recorder.setOutputFile(xact.getOutputPath().getAbsolutePath());
+        recorder.setMaxFileSize(xact.getSizeLimit());
+        recorder.setMaxDuration(xact.getDurationLimit());
+        recorder.setOnInfoListener(this);
+        recorder.prepare();
+        recorder.start();
+        this.xact=xact;
+      }
+      catch (IOException e) {
+        recorder.release();
+        recorder=null;
+        throw e;
+      }
+    }
+  }
+
+  @Override
+  public void stopVideoRecording(CameraSession session,
+                                 boolean abandon) throws Exception {
+    Descriptor descriptor=(Descriptor)session.getDescriptor();
+    Camera camera=descriptor.getCamera();
+
+    if (camera!=null && recorder!=null) {
+      MediaRecorder tempRecorder=recorder;
+
+      recorder=null;
+
+      tempRecorder.stop();
+      tempRecorder.release();
+
+      if (!abandon) {
+        camera.reconnect();
+        camera.startPreview();
+      }
+    }
+
+    if (!abandon) {
+      getBus().post(new VideoTakenEvent(xact));
+    }
+
+    xact=null;
+  }
+
+/*
+  @Override
+  public boolean shouldSwapPreviewDimensions(CameraSession session) {
+    WindowManager windowManager=
+      (WindowManager)ctxt.getSystemService(Context.WINDOW_SERVICE);
+    Configuration config=ctxt.getResources().getConfiguration();
+    int rotation=windowManager.getDefaultDisplay().getRotation();
+
+    boolean defaultLandscapeAndIsInLandscape = (rotation == Surface.ROTATION_0 ||
+      rotation == Surface.ROTATION_180) &&
+      config.orientation == Configuration.ORIENTATION_LANDSCAPE;
+
+    boolean defaultLandscapeAndIsInPortrait = (rotation == Surface.ROTATION_90 ||
+      rotation == Surface.ROTATION_270) &&
+      config.orientation == Configuration.ORIENTATION_PORTRAIT;
+
+    return(defaultLandscapeAndIsInLandscape ||
+      defaultLandscapeAndIsInPortrait);
+  }
+*/
+
+  @Override
+  public void handleOrientationChange(CameraSession session,
+                                      OrientationChangedEvent event) {
+    if (session!=null) {
+      ((Session)session).configureStillCamera(true);
+    }
+  }
+
+  @Override
+  public void onInfo(MediaRecorder mediaRecorder, int what, int extra) {
+    if (what==MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED ||
+        what==MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED ||
+        what==MediaRecorder.MEDIA_RECORDER_INFO_UNKNOWN) {
+      MediaRecorder tempRecorder=recorder;
+
+      recorder=null;
+
+      if (tempRecorder != null) {
+        tempRecorder.stop();
+        tempRecorder.release();
+      }
+
+      getBus().post(new VideoTakenEvent(xact));
+    }
+  }
+
+  @Override
+  public void onPreviewFrame(final byte[] data, final Camera camera) {
+    new Thread() {
+      @Override
+      public void run() {
+        YuvImage yuv=new YuvImage(data, previewFormat,
+          previewWidth, previewHeight, null);
+
+        try {
+          if (savePreviewFile().exists()) {
+            savePreviewFile().delete();
+          }
+
+          FileOutputStream fos=
+            new FileOutputStream(savePreviewFile());
+
+          yuv.compressToJpeg(new Rect(0, 0, previewWidth, previewHeight),
+            90, fos);
+          fos.flush();
+          fos.getFD().sync();
+          fos.close();
+        }
+        catch (Exception e) {
+          Log.e(getClass().getSimpleName(),
+            "Exception saving preview frame", e);
+        }
+      }
+    }.start();
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public boolean supportsDynamicFlashModes() {
+    return(false);
+  }
+
+  @Override
+  public boolean supportsZoom(CameraSession session) {
+    Descriptor descriptor=(Descriptor)session.getDescriptor();
+    Camera camera=descriptor.getCamera();
+    Camera.Parameters params=camera.getParameters();
+
+    return(params.isZoomSupported());
+  }
+
+  @Override
+  public boolean zoomTo(CameraSession session, int zoomLevel) {
+    Descriptor descriptor=(Descriptor)session.getDescriptor();
+    Camera camera=descriptor.getCamera();
+    Camera.Parameters params=camera.getParameters();
+    int zoom=zoomLevel*params.getMaxZoom()/100;
+    boolean result=false;
+
+    if (params.isSmoothZoomSupported()) {
+      camera.setZoomChangeListener(this);
+      camera.startSmoothZoom(zoom);
+      result=true;
+    }
+    else if (params.isZoomSupported()) {
+      params.setZoom(zoom);
+      camera.setParameters(params);
+    }
+
+    return(result);
+  }
+
+  @Override
+  public void onZoomChange(int zoomValue, boolean stopped,
+                           Camera camera) {
+    if (stopped) {
+      AbstractCameraActivity.BUS.post(new SmoothZoomCompletedEvent());
+    }
+  }
+
+  private class TakePictureTransaction implements Camera.PictureCallback {
+    private final PictureTransaction xact;
+    private final Context ctxt;
+
+    TakePictureTransaction(Context ctxt, PictureTransaction xact) {
+      this.ctxt=ctxt.getApplicationContext();
+      this.xact=xact;
+    }
+
+    @Override
+    public void onPictureTaken(final byte[] bytes, final Camera camera) {
+      getThreadPool().execute(() -> {
+        camera.startPreview();
+        getBus().post(new PictureTakenEvent(xact,
+          xact.process(new ImageContext(ctxt, bytes))));
+      });
+    }
+  }
+
+  static class Descriptor implements CameraDescriptor {
+    private int cameraId;
+    private Camera camera;
+    private List<Size> pictureSizes;
+    private List<Size> previewSizes;
+    private final int facing;
+
+    private Descriptor(int cameraId, Camera.CameraInfo info) {
+      this.cameraId=cameraId;
+      this.facing=info.facing;
+    }
+
+    public int getCameraId() {
+      return (cameraId);
+    }
+
+    private void setCamera(Camera camera) {
+      this.camera=camera;
+    }
+
+    private Camera getCamera() {
+      return (camera);
+    }
+
+    @Override
+    public List<Size> getPreviewSizes() {
+      return (previewSizes);
+    }
+
+    private void setPreviewSizes(List<Size> sizes) {
+      previewSizes=sizes;
+    }
+
+    @Override
+    public List<Size> getPictureSizes() {
+      return (pictureSizes);
+    }
+
+    @Override
+    public boolean isPictureFormatSupported(int format) {
+      return (ImageFormat.JPEG == format);
+    }
+
+    private void setPictureSizes(List<Size> sizes) {
+      pictureSizes=sizes;
+    }
+
+    private int getScore(CameraSelectionCriteria criteria) {
+      int score=10;
+
+      if (criteria != null) {
+        if ((criteria.getFacing().isFront() &&
+            facing != Camera.CameraInfo.CAMERA_FACING_FRONT) ||
+            (!criteria.getFacing().isFront() &&
+                facing != Camera.CameraInfo.CAMERA_FACING_BACK)) {
+          score=0;
+        }
+      }
+
+      return(score);
+    }
+  }
+
+  private static class Session extends CameraSession {
+    private Session(Context ctxt, CameraDescriptor descriptor) {
+      super(ctxt, descriptor);
+    }
+
+    Camera.Parameters configureStillCamera(boolean noParams) {
+      final Descriptor descriptor=(Descriptor)getDescriptor();
+      final Camera camera=descriptor.getCamera();
+      Camera.Parameters params=null;
+
+      if (camera!=null) {
+        Camera.CameraInfo info=new Camera.CameraInfo();
+
+        if (!noParams) {
+          params=camera.getParameters();
+        }
+
+        Camera.getCameraInfo(descriptor.getCameraId(), info);
+
+        for (CameraPlugin plugin : getPlugins()) {
+          ClassicCameraConfigurator configurator=
+            plugin.buildConfigurator(
+              ClassicCameraConfigurator.class);
+
+          if (configurator!=null) {
+            params=
+              configurator.configureStillCamera(this, info, camera,
+                params);
+          }
+        }
+      }
+
+      return(params);
+    }
+
+    void configureRecorder(VideoTransaction xact,
+                           MediaRecorder recorder) {
+      final Descriptor descriptor=(Descriptor)getDescriptor();
+
+      for (CameraPlugin plugin : getPlugins()) {
+        ClassicCameraConfigurator configurator=
+          plugin.buildConfigurator(ClassicCameraConfigurator.class);
+
+        if (configurator!=null) {
+          configurator.configureRecorder(this, descriptor.getCameraId(),
+            xact, recorder);
+        }
+      }
+    }
+  }
+
+  private static class SessionBuilder extends CameraSession.Builder {
+    private SessionBuilder(Context ctxt, CameraDescriptor descriptor) {
+      super(new Session(ctxt, descriptor));
+    }
+  }
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ConfirmationFragment.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ConfirmationFragment.java
new file mode 100644
index 0000000..52f2f37
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ConfirmationFragment.java
@@ -0,0 +1,152 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.Fragment;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import net.yazeed44.imagepicker.library.R;
+
+public class ConfirmationFragment extends Fragment {
+  private static final String ARG_NORMALIZE_ORIENTATION=
+    "normalizeOrientation";
+  private Float quality;
+
+  public interface Contract {
+    void completeRequest(ImageContext imageContext, boolean isOK);
+    void retakePicture();
+  }
+
+  private ImageView iv;
+  private ImageContext imageContext;
+
+  public static ConfirmationFragment newInstance(boolean normalizeOrientation) {
+    ConfirmationFragment result=new ConfirmationFragment();
+    Bundle args=new Bundle();
+
+    args.putBoolean(ARG_NORMALIZE_ORIENTATION, normalizeOrientation);
+    result.setArguments(args);
+
+    return(result);
+  }
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    setRetainInstance(true);
+    setHasOptionsMenu(true);
+  }
+
+  @Override
+  public void onAttach(Activity activity) {
+    if (!(activity instanceof Contract)) {
+      throw new IllegalStateException("Hosting activity must implement Contract interface");
+    }
+
+    super.onAttach(activity);
+  }
+
+  @Override
+  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    iv=new ImageView(getActivity());
+
+    if (imageContext!=null) {
+      loadImage(quality);
+    }
+
+    return(iv);
+  }
+
+  @Override
+  public void onHiddenChanged(boolean isHidden) {
+    super.onHiddenChanged(isHidden);
+
+    if (!isHidden) {
+      ActionBar ab=getActivity().getActionBar();
+
+      if (ab==null) {
+        throw new IllegalStateException("CameraActivity confirmation requires an action bar!");
+      }
+      else {
+        ab.setBackgroundDrawable(getActivity()
+            .getResources()
+            .getDrawable(R.drawable.cwac_cam2_action_bar_bg_translucent));
+        ab.setTitle("");
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+          ab.setDisplayHomeAsUpEnabled(true);
+          ab.setHomeAsUpIndicator(R.drawable.cwac_cam2_ic_close_white);
+        }
+        else {
+          ab.setIcon(R.drawable.cwac_cam2_ic_close_white);
+          ab.setDisplayShowHomeEnabled(true);
+          ab.setHomeButtonEnabled(true);
+        }
+      }
+    }
+  }
+
+  @Override
+  public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    inflater.inflate(R.menu.cwac_cam2_confirm, menu);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    if (item.getItemId()==android.R.id.home) {
+      getContract().completeRequest(imageContext, false);
+    }
+    else if (item.getItemId()==R.id.cwac_cam2_ok) {
+      getContract().completeRequest(imageContext, true);
+    }
+    else if (item.getItemId()==R.id.cwac_cam2_retry) {
+      getContract().retakePicture();
+    }
+    else {
+      return(super.onOptionsItemSelected(item));
+    }
+
+    return(true);
+  }
+
+  public void setImage(ImageContext imageContext, Float quality) {
+    this.imageContext=imageContext;
+    this.quality=quality;
+
+    if (iv!=null) {
+      loadImage(quality);
+    }
+  }
+
+  private Contract getContract() {
+    return((Contract)getActivity());
+  }
+
+  private void loadImage(Float quality) {
+    iv.setImageBitmap(imageContext.buildPreviewThumbnail(getActivity(),
+      quality, getArguments().getBoolean(ARG_NORMALIZE_ORIENTATION)));
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ErrorConstants.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ErrorConstants.java
new file mode 100644
index 0000000..71a4c12
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ErrorConstants.java
@@ -0,0 +1,85 @@
+/***
+ Copyright (c) 2016 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+/**
+ * Constants related to the data passed to the ResultReceiver
+ * that you can optionally register via `onError()` with
+ * an `IntentBuilder`, to find out about errors that occur
+ * inside the Cam2 activities.
+ */
+public class ErrorConstants {
+  /**
+   * Key for the Bundle provided to the ResultReceiver,
+   * with the text of the stack trace of the exception that
+   * triggered this callback.
+   */
+  public static final String RESULT_STACK_TRACE="stackTrace";
+
+  /**
+   * resultCode for ResultReceiver, indicating that there was
+   * a problem listing the available cameras
+   */
+  public static final int ERROR_LIST_CAMERAS=3490;
+
+  /**
+   * resultCode for ResultReceiver, indicating that there was
+   * a problem opening a camera
+   */
+  public static final int ERROR_OPEN_CAMERA=
+    ERROR_LIST_CAMERAS+1;
+
+  /**
+   * resultCode for ResultReceiver, indicating that there was
+   * a problem closing a camera
+   */
+  public static final int ERROR_CLOSE_CAMERA=
+    ERROR_LIST_CAMERAS+2;
+
+  /**
+   * resultCode for ResultReceiver, indicating that there was
+   * a problem when trying to complete the act of taking a video
+   */
+  public static final int ERROR_VIDEO_TAKEN=
+    ERROR_LIST_CAMERAS+3;
+
+  /**
+   * resultCode for ResultReceiver, indicating that there was
+   * a problem shutting down the CameraController and engine
+   */
+  public static final int ERROR_STOPPING=
+    ERROR_LIST_CAMERAS+4;
+
+  /**
+   * resultCode for ResultReceiver, indicating that there was
+   * a problem while trying to switch cameras from the FAB
+   */
+  public static final int ERROR_SWITCHING_CAMERAS=
+    ERROR_LIST_CAMERAS+5;
+
+  /**
+   * resultCode for ResultReceiver, indicating that there was
+   * a problem trying to end recording of a video
+   */
+  public static final int ERROR_STOPPING_VIDEO=
+    ERROR_LIST_CAMERAS+6;
+
+  /**
+   * resultCode for ResultReceiver, indicating that there was
+   * some other problem deep in the innards of Cam2
+   */
+  public static final int ERROR_MISC=
+    ERROR_LIST_CAMERAS+7;
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/Facing.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/Facing.java
new file mode 100644
index 0000000..30595f6
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/Facing.java
@@ -0,0 +1,26 @@
+/***
+ Copyright (c) 2015-2016 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+/**
+ * Possible values for the facing property
+ */
+public enum Facing {
+  FRONT, BACK;
+
+  boolean isFront() {
+    return(this==FRONT);
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/FlashMode.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/FlashMode.java
new file mode 100644
index 0000000..62be180
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/FlashMode.java
@@ -0,0 +1,85 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.hardware.Camera;
+import android.hardware.camera2.CameraCharacteristics;
+
+public enum FlashMode {
+  OFF(Camera.Parameters.FLASH_MODE_OFF,
+    CameraCharacteristics.CONTROL_AE_MODE_ON),
+  TORCH(Camera.Parameters.FLASH_MODE_TORCH,
+    CameraCharacteristics.CONTROL_AE_MODE_ON),
+  ALWAYS(Camera.Parameters.FLASH_MODE_ON,
+    CameraCharacteristics.CONTROL_AE_MODE_ON_ALWAYS_FLASH),
+  AUTO(Camera.Parameters.FLASH_MODE_AUTO,
+    CameraCharacteristics.CONTROL_AE_MODE_ON_AUTO_FLASH),
+  REDEYE(Camera.Parameters.FLASH_MODE_RED_EYE,
+    CameraCharacteristics.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE);
+
+  private final String classicMode;
+  private final int cameraTwoMode;
+
+  static FlashMode lookupClassicMode(String classicMode) {
+    if (classicMode.equals(OFF.getClassicMode())) {
+      return(OFF);
+    }
+    else if (classicMode.equals(ALWAYS.getClassicMode())) {
+      return(ALWAYS);
+    }
+    else if (classicMode.equals(AUTO.getClassicMode())) {
+      return(AUTO);
+    }
+    else if (classicMode.equals(REDEYE.getClassicMode())) {
+      return(REDEYE);
+    }
+
+    return(null);
+  }
+
+  static FlashMode lookupCameraTwoMode(int cameraTwoMode) {
+    if (cameraTwoMode==OFF.getCameraTwoMode()) {
+      return(OFF);
+    }
+    else if (cameraTwoMode==ALWAYS.getCameraTwoMode()) {
+      return(ALWAYS);
+    }
+    else if (cameraTwoMode==AUTO.getCameraTwoMode()) {
+      return(AUTO);
+    }
+    else if (cameraTwoMode==REDEYE.getCameraTwoMode()) {
+      return(REDEYE);
+    }
+
+    return(null);
+  }
+
+  FlashMode(String classicMode, int cameraTwoMode) {
+    this.classicMode=classicMode;
+    this.cameraTwoMode=cameraTwoMode;
+  }
+
+  public String getClassicMode() {
+    return(classicMode);
+  }
+
+  public int getCameraTwoMode() {
+    return(cameraTwoMode);
+  }
+
+  public boolean isTorchMode() {
+    return(Camera.Parameters.FLASH_MODE_TORCH.equals(classicMode));
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/FocusMode.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/FocusMode.java
new file mode 100644
index 0000000..3d7dcf5
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/FocusMode.java
@@ -0,0 +1,19 @@
+/***
+ Copyright (c) 2016 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+public enum FocusMode {
+  CONTINUOUS, OFF, EDOF, MACRO
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java
new file mode 100644
index 0000000..899f097
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java
@@ -0,0 +1,270 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
+import com.android.mms.exif.ExifInterface;
+import com.android.mms.exif.ExifTag;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+/**
+ * Represents a picture taken by the camera, to be passed through
+ * the ImageProcessor chain.
+ *
+ * The ImageContext should always hold the byte[] representing
+ * the JPEG image. If an ImageProcessor needs a Bitmap, it can
+ * call getBitmap(true) to force creation of a Bitmap for those
+ * JPEG bytes, but this is memory-intensive and should be avoided
+ * where possible.
+ */
+public class ImageContext {
+  private static final double LOG_2=Math.log(2.0d);
+  private Context ctxt;
+  private byte[] jpegOriginal;
+  private Bitmap bmp;
+  private Bitmap thumbnail;
+  private ExifInterface exif;
+
+  ImageContext(Context ctxt, byte[] jpeg) {
+    this.ctxt=ctxt.getApplicationContext();
+    setJpeg(jpeg);
+  }
+
+  /**
+   * @return an Android Context suitable for use in cases where
+   * you need filesystem paths and the like
+   */
+  public Context getContext() {
+    return(ctxt);
+  }
+
+  /**
+   * @return the byte[] of JPEG-encoded data for the picture
+   */
+  public byte[] getJpeg() {
+    return(jpegOriginal);
+  }
+
+  /**
+   * Updates the JPEG data, invalidating any previous Bitmap.
+   *
+   * @param jpeg the new JPEG data
+   */
+  public void setJpeg(byte[] jpeg) {
+    this.jpegOriginal=jpeg;
+    this.bmp=null;
+    this.thumbnail=null;
+  }
+
+  public ExifInterface getExifInterface() throws IOException {
+    if (exif==null) {
+      exif=new ExifInterface();
+
+      exif.readExif(jpegOriginal);
+    }
+
+    return(exif);
+  }
+
+  public int getOrientation() throws IOException {
+    ExifTag tag=getExifInterface().getTag(ExifInterface.TAG_ORIENTATION);
+
+    return(tag==null ? -1 : tag.getValueAsInt(-1));
+  }
+
+  public byte[] getJpeg(boolean normalizeOrientation) {
+    if (normalizeOrientation) {
+      try {
+        int orientation=getOrientation();
+
+        if (needsNormalization(orientation)) {
+          try {
+            Bitmap original=
+              BitmapFactory.decodeByteArray(jpegOriginal, 0,
+                jpegOriginal.length);
+            Bitmap rotated=rotateViaMatrix(original, orientation);
+
+            exif.setTagValue(ExifInterface.TAG_ORIENTATION, 1);
+            exif.removeCompressedThumbnail();
+
+            ByteArrayOutputStream baos=new ByteArrayOutputStream();
+
+            exif.writeExif(rotated, baos, 100);
+            jpegOriginal=baos.toByteArray();
+
+            return(jpegOriginal);
+          }
+          catch (OutOfMemoryError e) {
+            AbstractCameraActivity.BUS
+              .post(new CameraEngine.DeepImpactEvent(e));
+          }
+        }
+      }
+      catch (Exception e) {
+        AbstractCameraActivity.BUS
+          .post(new CameraEngine.DeepImpactEvent(e));
+      }
+    }
+
+    return(getJpeg());
+  }
+
+  /**
+   * Retrieve a Bitmap rendition of the picture. Try to avoid
+   * this where possible, as it is memory-intensive.
+   *
+   * @param force true if you want to force creation of a Bitmap
+   *              if there is none, false if you want the Bitmap
+   *              but can live without it if it is unavailable
+   * @return the Bitmap rendition of the picture
+   */
+  public Bitmap getBitmap(boolean force, boolean normalizeOrientation) {
+    if (bmp==null && force) {
+      updateBitmap(normalizeOrientation);
+    }
+
+    return(bmp);
+  }
+
+  public Bitmap buildPreviewThumbnail(Context ctxt, Float quality,
+                                      boolean normalizeOrientation) {
+    // TODO: move this into PictureTransaction work somewhere, so done
+    // on a background thread
+
+    if (thumbnail==null) {
+      int limit=2000000;
+
+      if (quality!=null && quality>0.0f && quality<1.0f) {
+        ActivityManager am=(ActivityManager)ctxt.getSystemService(Context.ACTIVITY_SERVICE);
+        int flags=ctxt.getApplicationInfo().flags;
+        int memoryClass=am.getMemoryClass();
+
+        if ((flags & ApplicationInfo.FLAG_LARGE_HEAP)!=0) {
+          memoryClass=am.getLargeMemoryClass();
+        }
+
+        limit=(int)(1024*1024*memoryClass*quality);
+      }
+
+      thumbnail=createBitmap(null, limit, normalizeOrientation);
+    }
+
+    return(thumbnail);
+  }
+
+  public Bitmap buildResultThumbnail(boolean normalizeOrientation) {
+    // TODO: move this onto background thread
+
+    return(createBitmap(null, 750000, normalizeOrientation));
+  }
+
+  private Bitmap createBitmap(Bitmap inBitmap, int limit,
+                              boolean normalizeOrientation) {
+    double ratio=(double)jpegOriginal.length * 10.0d / (double)limit;
+    int inSampleSize;
+
+    if (ratio > 1.0d) {
+      inSampleSize=1 << (int)(Math.ceil(Math.log(ratio) / LOG_2));
+    } else {
+      inSampleSize=1;
+    }
+
+    return(createBitmap(inSampleSize, inBitmap, limit,
+      normalizeOrientation));
+  }
+
+  private Bitmap createBitmap(int inSampleSize, Bitmap inBitmap,
+                              int limit,
+                              boolean normalizeOrientation) {
+    BitmapFactory.Options opts=new BitmapFactory.Options();
+
+    opts.inSampleSize=inSampleSize;
+    opts.inBitmap=inBitmap;
+
+    Bitmap result;
+
+    try {
+      result=
+         BitmapFactory.decodeByteArray(jpegOriginal, 0, jpegOriginal.length, opts);
+
+      if (limit>0 && result.getByteCount()>limit) {
+        return(createBitmap(inSampleSize+1, inBitmap,
+          limit, normalizeOrientation));
+      }
+    }
+    catch (OutOfMemoryError e) {
+      return(createBitmap(inSampleSize+1, inBitmap,
+        limit, normalizeOrientation));
+    }
+
+    try {
+      if (normalizeOrientation) {
+        int orientation=getOrientation();
+
+        if (needsNormalization(orientation)) {
+          result=rotateViaMatrix(result, orientation);
+        }
+      }
+    }
+    catch (IOException e) {
+      AbstractCameraActivity.BUS.post(
+        new CameraEngine.DeepImpactEvent(e));
+    }
+
+    return(result);
+  }
+
+  private void updateBitmap(boolean normalizeOrientation) {
+    bmp=createBitmap(1, bmp, -1, normalizeOrientation); // no limit other than OOM
+  }
+
+  private boolean needsNormalization(int orientation) {
+    return(orientation==8 || orientation==3 || orientation==6);
+  }
+
+  static private Bitmap rotateViaMatrix(Bitmap original, int orientation) {
+    Matrix matrix=new Matrix();
+
+    matrix.setRotate(degreesForRotation(orientation));
+
+    return(Bitmap.createBitmap(original, 0, 0, original.getWidth(),
+      original.getHeight(), matrix, true));
+  }
+
+  static private int degreesForRotation(int orientation) {
+    int result;
+
+    switch (orientation) {
+      case 8:
+        result=270;
+        break;
+
+      case 3:
+        result=180;
+        break;
+
+      default:
+        result=90;
+    }
+
+    return(result);
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageProcessor.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageProcessor.java
new file mode 100644
index 0000000..a9bb2a6
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageProcessor.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+/**
+ * Interface for class that post-processes a picture. A
+ * PictureTransaction holds a chain of these, which collectively
+ * will modify the picture as needed and write it wherever it
+ * needs writing to.
+ */
+public interface ImageProcessor {
+  /**
+   * Manipulate the picture indicated by the ImageContext.
+   * Properties for configuring this particular bit of image
+   * processing can be obtained from the PictureTransaction.
+   *
+   * @param xact the PictureTransaction, containing properties
+   * @param imageContext the picture itself
+   */
+  void process(PictureTransaction xact, ImageContext imageContext);
+
+  /**
+   * @return a unique tag to identify this processor among
+   * any other processors in the chain
+   */
+  String getTag();
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/JPEGWriter.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/JPEGWriter.java
new file mode 100644
index 0000000..5e679bf
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/JPEGWriter.java
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.content.Context;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+
+/**
+ * ImageProcessor that writes a JPEG file out to some form
+ * of local storage. At present, it supports writing out to a
+ * local filesystem path.
+ */
+public class JPEGWriter extends AbstractImageProcessor {
+  /**
+   * Property key to identify the Uri where
+   * the image should be written. Look up the value for this
+   * property in the PictureTransaction.
+   */
+  public static final String PROP_OUTPUT="output";
+
+  /**
+   * Property key to identify if the MediaStore should be
+   * updated to reflect the written-out picture (boolean).
+   * Look up the value for this property in the PictureTransaction.
+   * Only relevant if PROP_OUTPUT has a file scheme.
+   */
+  public static final String PROP_UPDATE_MEDIA_STORE="update";
+
+  /**
+   * Property key for boolean indicating if we should skip the
+   * default logic to rotate the image based on the EXIF orientation
+   * tag. Defaults to false (meaning: do the rotation if needed).
+   */
+  public static final String PROP_SKIP_ORIENTATION_NORMALIZATION
+    ="skipOrientationNormalization";
+
+  /**
+   * {@inheritDoc}
+   */
+  public JPEGWriter(Context ctxt) {
+    super(ctxt);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public JPEGWriter(Context ctxt, String tag) {
+    super(ctxt, tag);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void process(PictureTransaction xact, ImageContext imageContext) {
+    Uri output=xact.getProperties().getParcelable(PROP_OUTPUT);
+    boolean updateMediaStore=xact
+        .getProperties()
+        .getBoolean(PROP_UPDATE_MEDIA_STORE, false);
+    byte[] jpeg=imageContext.getJpeg(!xact
+      .getProperties()
+      .getBoolean(PROP_SKIP_ORIENTATION_NORMALIZATION, false));
+
+    if (output!=null) {
+      try {
+        if (output.getScheme().equals("file")) {
+          String path=output.getPath();
+          File f=new File(path);
+
+          f.getParentFile().mkdirs();
+
+          FileOutputStream fos=new FileOutputStream(f);
+
+          fos.write(jpeg);
+          fos.flush();
+          fos.getFD().sync();
+          fos.close();
+
+          if (updateMediaStore) {
+            MediaScannerConnection.scanFile(imageContext.getContext(),
+                new String[]{path}, new String[]{"image/jpeg"},
+                null);
+          }
+        }
+        else {
+          OutputStream out=getContext().getContentResolver().openOutputStream(output);
+
+          out.write(jpeg);
+          out.flush();
+          out.close();
+        }
+      }
+      catch (Exception e) {
+        // throw new UnsupportedOperationException("Exception when trying to write JPEG", e);
+        AbstractCameraActivity.BUS.post(new CameraEngine.DeepImpactEvent(e));
+      }
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/OrientationLockMode.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/OrientationLockMode.java
new file mode 100644
index 0000000..69f534a
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/OrientationLockMode.java
@@ -0,0 +1,40 @@
+/***
+ Copyright (c) 2016 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+/**
+ * Specifies how the device orientation should be locked while the
+ * camera activity is in the foreground. Default, much to your shock
+ * and amazement, is DEFAULT.
+ */
+public enum OrientationLockMode {
+  /**
+   * Allow the orientation to change in the steady state. Once
+   * video recording has started, or during the act of taking a
+   * picture, the orientation will be locked to whatever the orientation
+   * was at the time (this is still a work in progress).
+   */
+  DEFAULT,
+  /**
+   * Lock the orientation to portrait for preview and actual camera
+   * operation.
+   */
+  PORTRAIT,
+  /**
+   * Lock the orientation to landscape for preview and actual camera
+   * operation.
+   */
+  LANDSCAPE
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java
new file mode 100644
index 0000000..d3faa0f
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java
@@ -0,0 +1,127 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import java.io.File;
+import java.util.ArrayList;
+
+/**
+ * Class encapsulating the information needed to take a picture
+ * using a camera. Use a PictureTransaction.Builder to create
+ * an instance. Beyond that, this is an opaque blob to you.
+ */
+public class PictureTransaction {
+  private ArrayList<ImageProcessor> processors=new ArrayList<ImageProcessor>();
+  private Bundle props=new Bundle();
+
+  private PictureTransaction() {
+    // use the builder, please
+  }
+
+  ImageContext process(ImageContext imageContext) {
+    for (ImageProcessor processor : processors) {
+      processor.process(this, imageContext);
+    }
+
+    return(imageContext);
+  }
+
+  ImageProcessor findProcessorByTag(String tag) {
+    for (ImageProcessor processor : processors) {
+      if (processor.getTag().equals(tag)) {
+        return(processor);
+      }
+    }
+
+    return(null);
+  }
+
+  /**
+   * Accesses a Bundle of properties for use by the chain of
+   * ImageProcessors. This is public for the use by ImageProcessor
+   * implementations. Using these properties in any other fashion
+   * is beyond the scope of the supported API.
+   *
+   * @return the properties Bundle
+   */
+  public Bundle getProperties() {
+    return(props);
+  }
+
+  /**
+   * Builder class to create an instance of a PictureTransaction.
+   */
+  public static class Builder {
+    private PictureTransaction result=new PictureTransaction();
+
+    /**
+     * @return the PictureTransaction built up by the Builder API
+     */
+    public PictureTransaction build() {
+      return(result);
+    }
+
+    /**
+     * Adds an ImageProcessor to the chain of processors for
+     * manipulating the picture.
+     *
+     * @param processor the ImageProcessor to add to the chain
+     * @return the Builder, for more API calls
+     */
+    public Builder append(ImageProcessor processor) {
+      result.processors.add(processor);
+
+      return(this);
+    }
+
+    /**
+     * Indicates that the picture should be written to the
+     * designated Uri.
+     *
+     * @param ctxt   any Context will do
+     * @param output Uri to which you have write
+     *               access, where the photo should be taken
+     * @param updateMediaStore true if MediaStore should be updated,
+     *                         false otherwise
+     * @return the Builder, for more API calls
+     */
+    public Builder toUri(Context ctxt, Uri output,
+                         boolean updateMediaStore,
+                         boolean skipOrientationNormalization) {
+      JPEGWriter jpeg=(JPEGWriter)result.findProcessorByTag(JPEGWriter.class.getCanonicalName());
+
+      if (jpeg == null) {
+        jpeg=new JPEGWriter(ctxt);
+        append(jpeg);
+      }
+
+      result.getProperties().putParcelable(JPEGWriter.PROP_OUTPUT,
+          output);
+      result
+          .getProperties()
+          .putBoolean(JPEGWriter.PROP_UPDATE_MEDIA_STORE,
+              updateMediaStore);
+      result
+        .getProperties()
+        .putBoolean(JPEGWriter.PROP_SKIP_ORIENTATION_NORMALIZATION,
+          skipOrientationNormalization);
+
+      return (this);
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java
new file mode 100644
index 0000000..04155fc
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java
@@ -0,0 +1,75 @@
+/***
+  Copyright (c) 2013 CommonsWare, LLC
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License. You may obtain a copy
+  of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless required
+  by applicable law or agreed to in writing, software distributed under the
+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+  OF ANY KIND, either express or implied. See the License for the specific
+  language governing permissions and limitations under the License.
+  
+  From _The Busy Coder's Guide to Android Development_
+    https://commonsware.com/Android
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.content.Context;
+import android.os.SystemClock;
+import android.text.format.DateUtils;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+public class ReverseChronometer extends TextView implements Runnable {
+  interface Listener {
+    void onCountdownCompleted();
+  }
+
+  private long startTime=0L;
+  private long overallDuration=0L;
+  private StringBuilder sb=new StringBuilder(8);
+  private Listener listener;
+
+  public ReverseChronometer(Context context, AttributeSet attrs) {
+    super(context, attrs);
+
+    reset();
+  }
+
+  @Override
+  public void run() {
+    long elapsedSeconds=
+        (SystemClock.elapsedRealtime() - startTime) / 1000;
+
+    if (elapsedSeconds < overallDuration) {
+      long remainingSeconds=overallDuration - elapsedSeconds;
+
+      setText(DateUtils.formatElapsedTime(sb, remainingSeconds));
+      postDelayed(this, 1000);
+    }
+    else {
+      setText(DateUtils.formatElapsedTime(sb, 0));
+
+      if (listener!=null) {
+        listener.onCountdownCompleted();
+      }
+    }
+  }
+
+  public void reset() {
+    startTime=SystemClock.elapsedRealtime();
+    setText("--:--");
+  }
+
+  public void stop() {
+    removeCallbacks(this);
+  }
+
+  public void setOverallDuration(long overallDuration) {
+    this.overallDuration=overallDuration;
+  }
+
+  public void setListener(Listener listener) {
+    this.listener=listener;
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/RuleOfThirdsOverlay.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/RuleOfThirdsOverlay.java
new file mode 100644
index 0000000..154ed3d
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/RuleOfThirdsOverlay.java
@@ -0,0 +1,59 @@
+/***
+ Copyright (c) 2017 CommonsWare, LLC
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License. You may obtain a copy
+ of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+
+import net.yazeed44.imagepicker.library.R;
+
+public class RuleOfThirdsOverlay extends View {
+  private Paint paint;
+  private float thickness;
+
+  public RuleOfThirdsOverlay(Context context) {
+    this(context, null);
+  }
+
+  public RuleOfThirdsOverlay(Context context, AttributeSet attrs) {
+    super(context, attrs);
+
+    init();
+  }
+
+  private void init() {
+    thickness=
+      getContext().getResources().getDimension(R.dimen.cwac_cam2_gridline_width);
+
+    paint=new Paint();
+    paint.setColor(Color.WHITE);
+    paint.setAlpha(0x80);
+    paint.setStrokeWidth(thickness);
+  }
+
+  @Override
+  protected void onDraw(Canvas canvas) {
+    super.onDraw(canvas);
+
+    float width=this.getWidth();
+    float height=this.getHeight();
+
+    canvas.drawLine(width/3, 0, width/3, height, paint);
+    canvas.drawLine(width*2/3, 0, width*2/3, height, paint);
+    canvas.drawLine(0, height/3, width, height/3, paint);
+    canvas.drawLine(0, height*2/3, width, height*2/3, paint);
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleCameraTwoConfigurator.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleCameraTwoConfigurator.java
new file mode 100644
index 0000000..7ed3ec1
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleCameraTwoConfigurator.java
@@ -0,0 +1,33 @@
+package com.commonsware.cwac.cam2;
+
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.media.ImageReader;
+
+/**
+ * Stub implementation of CameraTwoConfigurator, to help ease
+ * the implementation of this interface. Just extend this class
+ * and override the specific methods that your plugin needs.
+ */
+public class SimpleCameraTwoConfigurator
+  implements CameraTwoConfigurator {
+  @Override
+  public ImageReader buildImageReader() {
+    return null;
+  }
+
+  @Override
+  public void addToCaptureRequest(CameraSession session,
+                                  CameraCharacteristics cc,
+                                  boolean facingFront,
+                                  CaptureRequest.Builder captureBuilder) {
+
+  }
+
+  @Override
+  public void addToPreviewRequest(CameraSession session,
+                                  CameraCharacteristics cc,
+                                  CaptureRequest.Builder captureBuilder) {
+
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleClassicCameraConfigurator.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleClassicCameraConfigurator.java
new file mode 100644
index 0000000..220dec9
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleClassicCameraConfigurator.java
@@ -0,0 +1,27 @@
+package com.commonsware.cwac.cam2;
+
+import android.hardware.Camera;
+import android.media.MediaRecorder;
+
+/**
+ * Stub no-op implementation of ClassicCameraConfigurator,
+ * to simplify implementing the interface. Just extend this class,
+ * then override the particular methods that you need in the plugin.
+ */
+public class SimpleClassicCameraConfigurator implements ClassicCameraConfigurator {
+  @Override
+  public Camera.Parameters configureStillCamera(
+    CameraSession session,
+    Camera.CameraInfo info,
+    Camera camera, Camera.Parameters params) {
+    return null;
+  }
+
+  @Override
+  public void configureRecorder(CameraSession session,
+                                int cameraId,
+                                VideoTransaction xact,
+                                MediaRecorder recorder) {
+    // no-op
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoRecorderActivity.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoRecorderActivity.java
new file mode 100644
index 0000000..3cf942a
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoRecorderActivity.java
@@ -0,0 +1,182 @@
+/***
+ Copyright (c) 2015-2016 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.MediaStore;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+/**
+ * Activity for recording video. Analogue of CameraActivity.
+ * Supports the same protocol, in terms of extras and return data,\
+ * as does ACTION_VIDEO_CAPTURE.
+ */
+public class VideoRecorderActivity extends AbstractCameraActivity {
+  /**
+   * Whether there should be a timer shown on the video recording
+   * preview screen, and, if so, whether it counts down the remaining
+   * time on a time-limited recording or whether it counts up for how
+   * long the current recording is. Value should be a ChronoType
+   * enum value (NONE, COUNT_DOWN, COUNT_UP). COUNT_DOWN will be
+   * ignored unless you also provide a duration limit.
+   */
+  public static final String EXTRA_CHRONOTYPE=
+    "cwac_cam2_chronotype";
+
+  private static final String[] PERMS={
+    Manifest.permission.CAMERA,
+    Manifest.permission.WRITE_EXTERNAL_STORAGE,
+    Manifest.permission.RECORD_AUDIO};
+
+  @Override
+  protected String[] getNeededPermissions() {
+    return(PERMS);
+  }
+
+  @Override
+  protected boolean needsOverlay() {
+    return(false);
+  }
+
+  @Override
+  protected boolean needsActionBar() {
+    return(false);
+  }
+
+  @Override
+  protected boolean isVideo() {
+    return(true);
+  }
+
+  @Override
+  protected void configEngine(CameraEngine engine) {
+    // no-op
+  }
+
+  @Override
+  protected CameraFragment buildFragment() {
+    return(CameraFragment.newVideoInstance(getOutputUri(),
+        getIntent().getBooleanExtra(EXTRA_UPDATE_MEDIA_STORE, false),
+        getIntent().getIntExtra(MediaStore.EXTRA_VIDEO_QUALITY, 1),
+        getIntent().getIntExtra(MediaStore.EXTRA_SIZE_LIMIT, 0),
+        getIntent().getIntExtra(MediaStore.EXTRA_DURATION_LIMIT, 0),
+        (ZoomStyle)getIntent().getSerializableExtra(EXTRA_ZOOM_STYLE),
+        getIntent().getBooleanExtra(EXTRA_FACING_EXACT_MATCH, false),
+        (ChronoType)getIntent().getSerializableExtra(EXTRA_CHRONOTYPE),
+        getIntent().getBooleanExtra(EXTRA_SHOW_RULE_OF_THIRDS_GRID, false)));
+  }
+
+  @SuppressWarnings("unused")
+  @Subscribe(threadMode = ThreadMode.MAIN)
+  public void onEventMainThread(CameraEngine.VideoTakenEvent event) {
+    if (event.getVideoTransaction()==null) {
+      setResult(RESULT_CANCELED);
+      finish();
+      // TODO: something with the exception
+    }
+    else {
+      findViewById(android.R.id.content).post(() -> {
+       setResult(RESULT_OK, buildResultIntent().setData(getOutputUri()));
+       finish();
+      });
+    }
+  }
+
+  /**
+   * Class to build an Intent used to start the VideoRecorderActivity.
+   * Call setComponent() on the Intent if you are using your
+   * own subclass of VideoRecorderActivity.
+   */
+  public static class IntentBuilder
+    extends AbstractCameraActivity.IntentBuilder<IntentBuilder> {
+    /**
+     * Standard constructor. May throw a runtime exception
+     * if the environment is not set up properly (see
+     * validateEnvironment() on Utils).
+     *
+     * @param ctxt any Context will do
+     */
+    public IntentBuilder(Context ctxt) {
+      super(ctxt, VideoRecorderActivity.class);
+    }
+
+    @Override
+    public Intent buildChooserBaseIntent() {
+      return(new Intent(MediaStore.ACTION_VIDEO_CAPTURE));
+    }
+
+    @Override
+    public Intent build() {
+      forceEngine(CameraEngine.ID.CLASSIC);
+
+      return(super.build());
+    }
+
+    @Override
+    public IntentBuilder to(Uri output) {
+      if (!"file".equals(output.getScheme())) {
+        throw new IllegalArgumentException("must be a file:/// Uri");
+      }
+
+      return(super.to(output));
+    }
+
+    /**
+     * Sets the maximum size of the video file in bytes. Maps
+     * to EXTRA_SIZE_LIMIT.
+     *
+     * @param limit maximum video size in bytes
+     * @return the builder, for chaining
+     */
+    public IntentBuilder sizeLimit(int limit) {
+      result.putExtra(MediaStore.EXTRA_SIZE_LIMIT, limit);
+
+      return(this);
+    }
+
+    /**
+     * Sets the maximum duration of the video file in milliseconds. Maps
+     * to EXTRA_DURATION_LIMIT.
+     *
+     * @param limit maximum video length in milliseconds
+     * @return the builder, for chaining
+     */
+    public IntentBuilder durationLimit(int limit) {
+      result.putExtra(MediaStore.EXTRA_DURATION_LIMIT, limit);
+
+      return(this);
+    }
+
+    /**
+     * Whether there should be a timer shown on the video recording
+     * preview screen, and, if so, whether it counts down the remaining
+     * time on a time-limited recording or whether it counts up for how
+     * long the current recording is. COUNT_DOWN will be
+     * ignored unless you also provide a duration limit.
+     *
+     * @param type NONE, COUNT_DOWN, or COUNT_UP
+     * @return the builder, for chaining
+     */
+    public IntentBuilder chronoType(ChronoType type) {
+      result.putExtra(EXTRA_CHRONOTYPE, type);
+
+      return(this);
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoTransaction.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoTransaction.java
new file mode 100644
index 0000000..9e64e84
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoTransaction.java
@@ -0,0 +1,76 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+import java.io.File;
+
+public class VideoTransaction {
+  File outputPath;
+  int quality=1;
+  int sizeLimit=0;
+  int durationLimit=0;
+
+  private VideoTransaction() {
+    // please use the Builder
+  }
+
+  public File getOutputPath() {
+    return(outputPath);
+  }
+
+  public int getQuality() {
+    return(quality);
+  }
+
+  public int getSizeLimit() {
+    return(sizeLimit);
+  }
+
+  public int getDurationLimit() {
+    return(durationLimit);
+  }
+
+  public static class Builder {
+    VideoTransaction result=new VideoTransaction();
+
+    public VideoTransaction build() {
+      return(result);
+    }
+
+    public Builder to(File outputPath) {
+      result.outputPath=outputPath;
+
+      return(this);
+    }
+
+    public Builder quality(int quality) {
+      result.quality=quality;
+
+      return(this);
+    }
+
+    public Builder sizeLimit(int sizeLimit) {
+      result.sizeLimit=sizeLimit;
+
+      return(this);
+    }
+
+    public Builder durationLimit(int durationLimit) {
+      result.durationLimit=durationLimit;
+
+      return(this);
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ZoomStyle.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ZoomStyle.java
new file mode 100644
index 0000000..c5bfc75
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ZoomStyle.java
@@ -0,0 +1,21 @@
+/***
+ Copyright (c) 2016 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2;
+
+public enum ZoomStyle {
+  NONE,
+  PINCH,
+  SEEKBAR
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FlashModePlugin.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FlashModePlugin.java
new file mode 100644
index 0000000..43813d9
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FlashModePlugin.java
@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2.plugin;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.hardware.Camera;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureRequest;
+import android.os.Build;
+import android.util.Log;
+import android.view.OrientationEventListener;
+import com.commonsware.cwac.cam2.AbstractCameraActivity;
+import com.commonsware.cwac.cam2.CameraConfigurator;
+import com.commonsware.cwac.cam2.CameraPlugin;
+import com.commonsware.cwac.cam2.CameraSession;
+import com.commonsware.cwac.cam2.ClassicCameraConfigurator;
+import com.commonsware.cwac.cam2.FlashMode;
+import com.commonsware.cwac.cam2.SimpleCameraTwoConfigurator;
+import com.commonsware.cwac.cam2.SimpleClassicCameraConfigurator;
+import java.util.List;
+
+/**
+ * Plugin for managing flash modes
+ */
+public class FlashModePlugin implements CameraPlugin {
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public <T extends CameraConfigurator> T buildConfigurator(Class<T> type) {
+    if (type == ClassicCameraConfigurator.class) {
+      return (type.cast(new Classic()));
+    }
+
+    return(type.cast(new Two()));
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void validate(CameraSession session) {
+    // no validation required
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void destroy() {
+    // no-op
+  }
+
+  class Classic extends SimpleClassicCameraConfigurator {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Camera.Parameters configureStillCamera(
+      CameraSession session,
+      Camera.CameraInfo info,
+      Camera camera, Camera.Parameters params) {
+      if (params!=null && session.getCurrentFlashMode()!=null) {
+        params.setFlashMode(session.getCurrentFlashMode().getClassicMode());
+      }
+
+      return(params);
+    }
+  }
+
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+  class Two extends SimpleCameraTwoConfigurator {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void addToCaptureRequest(CameraSession session,
+                                    CameraCharacteristics cc,
+                                    boolean facingFront,
+                                    CaptureRequest.Builder captureBuilder) {
+      if (session.getCurrentFlashMode()!=null) {
+        captureBuilder.set(CaptureRequest.CONTROL_AE_MODE,
+          session.getCurrentFlashMode().getCameraTwoMode());
+        captureBuilder.set(CaptureRequest.FLASH_MODE,
+          session.getCurrentFlashMode().isTorchMode() ?
+            CameraMetadata.FLASH_MODE_TORCH :
+            CameraMetadata.FLASH_MODE_OFF);
+      }
+    }
+
+    @Override
+    public void addToPreviewRequest(CameraSession session,
+                                    CameraCharacteristics cc,
+                                    CaptureRequest.Builder captureBuilder) {
+      if (session.getCurrentFlashMode()!=null) {
+        captureBuilder.set(CaptureRequest.CONTROL_AE_MODE,
+          session.getCurrentFlashMode().getCameraTwoMode());
+        captureBuilder.set(CaptureRequest.FLASH_MODE,
+          session.getCurrentFlashMode().isTorchMode() ?
+            CameraMetadata.FLASH_MODE_TORCH :
+            CameraMetadata.FLASH_MODE_OFF);
+      }
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FocusModePlugin.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FocusModePlugin.java
new file mode 100644
index 0000000..1393a8e
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FocusModePlugin.java
@@ -0,0 +1,215 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2.plugin;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.hardware.Camera;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureRequest;
+import android.os.Build;
+import android.util.Log;
+import android.view.OrientationEventListener;
+import com.commonsware.cwac.cam2.CameraConfigurator;
+import com.commonsware.cwac.cam2.CameraConstraints;
+import com.commonsware.cwac.cam2.CameraPlugin;
+import com.commonsware.cwac.cam2.CameraSession;
+import com.commonsware.cwac.cam2.ClassicCameraConfigurator;
+import com.commonsware.cwac.cam2.FocusMode;
+import com.commonsware.cwac.cam2.SimpleCameraTwoConfigurator;
+import com.commonsware.cwac.cam2.SimpleClassicCameraConfigurator;
+
+/**
+ * Plugin for managing focus modes
+ */
+public class FocusModePlugin implements CameraPlugin {
+  private final Context ctxt;
+  private final boolean isVideo;
+  private final FocusMode focusMode;
+  private OrientationEventListener orientationEventListener;
+  private int lastOrientation=OrientationEventListener.ORIENTATION_UNKNOWN;
+
+  public FocusModePlugin(Context ctxt,
+                         FocusMode focusMode,
+                         boolean isVideo) {
+    this.ctxt=ctxt.getApplicationContext();
+    this.focusMode=focusMode;
+    this.isVideo=isVideo;
+
+    orientationEventListener=new OrientationEventListener(ctxt) {
+      @Override
+      public void onOrientationChanged(int orientation) {
+        lastOrientation=orientation;
+      }
+    };
+
+    if (orientationEventListener.canDetectOrientation()) {
+      orientationEventListener.enable();
+    }
+    else {
+      orientationEventListener.disable();
+      orientationEventListener=null;
+    }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public <T extends CameraConfigurator> T buildConfigurator(Class<T> type) {
+    if (type == ClassicCameraConfigurator.class) {
+      return (type.cast(new Classic()));
+    }
+
+    return(type.cast(new Two()));
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void validate(CameraSession session) {
+    // no validation required
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void destroy() {
+    if (orientationEventListener!=null) {
+      orientationEventListener.disable();
+      orientationEventListener=null;
+    }
+  }
+
+  class Classic extends SimpleClassicCameraConfigurator {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Camera.Parameters configureStillCamera(
+      CameraSession session,
+      Camera.CameraInfo info,
+      Camera camera, Camera.Parameters params) {
+      if (params!=null) {
+        String desiredMode=null;
+
+        if (focusMode==FocusMode.OFF) {
+          desiredMode=Camera.Parameters.FOCUS_MODE_FIXED;
+        }
+        else if (focusMode==
+          FocusMode.EDOF) {
+          desiredMode=Camera.Parameters.FOCUS_MODE_EDOF;
+        }
+        else if (focusMode==
+          FocusMode.MACRO) {
+          desiredMode=Camera.Parameters.FOCUS_MODE_MACRO;
+        }
+        else if (isVideo) {
+          desiredMode=
+            Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO;
+        }
+        else {
+          desiredMode=
+            Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE;
+        }
+
+        if (params.getSupportedFocusModes().contains(desiredMode)) {
+          params.setFocusMode(desiredMode);
+        }
+        else {
+          Log.e("CWAC-Cam2",
+            "no support for requested focus mode");
+        }
+      }
+
+      return(params);
+    }
+  }
+
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+  class Two extends SimpleCameraTwoConfigurator {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void addToPreviewRequest(CameraSession session,
+                                    CameraCharacteristics cc,
+                                    CaptureRequest.Builder captureBuilder) {
+      int desiredMode=getDesiredFocusMode(cc);
+
+      if (desiredMode!=-1) {
+        captureBuilder.set(CaptureRequest.CONTROL_AF_MODE,
+          desiredMode);
+      }
+      else {
+        Log.e("CWAC-Cam2", "no support for requested focus mode");
+      }
+    }
+
+    @Override
+    public void addToCaptureRequest(CameraSession session,
+                                    CameraCharacteristics cc,
+                                    boolean facingFront,
+                                    CaptureRequest.Builder captureBuilder) {
+      int desiredMode=getDesiredFocusMode(cc);
+
+      if (desiredMode!=-1) {
+        captureBuilder.set(CaptureRequest.CONTROL_AF_MODE,
+          desiredMode);
+      }
+      else {
+        Log.e("CWAC-Cam2", "no support for requested focus mode");
+      }
+    }
+
+    private int getDesiredFocusMode(CameraCharacteristics cc) {
+      int[] availModes=cc.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
+      int desiredMode;
+
+      if (focusMode==FocusMode.OFF) {
+        desiredMode=CameraMetadata.CONTROL_AF_MODE_OFF;
+      }
+      else if (focusMode==FocusMode.EDOF) {
+        desiredMode=CameraMetadata.CONTROL_AF_MODE_EDOF;
+      }
+      else if (focusMode==FocusMode.MACRO) {
+        desiredMode=CameraMetadata.CONTROL_AF_MODE_MACRO;
+      }
+      else if (isVideo) {
+        desiredMode=CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_VIDEO;
+      }
+      else {
+        desiredMode=CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE;
+      }
+
+      CameraConstraints constraints=CameraConstraints.get();
+
+      if (constraints!=null && constraints.getDisableFocusMode()) {
+        desiredMode=CameraMetadata.CONTROL_AF_MODE_OFF;
+      }
+
+      for (int availMode : availModes) {
+        if (availMode==desiredMode) {
+          return(desiredMode);
+        }
+      }
+
+      return(-1);
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/OrientationPlugin.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/OrientationPlugin.java
new file mode 100644
index 0000000..546aa53
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/OrientationPlugin.java
@@ -0,0 +1,273 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2.plugin;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.hardware.Camera;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.media.MediaRecorder;
+import android.os.Build;
+import android.view.OrientationEventListener;
+import android.view.Surface;
+import android.view.WindowManager;
+import com.commonsware.cwac.cam2.AbstractCameraActivity;
+import com.commonsware.cwac.cam2.CameraConfigurator;
+import com.commonsware.cwac.cam2.CameraConstraints;
+import com.commonsware.cwac.cam2.CameraEngine;
+import com.commonsware.cwac.cam2.CameraPlugin;
+import com.commonsware.cwac.cam2.CameraSession;
+import com.commonsware.cwac.cam2.ClassicCameraConfigurator;
+import com.commonsware.cwac.cam2.SimpleCameraTwoConfigurator;
+import com.commonsware.cwac.cam2.SimpleClassicCameraConfigurator;
+import com.commonsware.cwac.cam2.VideoTransaction;
+
+/**
+ * Plugin for managing orientation effects on the previews
+ * and pictures.
+ */
+public class OrientationPlugin implements CameraPlugin {
+  private final Context ctxt;
+  private OrientationEventListener orientationEventListener;
+  private int lastOrientation=OrientationEventListener.ORIENTATION_UNKNOWN;
+
+  public OrientationPlugin(Context ctxt) {
+    this.ctxt=ctxt.getApplicationContext();
+
+    orientationEventListener=new OrientationEventListener(ctxt) {
+      @Override
+      public void onOrientationChanged(int orientation) {
+        if (lastOrientation!=orientation) {
+          AbstractCameraActivity.BUS
+            .post(new CameraEngine.OrientationChangedEvent());
+        }
+
+        lastOrientation=orientation;
+      }
+    };
+
+    if (orientationEventListener.canDetectOrientation()) {
+      orientationEventListener.enable();
+    }
+    else {
+      orientationEventListener.disable();
+      orientationEventListener=null;
+    }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public <T extends CameraConfigurator> T buildConfigurator(Class<T> type) {
+    if (type == ClassicCameraConfigurator.class) {
+      return (type.cast(new Classic()));
+    }
+
+    return(type.cast(new Two()));
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void validate(CameraSession session) {
+    // no validation required
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void destroy() {
+    if (orientationEventListener!=null) {
+      orientationEventListener.disable();
+      orientationEventListener=null;
+    }
+  }
+
+  class Classic extends SimpleClassicCameraConfigurator {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Camera.Parameters configureStillCamera(
+      CameraSession session,
+      Camera.CameraInfo info,
+      Camera camera, Camera.Parameters params) {
+      int displayOrientation=getDisplayOrientation(info, true);
+      int cameraDisplayOrientation=90;
+
+      CameraConstraints constraints=CameraConstraints.get();
+
+      if (constraints!=null && constraints.getCameraDisplayOrientation()>=0) {
+        cameraDisplayOrientation=constraints.getCameraDisplayOrientation();
+      }
+
+      else if (useAltAlgorithm()) {
+        int degrees=0;
+        int temp=displayOrientation;
+
+        switch (temp) {
+          case Surface.ROTATION_0: degrees = 0; break;
+          case Surface.ROTATION_90: degrees = 90; break;
+          case Surface.ROTATION_180: degrees = 180; break;
+          case Surface.ROTATION_270: degrees = 270; break;
+        }
+
+        if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+          temp = (info.orientation + degrees) % 360;
+          temp = (360 - temp) % 360;  // compensate the mirror
+        } else {  // back-facing
+          temp = (info.orientation - degrees + 360) % 360;
+        }
+
+        cameraDisplayOrientation=temp;
+      }
+      else if (displayOrientation==180) {
+        cameraDisplayOrientation=270;
+      }
+/*
+      else {
+        camera.setDisplayOrientation(90);
+      }
+*/
+
+      camera.setDisplayOrientation(cameraDisplayOrientation);
+
+      if (params!=null) {
+        int outputOrientation;
+
+        if (info.facing==Camera.CameraInfo.CAMERA_FACING_FRONT) {
+          outputOrientation=(360-displayOrientation)%360;
+        }
+        else {
+          outputOrientation=displayOrientation;
+        }
+
+        params.setRotation(outputOrientation);
+      }
+
+      return(params);
+    }
+
+    private boolean useAltAlgorithm() {
+/*
+      if ("Huawei".equals(Build.MANUFACTURER) &&
+        "angler".equals(Build.PRODUCT)) {
+        return(true);
+      }
+
+      if ("LGE".equals(Build.MANUFACTURER) &&
+        "bullhead".equals(Build.PRODUCT)) {
+        return(true);
+      }
+
+      if ("samsung".equals(Build.MANUFACTURER) &&
+        "mprojectlteuc".equals(Build.PRODUCT)) {
+        return(true);
+      }
+
+      return(false);
+*/
+      return(true);
+    }
+
+    @Override
+    public void configureRecorder(CameraSession session,
+                                  int cameraId,
+                                  VideoTransaction xact,
+                                  MediaRecorder recorder) {
+      Camera.CameraInfo info=new Camera.CameraInfo();
+      Camera.getCameraInfo(cameraId, info);
+      int displayOrientation=getDisplayOrientation(info, false);
+
+      recorder.setOrientationHint(displayOrientation);
+    }
+
+    private int getDisplayOrientation(Camera.CameraInfo info,
+                                      boolean isStillCapture) {
+      WindowManager mgr=(WindowManager)ctxt.getSystemService(Context.WINDOW_SERVICE);
+      int rotation=mgr.getDefaultDisplay().getRotation();
+      int degrees=0;
+
+      switch (rotation) {
+        case Surface.ROTATION_0:
+          degrees=0;
+          break;
+        case Surface.ROTATION_90:
+          degrees=90;
+          break;
+        case Surface.ROTATION_180:
+          degrees=180;
+          break;
+        case Surface.ROTATION_270:
+          degrees=270;
+          break;
+      }
+
+      int displayOrientation;
+
+      if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+        displayOrientation=(info.orientation + degrees) % 360;
+        displayOrientation=(360 - displayOrientation) % 360;
+
+        if (!isStillCapture && displayOrientation==90) {
+          displayOrientation=270;
+        }
+
+        if ("Huawei".equals(Build.MANUFACTURER) &&
+          "angler".equals(Build.PRODUCT) && displayOrientation==270) {
+          displayOrientation=90;
+        }
+      }
+      else {
+        displayOrientation=(info.orientation - degrees + 360) % 360;
+      }
+
+      return(displayOrientation);
+    }
+  }
+
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+  class Two extends SimpleCameraTwoConfigurator {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void addToCaptureRequest(CameraSession session,
+                                    CameraCharacteristics cc,
+                                    boolean facingFront,
+                                    CaptureRequest.Builder captureBuilder) {
+      // based on https://developer.android.com/reference/android/hardware/camera2/CaptureRequest.html#JPEG_ORIENTATION
+
+      int pictureOrientation=0;
+
+      if (lastOrientation!=android.view.OrientationEventListener.ORIENTATION_UNKNOWN) {
+        int sensorOrientation=cc.get(CameraCharacteristics.SENSOR_ORIENTATION);
+        int deviceOrientation=(lastOrientation + 45) / 90 * 90;
+
+        if (facingFront) {
+          deviceOrientation = -deviceOrientation;
+        }
+
+        pictureOrientation=(sensorOrientation + deviceOrientation + 360) % 360;
+      }
+
+      captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, pictureOrientation);
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/SizeAndFormatPlugin.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/SizeAndFormatPlugin.java
new file mode 100644
index 0000000..3a1f279
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/SizeAndFormatPlugin.java
@@ -0,0 +1,164 @@
+/**
+ * Copyright (c) 2015 CommonsWare, LLC
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2.plugin;
+
+import android.annotation.TargetApi;
+import android.graphics.Point;
+import android.hardware.Camera;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.media.CamcorderProfile;
+import android.media.ImageReader;
+import android.media.MediaRecorder;
+import android.os.Build;
+import com.commonsware.cwac.cam2.CameraConfigurator;
+import com.commonsware.cwac.cam2.CameraConstraints;
+import com.commonsware.cwac.cam2.CameraPlugin;
+import com.commonsware.cwac.cam2.CameraSession;
+import com.commonsware.cwac.cam2.CameraTwoConfigurator;
+import com.commonsware.cwac.cam2.ClassicCameraConfigurator;
+import com.commonsware.cwac.cam2.SimpleCameraTwoConfigurator;
+import com.commonsware.cwac.cam2.SimpleClassicCameraConfigurator;
+import com.commonsware.cwac.cam2.VideoTransaction;
+import com.commonsware.cwac.cam2.util.Size;
+
+/**
+ * A plugin that configures the size and format of previews and
+ * pictures to be taken by the camera. This, or a plugin like it,
+ * needs to be in the plugin chain for the CameraSession.
+ */
+public class SizeAndFormatPlugin implements CameraPlugin {
+  final private Size pictureSize;
+  final private Size previewSize;
+  private final int pictureFormat;
+
+  /**
+   * Constructor.
+   *
+   * @param previewSize the size of preview images
+   * @param pictureSize the size of pictures to be taken
+   * @param pictureFormat the format of pictures to be taken, in
+   *                      the form of an ImageFormat constant
+   *                      (e.g., ImageFormat.JPEG)
+   */
+  public SizeAndFormatPlugin(Size previewSize, Size pictureSize, int pictureFormat) {
+    this.previewSize=previewSize;
+    this.pictureSize=pictureSize;
+    this.pictureFormat=pictureFormat;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public <T extends CameraConfigurator> T buildConfigurator(Class<T> type) {
+    if (type == ClassicCameraConfigurator.class) {
+      return (type.cast(new Classic()));
+    }
+
+    return(type.cast(new Two()));
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void validate(CameraSession session) {
+    if (!session.getDescriptor().getPreviewSizes().contains(previewSize)) {
+      throw new IllegalStateException("Requested preview size is not one that the camera supports");
+    }
+
+    if (!session.getDescriptor().getPictureSizes().contains(pictureSize)) {
+      throw new IllegalStateException("Requested picture size is not one that the camera supports");
+    }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void destroy() {
+    // not required
+  }
+
+  class Classic extends SimpleClassicCameraConfigurator {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Camera.Parameters configureStillCamera(
+      CameraSession session,
+      Camera.CameraInfo info,
+      Camera camera, Camera.Parameters params) {
+      if (params!=null) {
+        params.setPreviewSize(previewSize.getWidth(),
+          previewSize.getHeight());
+        params.setPictureSize(pictureSize.getWidth(),
+          pictureSize.getHeight());
+        params.setPictureFormat(pictureFormat);
+      }
+
+      return(params);
+    }
+
+    @Override
+    public void configureRecorder(CameraSession session,
+                                  int cameraId,
+                                  VideoTransaction xact,
+                                  MediaRecorder recorder) {
+      int highProfile=getHigh();
+
+      boolean canGoHigh=CamcorderProfile.hasProfile(cameraId,
+        highProfile);
+      boolean canGoLow=CamcorderProfile.hasProfile(cameraId,
+        CamcorderProfile.QUALITY_LOW);
+
+      if (canGoHigh && (xact.getQuality()==1 || !canGoLow)) {
+        recorder.setProfile(CamcorderProfile.get(cameraId,
+          highProfile));
+      }
+      else if (canGoLow) {
+        recorder.setProfile(CamcorderProfile.get(cameraId,
+          CamcorderProfile.QUALITY_LOW));
+      }
+      else {
+        throw new IllegalStateException(
+          "cannot find valid CamcorderProfile");
+      }
+    }
+
+    private int getHigh() {
+      CameraConstraints constraints=CameraConstraints.get();
+
+      if (constraints!=null) {
+        return(constraints.getHighCamcorderProfile());
+      }
+
+      return(CamcorderProfile.QUALITY_HIGH);
+    }
+  }
+
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+  class Two extends SimpleCameraTwoConfigurator {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ImageReader buildImageReader() {
+      return(ImageReader.newInstance(pictureSize.getWidth(),
+          pictureSize.getHeight(), pictureFormat, 2));
+    }
+  }
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Size.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Size.java
new file mode 100644
index 0000000..0a22c82
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Size.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2.util;
+
+// import static com.android.internal.util.Preconditions.checkNotNull;
+
+/**
+ * Immutable class for describing width and height dimensions in pixels.
+ */
+public final class Size {
+  /**
+   * Create a new immutable Size instance.
+   *
+   * @param width The width of the size, in pixels
+   * @param height The height of the size, in pixels
+   */
+  public Size(int width, int height) {
+    mWidth = width;
+    mHeight = height;
+  }
+
+  /**
+   * Get the width of the size (in pixels).
+   * @return width
+   */
+  public int getWidth() {
+    return mWidth;
+  }
+
+  /**
+   * Get the height of the size (in pixels).
+   * @return height
+   */
+  public int getHeight() {
+    return mHeight;
+  }
+
+  /**
+   * Check if this size is equal to another size.
+   * <p>
+   * Two sizes are equal if and only if both their widths and heights are
+   * equal.
+   * </p>
+   * <p>
+   * A size object is never equal to any other type of object.
+   * </p>
+   *
+   * @return {@code true} if the objects were equal, {@code false} otherwise
+   */
+  @Override
+  public boolean equals(final Object obj) {
+    if (obj == null) {
+      return false;
+    }
+    if (this == obj) {
+      return true;
+    }
+    if (obj instanceof Size) {
+      Size other = (Size) obj;
+      return mWidth == other.mWidth && mHeight == other.mHeight;
+    }
+    return false;
+  }
+
+  /**
+   * Return the size represented as a string with the format {@code "WxH"}
+   *
+   * @return string representation of the size
+   */
+  @Override
+  public String toString() {
+    return mWidth + "x" + mHeight;
+  }
+
+  private static NumberFormatException invalidSize(String s) {
+    throw new NumberFormatException("Invalid Size: \"" + s + "\"");
+  }
+
+  /**
+   * Parses the specified string as a size value.
+   * <p>
+   * The ASCII characters {@code \}{@code u002a} ('*') and
+   * {@code \}{@code u0078} ('x') are recognized as separators between
+   * the width and height.</p>
+   * <p>
+   * For any {@code Size s}: {@code Size.parseSize(s.toString()).equals(s)}.
+   * However, the method also handles sizes expressed in the
+   * following forms:</p>
+   * <p>
+   * "<i>width</i>{@code x}<i>height</i>" or
+   * "<i>width</i>{@code *}<i>height</i>" {@code => new Size(width, height)},
+   * where <i>width</i> and <i>height</i> are string integers potentially
+   * containing a sign, such as "-10", "+7" or "5".</p>
+   *
+   * <pre>{@code
+   * Size.parseSize("3*+6").equals(new Size(3, 6)) == true
+   * Size.parseSize("-3x-6").equals(new Size(-3, -6)) == true
+   * Size.parseSize("4 by 3") => throws NumberFormatException
+   * }</pre>
+   *
+   * @param string the string representation of a size value.
+   * @return the size value represented by {@code string}.
+   *
+   * @throws NumberFormatException if {@code string} cannot be parsed
+   * as a size value.
+   * @throws NullPointerException if {@code string} was {@code null}
+   */
+  public static Size parseSize(String string)
+      throws NumberFormatException {
+//    checkNotNull(string, "string must not be null");
+
+    int sep_ix = string.indexOf('*');
+    if (sep_ix < 0) {
+      sep_ix = string.indexOf('x');
+    }
+    if (sep_ix < 0) {
+      throw invalidSize(string);
+    }
+    try {
+      return new Size(Integer.parseInt(string.substring(0, sep_ix)),
+          Integer.parseInt(string.substring(sep_ix + 1)));
+    } catch (NumberFormatException e) {
+      throw invalidSize(string);
+    }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public int hashCode() {
+    // assuming most sizes are <2^16, doing a rotate will give us perfect hashing
+    return mHeight ^ ((mWidth << (Integer.SIZE / 2)) | (mWidth >>> (Integer.SIZE / 2)));
+  }
+
+  private final int mWidth;
+  private final int mHeight;
+}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Utils.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Utils.java
new file mode 100644
index 0000000..ae6e121
--- /dev/null
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Utils.java
@@ -0,0 +1,195 @@
+/***
+ Copyright (c) 2015 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package com.commonsware.cwac.cam2.util;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import com.commonsware.cwac.cam2.CameraActivity;
+import com.commonsware.cwac.cam2.CameraDescriptor;
+import com.commonsware.cwac.cam2.VideoRecorderActivity;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Home of static utility methods used by the library and
+ * offered to developers in the spirit of togetherness.
+ */
+public class Utils {
+  /**
+   * Tests the app and the device to confirm that the code
+   * in this library should work. This is called automatically
+   * by other classes (e.g., CameraActivity), and so you probably
+   * do not need to call it yourself. But, hey, it's a public
+   * method, so call it if you feel like it.
+   *
+   * The method will throw an IllegalStateException if the
+   * environment is unsatisfactory, where the exception message
+   * will tell you what is wrong.
+   *
+   * @param ctxt any Context will do
+   */
+  public static void validateEnvironment(Context ctxt,
+                                         boolean failIfNoPermissions) {
+    if (Build.VERSION.SDK_INT<Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+      throw new IllegalStateException("App is running on device older than API Level 14");
+    }
+
+    PackageManager pm=ctxt.getPackageManager();
+
+    if (!pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY) &&
+        !pm.hasSystemFeature(PackageManager.FEATURE_CAMERA)) {
+      throw new IllegalStateException("App is running on device that lacks a camera");
+    }
+
+    if (ctxt instanceof CameraActivity) {
+      try {
+        ActivityInfo info=pm.getActivityInfo(((CameraActivity)ctxt).getComponentName(), 0);
+
+        if (info.exported) {
+          throw new IllegalStateException("A CameraActivity cannot be exported!");
+        }
+      }
+      catch (PackageManager.NameNotFoundException e) {
+        throw new IllegalStateException("Cannot find this activity!", e);
+      }
+    }
+
+    if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.M && failIfNoPermissions) {
+      if (ctxt.checkSelfPermission(Manifest.permission.CAMERA)!=
+        PackageManager.PERMISSION_GRANTED) {
+        throw new IllegalStateException("We do not have the CAMERA permission");
+      }
+
+      if (ctxt instanceof VideoRecorderActivity) {
+        if (ctxt.checkSelfPermission(Manifest.permission.RECORD_AUDIO)!=
+          PackageManager.PERMISSION_GRANTED) {
+          throw new IllegalStateException("We do not have the RECORD_AUDIO permission");
+        }
+      }
+    }
+  }
+
+  /**
+   * Algorithm for determining if the system bar is on the
+   * bottom or right. Based on implementation of PhoneWindowManager.
+   * Pray that it holds up.
+   *
+   * @param ctxt any Context will do
+   * @return true if the system bar should be on the bottom in
+   * the current configuration, false otherwise
+   */
+  public static boolean isSystemBarOnBottom(Context ctxt) {
+    Resources res=ctxt.getResources();
+    Configuration cfg=res.getConfiguration();
+    DisplayMetrics dm=res.getDisplayMetrics();
+    boolean canMove=(dm.widthPixels != dm.heightPixels &&
+        cfg.smallestScreenWidthDp < 600);
+
+    return(!canMove || dm.widthPixels < dm.heightPixels);
+  }
+
+  public static Size getLargestPictureSize(CameraDescriptor descriptor) {
+    Size result=null;
+
+    for (Size size : descriptor.getPictureSizes()) {
+      if (result == null) {
+        result=size;
+      }
+      else {
+        int resultArea=result.getWidth() * result.getHeight();
+        int newArea=size.getWidth() * size.getHeight();
+
+        if (newArea > resultArea) {
+          result=size;
+        }
+      }
+    }
+
+    return(result);
+  }
+
+  public static Size getSmallestPictureSize(CameraDescriptor descriptor) {
+    Size result=null;
+
+    for (Size size : descriptor.getPictureSizes()) {
+      if (result == null) {
+        result=size;
+      }
+      else {
+        int resultArea=result.getWidth() * result.getHeight();
+        int newArea=size.getWidth() * size.getHeight();
+
+        if (newArea < resultArea) {
+          result=size;
+        }
+      }
+    }
+
+    return(result);
+  }
+
+  // based on https://github.com/googlesamples/android-Camera2Basic/blob/master/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
+
+  /**
+   * Given {@code choices} of {@code Size}s supported by a camera, chooses the smallest one whose
+   * width and height are at least as large as the respective requested values, and whose aspect
+   * ratio matches with the specified value.
+   *
+   * @param choices     The list of sizes that the camera supports for the intended output class
+   * @param width       The minimum desired width
+   * @param height      The minimum desired height
+   * @param aspectRatio The aspect ratio
+   * @return The optimal {@code Size}, or an arbitrary one if none were big enough
+   */
+  public static Size chooseOptimalSize(List<Size> choices, int width, int height, Size aspectRatio) {
+    // Collect the supported resolutions that are at least as big as the preview Surface
+    List<Size> bigEnough = new ArrayList<Size>();
+    int w = aspectRatio.getWidth();
+    int h = aspectRatio.getHeight();
+    for (Size option : choices) {
+      if (option.getHeight() == option.getWidth() * h / w &&
+          option.getWidth() >= width && option.getHeight() >= height) {
+        bigEnough.add(option);
+      }
+    }
+
+    // Pick the smallest of those, assuming we found any
+    if (bigEnough.size() > 0) {
+      return Collections.min(bigEnough, new CompareSizesByArea());
+    } else {
+//      Log.e(TAG, "Couldn't find any suitable preview size");
+      return Collections.max(choices, new CompareSizesByArea());
+    }
+  }
+
+  static class CompareSizesByArea implements Comparator<Size> {
+
+    @Override
+    public int compare(Size lhs, Size rhs) {
+      // We cast here to ensure the multiplications won't overflow
+      return Long.signum((long) lhs.getWidth() * lhs.getHeight() -
+          (long) rhs.getWidth() * rhs.getHeight());
+    }
+
+  }
+}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Events.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/Events.java
similarity index 71%
rename from imagepicker/src/main/java/net/yazeed44/imagepicker/util/Events.java
rename to imagepicker/src/main/java/net/yazeed44/imagepicker/data/Events.java
index c524b19..bafb28a 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Events.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/Events.java
@@ -1,14 +1,17 @@
-package net.yazeed44.imagepicker.util;
+package net.yazeed44.imagepicker.data;
 
-import com.melnykov.fab.FloatingActionButton;
 
-import net.yazeed44.imagepicker.model.AlbumEntry;
-import net.yazeed44.imagepicker.model.ImageEntry;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import net.yazeed44.imagepicker.data.model.AlbumEntry;
+import net.yazeed44.imagepicker.data.model.ImageEntry;
+import net.yazeed44.imagepicker.util.Picker;
 
 import java.util.ArrayList;
 
 /**
- * Created by yazeed44 on 6/13/15.
+ * Created by yazeed44
+ * on 6/13/15.
  */
 public final class Events {
 
@@ -92,4 +95,19 @@ public final static class OnReloadAlbumsEvent {
     }
 
 
+    public static final class OnImagePreviewEvent {
+        public final ArrayList<ImageEntry> imageEntries;
+
+        public OnImagePreviewEvent(ArrayList<ImageEntry> sCheckedImages) {
+            this.imageEntries = sCheckedImages;
+        }
+    }
+
+    public static final class OnPublishPreview {
+        public final ArrayList<ImageEntry> imageEntries;
+
+        public OnPublishPreview(ArrayList<ImageEntry> imageEntries) {
+            this.imageEntries = imageEntries;
+        }
+    }
 }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/model/AlbumEntry.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/AlbumEntry.java
similarity index 63%
rename from imagepicker/src/main/java/net/yazeed44/imagepicker/model/AlbumEntry.java
rename to imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/AlbumEntry.java
index b06e02e..1722c51 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/model/AlbumEntry.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/AlbumEntry.java
@@ -1,12 +1,12 @@
-package net.yazeed44.imagepicker.model;
+package net.yazeed44.imagepicker.data.model;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 
 /**
- * Created by yazeed44 on 6/14/15.
+ * Created by yazeed44
+ * on 6/14/15.
  */
 public class AlbumEntry implements Serializable {
     public final int id;
@@ -24,12 +24,7 @@ public void addPhoto(ImageEntry imageEntry) {
         imageList.add(imageEntry);
     }
     public void sortImagesByTimeDesc() {
-        Collections.sort(imageList, new Comparator<ImageEntry>() {
-            @Override
-            public int compare(ImageEntry lhs, ImageEntry rhs) {
-                return (int) (rhs.dateAdded - lhs.dateAdded);
-            }
-        });
+        Collections.sort(imageList, (lhs, rhs) -> (int) (rhs.dateAdded - lhs.dateAdded));
 
         coverImage = imageList.get(0);
     }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
new file mode 100644
index 0000000..627287c
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
@@ -0,0 +1,596 @@
+package net.yazeed44.imagepicker.data.model;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.media.ExifInterface;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.util.Base64;
+
+import androidx.annotation.NonNull;
+
+import com.bumptech.glide.Glide;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * Created by yazeed44
+ * on 6/14/15.
+ */
+public class ImageEntry implements Parcelable {
+    public final int imageId;
+    public final String path;
+    public final long dateAdded;
+    public boolean isPicked = false;
+    public boolean isVideo = false;
+
+    private int orientation = 0;
+    private int maxDimen = 1152;
+    private int compressPercent = 100;
+    private Bitmap bitmap;
+
+    private Context context;
+    private String description = "";
+    private boolean uploaded;
+    private int progress;
+
+    private void logException(Throwable e) {
+//        e.printStackTrace();
+    }
+
+    public ImageEntry(String path, Bitmap bitmap, Long dateAdded) {
+        this.path = path;
+        this.imageId = dateAdded.intValue();
+        this.bitmap = bitmap;
+        this.dateAdded = dateAdded;
+    }
+
+    public String getBase64(int maxSizeKB) {
+        String base64 = getBase64();
+        int size = base64.getBytes().length / 1024;
+        while (size > maxSizeKB) {
+            if (compressPercent > 70) {
+                setCompressPercent(getCompressPercent() - 10);
+                base64 = getBase64();
+                size = base64.getBytes().length / 1024;
+            } else break;
+        }
+        return base64;
+    }
+
+    public String getBase64() {
+        String rt = "";
+        Bitmap bmp = getScaledBitmap();
+        ExifInterface exif;
+        int angle = 0;
+        try {
+            exif = new ExifInterface(path);
+            int orientation = exif.getAttributeInt(
+                    ExifInterface.TAG_ORIENTATION,
+                    ExifInterface.ORIENTATION_NORMAL);
+            if (orientation == ExifInterface.ORIENTATION_ROTATE_90) {
+                angle = 90;
+            } else if (orientation == ExifInterface.ORIENTATION_ROTATE_180) {
+                angle = 180;
+            }
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            logException(e);
+        }
+        Matrix matrix1 = new Matrix();
+
+        //set image rotation value to 45 degrees in matrix.
+        matrix1.postRotate(angle);
+        if (bmp != null)
+            //Create bitmap with new values.
+            bmp = Bitmap.createBitmap(bmp, 0, 0,
+                    bmp.getWidth(), bmp.getHeight(), matrix1, true);
+        if (bmp != null) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            bmp.compress(Bitmap.CompressFormat.JPEG, compressPercent, baos);
+            byte[] b = baos.toByteArray();
+            return Base64.encodeToString(b, Base64.DEFAULT);
+        }
+        return rt;
+    }
+
+    public Bitmap getBitmapRotated() {
+        Bitmap bmp = getScaledBitmap();
+        ExifInterface exif;
+        int angle = 0;
+        try {
+            exif = new ExifInterface(path);
+            int orientation = exif.getAttributeInt(
+                    ExifInterface.TAG_ORIENTATION,
+                    ExifInterface.ORIENTATION_NORMAL);
+
+
+            if (orientation == ExifInterface.ORIENTATION_ROTATE_90) {
+                angle = 90;
+            } else if (orientation == ExifInterface.ORIENTATION_ROTATE_180) {
+                angle = 180;
+            }
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            logException(e);
+        }
+        Matrix matrix1 = new Matrix();
+
+        //set image rotation value to 45 degrees in matrix.
+        matrix1.postRotate(angle);
+        //Create bitmap with new values.
+        bmp = Bitmap.createBitmap(bmp, 0, 0,
+                bmp.getWidth(), bmp.getHeight(), matrix1, true);
+        return bmp;
+    }
+
+    public String getBase64Rotated(Context context) {
+        String rt = "";
+        Bitmap bmp = null;
+        try {
+            bmp = getBitmapResignedAndRotated(getUri(), context);
+            if (bmp != null) {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                bmp.compress(Bitmap.CompressFormat.JPEG, compressPercent, baos);
+                byte[] b = baos.toByteArray();
+                return Base64.encodeToString(b, Base64.DEFAULT);
+            }
+        } catch (IOException e) {
+            logException(e);
+        }
+
+        return rt;
+    }
+
+    /**
+     * Rotate an image if required.
+     *
+     * @param img           The image bitmap
+     * @param selectedImage Image URI
+     * @return The resulted Bitmap after manipulation
+     */
+    private static Bitmap rotateImageIfRequired(Context context, Bitmap img, Uri selectedImage) throws IOException {
+
+        InputStream input = context.getContentResolver().openInputStream(selectedImage);
+        ExifInterface ei;
+        if (Build.VERSION.SDK_INT > 23)
+            ei = new ExifInterface(input);
+        else
+            ei = new ExifInterface(selectedImage.getPath());
+
+        int orientation = ei.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+
+        switch (orientation) {
+            case ExifInterface.ORIENTATION_ROTATE_90:
+                return rotateImage(img, 90);
+            case ExifInterface.ORIENTATION_ROTATE_180:
+                return rotateImage(img, 180);
+            case ExifInterface.ORIENTATION_ROTATE_270:
+                return rotateImage(img, 270);
+            default:
+                return img;
+        }
+    }
+    public Bitmap getBitmapResignedAndRotated(Uri photoUri, Context context) throws IOException {
+        // First decode with inJustDecodeBounds=true to check dimensions
+        final BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        InputStream imageStream = context.getContentResolver().openInputStream(photoUri);
+        BitmapFactory.decodeStream(imageStream, null, options);
+        imageStream.close();
+
+        // Calculate inSampleSize
+        options.inSampleSize = calculateInSampleSize(options, maxDimen, maxDimen);
+
+        // Decode bitmap with inSampleSize set
+        options.inJustDecodeBounds = false;
+        imageStream = context.getContentResolver().openInputStream(photoUri);
+        Bitmap img = BitmapFactory.decodeStream(imageStream, null, options);
+
+        img = rotateImageIfRequired(context, img, photoUri);
+        return img;
+
+    }
+
+    public int getOrientation(Uri photoUri, Context mContext) {
+        /* it's on the external media. */
+        Cursor cursor = mContext.getContentResolver().query(photoUri,
+                new String[]{MediaStore.Images.ImageColumns.ORIENTATION}, null, null, null);
+        if (cursor == null) return -1;
+        if (cursor.getCount() != 1) {
+            return -1;
+        }
+
+        cursor.moveToFirst();
+        return cursor.getInt(0);
+    }
+
+    public Context getContext() {
+        return context;
+    }
+
+    public void setContext(Context context) {
+        this.context = context;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setUploaded(boolean uploaded) {
+        this.uploaded = uploaded;
+    }
+
+    public boolean getUploaded() {
+        return uploaded;
+    }
+
+    public void setProgress(int progress) {
+        this.progress = progress;
+    }
+
+    public int getProgress() {
+        return progress;
+    }
+
+    static class FlushedInputStream extends FilterInputStream {
+        public FlushedInputStream(InputStream inputStream) {
+            super(inputStream);
+        }
+
+        @Override
+        public long skip(long n) throws IOException {
+            long totalBytesSkipped = 0L;
+            while (totalBytesSkipped < n) {
+                long bytesSkipped = in.skip(n - totalBytesSkipped);
+                if (bytesSkipped == 0L) {
+                    int b = read();
+                    if (b < 0) {
+                        break;  // we reached EOF
+                    } else {
+                        bytesSkipped = 1; // we read one byte
+                    }
+                }
+                totalBytesSkipped += bytesSkipped;
+            }
+            return totalBytesSkipped;
+        }
+    }
+
+    public int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+
+            // Calculate ratios of height and width to requested height and width
+            final int heightRatio = Math.round((float) height / (float) reqHeight);
+            final int widthRatio = Math.round((float) width / (float) reqWidth);
+
+            // Choose the smallest ratio as inSampleSize value, this will guarantee a final image
+            // with both dimensions larger than or equal to the requested height and width.
+            inSampleSize = heightRatio < widthRatio ? heightRatio : widthRatio;
+
+            // This offers some additional logic in case the image has a strange
+            // aspect ratio. For example, a panorama may have a much larger
+            // width than height. In these cases the total pixels might still
+            // end up being too large to fit comfortably in memory, so we should
+            // be more aggressive with sample down the image (=larger inSampleSize).
+
+            final float totalPixels = width * height;
+
+            // Anything more than 2x the requested pixels we'll sample down further
+            final float totalReqPixelsCap = reqWidth * reqHeight * 2;
+
+            while (totalPixels / (inSampleSize * inSampleSize) > totalReqPixelsCap) {
+                inSampleSize++;
+            }
+        }
+        return inSampleSize;
+    }
+
+    public Bitmap decodeFile(File f) {
+        //Decode image size
+        BitmapFactory.Options o = new BitmapFactory.Options();
+        o.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(f.getAbsolutePath(), o);
+//        Log.e("Test", "ABC");
+        int original_width = o.outWidth;
+        int original_height = o.outHeight;
+        int new_width = original_width;
+        int new_height = original_height;
+        if (original_width > maxDimen) {
+            new_width = maxDimen;
+            new_height = (new_width * original_height) / original_width;
+        }
+        if (new_height > maxDimen) {
+            new_height = maxDimen;
+            new_width = (new_height * original_width) / original_height;
+        }
+
+        //Decode with inSampleSize
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inSampleSize = calculateInSampleSize(o, new_width, new_height);
+//        Log.e("Sample size", "is " + options.inSampleSize);
+//            options.inJustDecodeBounds = false;
+        return BitmapFactory.decodeFile(f.getAbsolutePath(), options);
+    }
+
+    public Bitmap getBitmap() {
+        if (TextUtils.isEmpty(path)) {
+            return bitmap;
+        } else {
+            File imgFile = new File(path);
+            if (imgFile.exists()) {
+//                Log.e("Path", "abc" + path);
+                if (context != null) {
+                    return loadBitmapWithGlide(path);
+                } else {
+                    Bitmap bm;
+                    bm = decodeFile(imgFile);
+                    return rotateImage(bm, orientation);
+                }
+            }
+        }
+        return null;
+    }
+
+    private Bitmap loadBitmapWithGlide(String path) {
+        try {
+            BitmapFactory.Options o = new BitmapFactory.Options();
+            o.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(new File(path).getAbsolutePath(), o);
+//            Log.e("Test", "ABC");
+            int original_width = o.outWidth;
+            int original_height = o.outHeight;
+            int new_width = original_width;
+            int new_height = original_height;
+            if (original_width > maxDimen) {
+                new_width = maxDimen;
+                new_height = (new_width * original_height) / original_width;
+            }
+            if (new_height > maxDimen) {
+                new_height = maxDimen;
+                new_width = (new_height * original_width) / original_height;
+            }
+
+            Bitmap bm = Glide.with(context).asBitmap().load(path).into(new_width, new_height).get();
+            return rotateImage(bm, orientation);
+        } catch (InterruptedException e) {
+            logException(e);
+        } catch (ExecutionException e) {
+            logException(e);
+        }
+        return null;
+    }
+
+    public Uri getUri() {
+        if (TextUtils.isEmpty(path)) {
+            return null;
+        } else {
+            File imgFile = new File(path);
+            if (imgFile.exists()) {
+                return Uri.fromFile(imgFile);
+            }
+        }
+        return null;
+    }
+
+    public Bitmap getScaledBitmap() {
+        Bitmap origin_bm = getBitmap();
+        if (origin_bm == null) return null;
+        int original_width = origin_bm.getWidth();
+        int original_height = origin_bm.getHeight();
+        int new_width = original_width;
+        int new_height = original_height;
+        if (original_width > maxDimen) {
+            new_width = maxDimen;
+            new_height = (new_width * original_height) / original_width;
+        }
+        if (new_height > maxDimen) {
+            new_height = maxDimen;
+            new_width = (new_height * original_width) / original_height;
+        }
+        return BITMAP_RESIZER(origin_bm, new_width, new_height);
+    }
+
+    private Bitmap BITMAP_RESIZER(Bitmap bitmap, int newWidth, int newHeight) {
+        Bitmap scaledBitmap = Bitmap.createBitmap(newWidth, newHeight, Bitmap.Config.ARGB_8888);
+
+        float ratioX = newWidth / (float) bitmap.getWidth();
+        float ratioY = newHeight / (float) bitmap.getHeight();
+        float middleX = newWidth / 2.0f;
+        float middleY = newHeight / 2.0f;
+
+        Matrix scaleMatrix = new Matrix();
+        scaleMatrix.setScale(ratioX, ratioY, middleX, middleY);
+
+        Canvas canvas = new Canvas(scaledBitmap);
+        canvas.setMatrix(scaleMatrix);
+        Paint paint = new Paint(Paint.FILTER_BITMAP_FLAG);
+        paint.setFilterBitmap(true);
+        //canvas.drawBitmap(bitmap, matrix, paint);
+        canvas.drawBitmap(bitmap, middleX - bitmap.getWidth() / 2, middleY - bitmap.getHeight() / 2, paint);
+        return scaledBitmap;
+
+    }
+
+    private static Bitmap rotateImage(Bitmap img, int degree) {
+        Matrix matrix = new Matrix();
+        matrix.postRotate(degree);
+        Bitmap rotatedImg = Bitmap.createBitmap(img, 0, 0, img.getWidth(), img.getHeight(), matrix, true);
+//        img.recycle();
+        return rotatedImg;
+    }
+
+    public ImageEntry(final Builder builder) {
+        this.path = builder.mPath;
+        this.imageId = builder.mImageId;
+        this.dateAdded = builder.mDateAdded;
+    }
+
+    public static ImageEntry from(final Cursor cursor) {
+        return Builder.from(cursor).build();
+    }
+
+    public static ImageEntry from(final Uri uri) {
+        return Builder.from(uri).build();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return o instanceof ImageEntry && ((ImageEntry) o).path.equals(path);
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "ImageEntry{" +
+                "path='" + path + '\'' +
+                '}';
+    }
+
+    public int getOrientation() {
+        return orientation;
+    }
+
+    public void setOrientation(int orientation) {
+        this.orientation = orientation;
+    }
+
+    public int getCompressPercent() {
+        return compressPercent;
+    }
+
+    public void setCompressPercent(int compressPercent) {
+        this.compressPercent = compressPercent;
+    }
+
+    public static class Builder {
+
+        public static int count = -1;
+        private final String mPath;
+        private int mImageId;
+        private long mDateAdded;
+
+        public Builder(final String path) {
+            this.mPath = path;
+        }
+
+        public static Builder from(final Uri uri) {
+
+            return new Builder(uri.getPath())
+                    .imageId(count--)
+                    ;
+
+        }
+
+        public static Builder from(final Cursor cursor) {
+            final int dataColumn = cursor.getColumnIndex(MediaStore.Images.Media.DATA);
+            final int imageIdColumn = cursor.getColumnIndex(MediaStore.Images.Media._ID);
+            final int dateAddedColumn = cursor.getColumnIndex(MediaStore.Images.Media.DATE_MODIFIED);
+
+            final int imageId = cursor.getInt(imageIdColumn);
+            final String path = cursor.getString(dataColumn);
+            final long dateAdded = cursor.getLong(dateAddedColumn);
+
+            return new Builder(path)
+                    .imageId(imageId)
+                    .dateAdded(dateAdded)
+                    ;
+
+        }
+
+
+        public Builder imageId(int imageId) {
+            this.mImageId = imageId;
+            return this;
+        }
+
+        public Builder dateAdded(long timestamp) {
+            this.mDateAdded = timestamp;
+            return this;
+        }
+
+
+        public ImageEntry build() {
+            return new ImageEntry(this);
+        }
+
+
+    }
+
+    public int getMaxDimen() {
+        return maxDimen;
+    }
+
+    public void setMaxDimen(int maxDimen) {
+        this.maxDimen = maxDimen;
+    }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(this.imageId);
+        dest.writeString(this.path);
+        dest.writeLong(this.dateAdded);
+        dest.writeByte(this.isPicked ? (byte) 1 : (byte) 0);
+        dest.writeByte(this.isVideo ? (byte) 1 : (byte) 0);
+        dest.writeInt(this.orientation);
+        dest.writeInt(this.maxDimen);
+        dest.writeInt(this.compressPercent);
+        dest.writeString(this.description);
+        dest.writeByte(this.uploaded ? (byte) 1 : (byte) 0);
+        dest.writeInt(this.progress);
+    }
+
+    protected ImageEntry(Parcel in) {
+        this.imageId = in.readInt();
+        this.path = in.readString();
+        this.dateAdded = in.readLong();
+        this.isPicked = in.readByte() != 0;
+        this.isVideo = in.readByte() != 0;
+        this.orientation = in.readInt();
+        this.maxDimen = in.readInt();
+        this.compressPercent = in.readInt();
+        this.description = in.readString();
+        this.uploaded = in.readByte() != 0;
+        this.progress = in.readInt();
+    }
+
+    public static final Creator<ImageEntry> CREATOR = new Creator<ImageEntry>() {
+        @Override
+        public ImageEntry createFromParcel(Parcel source) {
+            return new ImageEntry(source);
+        }
+
+        @Override
+        public ImageEntry[] newArray(int size) {
+            return new ImageEntry[size];
+        }
+    };
+}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/model/ImageEntry.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/model/ImageEntry.java
deleted file mode 100644
index 50e92ba..0000000
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/model/ImageEntry.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package net.yazeed44.imagepicker.model;
-
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.MediaStore;
-
-import java.io.Serializable;
-
-/**
- * Created by yazeed44 on 6/14/15.
- */
-public class ImageEntry implements Serializable {
-    public final int imageId;
-    public final String path;
-    public final long dateAdded;
-    public boolean isPicked = false;
-    public boolean isVideo = false;
-
-    public ImageEntry(final Builder builder) {
-        this.path = builder.mPath;
-        this.imageId = builder.mImageId;
-        this.dateAdded = builder.mDateAdded;
-    }
-
-    public static ImageEntry from(final Cursor cursor) {
-        return Builder.from(cursor).build();
-    }
-
-    public static ImageEntry from(final Uri uri) {
-        return Builder.from(uri).build();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return o instanceof ImageEntry && ((ImageEntry) o).path.equals(path);
-    }
-
-    @Override
-    public String toString() {
-        return "ImageEntry{" +
-                "path='" + path + '\'' +
-                '}';
-    }
-
-    public static class Builder {
-
-        public static int count = -1;
-        private final String mPath;
-        private int mImageId;
-        private long mDateAdded;
-
-        public Builder(final String path) {
-            this.mPath = path;
-        }
-
-        public static Builder from(final Uri uri) {
-
-            return new Builder(uri.getPath())
-                    .imageId(count--)
-                    ;
-
-        }
-
-        public static Builder from(final Cursor cursor) {
-            final int dataColumn = cursor.getColumnIndex(MediaStore.Images.Media.DATA);
-            final int imageIdColumn = cursor.getColumnIndex(MediaStore.Images.Media._ID);
-            final int dateAddedColumn = cursor.getColumnIndex(MediaStore.Images.Media.DATE_MODIFIED);
-
-            final int imageId = cursor.getInt(imageIdColumn);
-            final String path = cursor.getString(dataColumn);
-            final long dateAdded = cursor.getLong(dateAddedColumn);
-
-            return new ImageEntry.Builder(path)
-                    .imageId(imageId)
-                    .dateAdded(dateAdded)
-                    ;
-
-        }
-
-
-        public Builder imageId(int imageId) {
-            this.mImageId = imageId;
-            return this;
-        }
-
-        public Builder dateAdded(long timestamp) {
-            this.mDateAdded = timestamp;
-            return this;
-        }
-
-
-        public ImageEntry build() {
-            return new ImageEntry(this);
-        }
-
-
-    }
-
-}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
index b26d458..44e95e5 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
@@ -1,82 +1,111 @@
 package net.yazeed44.imagepicker.ui;
 
-import android.content.DialogInterface;
+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.ColorStateList;
+import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.media.MediaPlayer;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import android.os.StrictMode;
+import android.provider.MediaStore;
 import android.util.Log;
-import android.view.ContextThemeWrapper;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.app.ActivityCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.fragment.app.Fragment;
+
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.yalantis.ucrop.UCrop;
+
+import net.yazeed44.imagepicker.data.Events;
+import net.yazeed44.imagepicker.data.model.AlbumEntry;
+import net.yazeed44.imagepicker.data.model.ImageEntry;
+import net.yazeed44.imagepicker.library.BuildConfig;
 import net.yazeed44.imagepicker.library.R;
-import net.yazeed44.imagepicker.model.AlbumEntry;
-import net.yazeed44.imagepicker.model.ImageEntry;
+import net.yazeed44.imagepicker.ui.album.AlbumsFragment;
+import net.yazeed44.imagepicker.ui.imagePreview.ImagePreviewActivity;
+import net.yazeed44.imagepicker.ui.photo.ImagesThumbnailFragment;
+import net.yazeed44.imagepicker.ui.photoPager.ImagesPagerFragment;
 import net.yazeed44.imagepicker.util.CameraSupport;
-import net.yazeed44.imagepicker.util.Events;
+import net.yazeed44.imagepicker.util.LocaleHelper;
 import net.yazeed44.imagepicker.util.Picker;
-import net.yazeed44.imagepicker.util.Util;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 
 import java.io.File;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 
-import de.greenrobot.event.EventBus;
 
 
 public class PickerActivity extends AppCompatActivity {
-
-
     public static final int NO_LIMIT = -1;
-
     public static final String KEY_ACTION_BAR_TITLE = "actionBarKey";
     public static final String KEY_SHOULD_SHOW_ACTIONBAR_UP = "shouldShowUpKey";
-    public static final String CAPTURED_IMAGES_ALBUM_NAME = "captured_images";
-    public static final String CAPTURED_IMAGES_DIR = Environment.getExternalStoragePublicDirectory(CAPTURED_IMAGES_ALBUM_NAME).getAbsolutePath();
+    public static final String CAPTURED_IMAGES_ALBUM_NAME = "Captured";
+    public static final String CAPTURED_IMAGES_DIR = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath();
     private static final int REQUEST_PORTRAIT_RFC = 1337;
-    private static final int REQUEST_PORTRAIT_FFC = REQUEST_PORTRAIT_RFC + 1;
+    public static final int REQUEST_PORTRAIT_FFC = REQUEST_PORTRAIT_RFC + 1;
     public static ArrayList<ImageEntry> sCheckedImages = new ArrayList<>();
-
     private boolean mShouldShowUp = false;
-
-    private com.melnykov.fab.FloatingActionButton mDoneFab;
-    private Picker mPickOptions;
+    private FloatingActionButton mDoneFab;
+    public static Picker mPickOptions;
     //For ViewPager
     private ImageEntry mCurrentlyDisplayedImage;
     private AlbumEntry mSelectedAlbum;
     private MenuItem mSelectAllMenuItem;
     private MenuItem mDeselectAllMenuItem;
+    Toolbar toolbar;
 
-    private Toolbar mToolbar;
 
-    //TODO Add animation
-    //TODO Fix bugs with changing orientation
     //TODO Add support for gif
     //TODO Use robust method for capturing photos
     //TODO Add support for picking videos
     //TODO When photo is captured a new album created for it
 
+    @Subscribe(sticky = true)
+    public void onEvent(Events.OnPublishPickOptionsEvent event) {
+        if (mPickOptions == null)
+            mPickOptions = event.options;
+    }
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(LocaleHelper.onAttach(newBase));
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        mPickOptions = (EventBus.getDefault().getStickyEvent(Events.OnPublishPickOptionsEvent.class)).options;
-        initTheme();
         super.onCreate(savedInstanceState);
+        if (mPickOptions == null) {
+            finish();
+            return;
+        }
         setContentView(R.layout.activity_pick);
+        initTheme();
+        toolbar = findViewById(R.id.album_toolbar);
         addToolbarToLayout();
         initActionbar(savedInstanceState);
         setupAlbums(savedInstanceState);
@@ -85,71 +114,65 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putString(KEY_ACTION_BAR_TITLE, getSupportActionBar().getTitle().toString());
+        if (getSupportActionBar() != null && getSupportActionBar().getTitle() != null)
+            outState.putString(KEY_ACTION_BAR_TITLE, getSupportActionBar().getTitle().toString());
         outState.putBoolean(KEY_SHOULD_SHOW_ACTIONBAR_UP, mShouldShowUp);
     }
 
     private void initTheme() {
         setTheme(mPickOptions.themeResId);
-        mToolbar = new Toolbar(new ContextThemeWrapper(mPickOptions.context, Util.getToolbarThemeResId(this)));
-        mToolbar.setPopupTheme(mPickOptions.popupThemeResId);
     }
 
     private void addToolbarToLayout() {
-        final AppBarLayout appBarLayout = (AppBarLayout) findViewById(R.id.app_bar_layout);
-
-        final AppBarLayout.LayoutParams toolbarParams = new AppBarLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, Util.getActionBarHeight(this));
-        toolbarParams.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS);
-
-        appBarLayout.addView(mToolbar, toolbarParams);
-
-        setSupportActionBar(mToolbar);
+        toolbar.setTitle("Chọn ảnh");
+        setSupportActionBar(toolbar);
+        toolbar.setNavigationIcon(R.mipmap.ic_back);
+        toolbar.setNavigationOnClickListener(v -> onBackPressed());
     }
 
 
     @Override
-    protected void onStart() {
-        EventBus.getDefault().register(this);
-        super.onStart();
-
-    }
-
-    @Override
-    protected void onStop() {
-        EventBus.getDefault().unregister(this);
-        super.onStop();
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        Fragment fragment = getSupportFragmentManager().findFragmentByTag(AlbumsFragment.TAG);
+        if (fragment instanceof AlbumsFragment) {
+            ((AlbumsFragment) fragment).setupRecycler();
+        } else {
+            fragment = getSupportFragmentManager().findFragmentByTag(ImagesThumbnailFragment.TAG);
+            if (fragment instanceof ImagesThumbnailFragment) {
+                ((ImagesThumbnailFragment) fragment).setupRecycler();
+            }
+        }
+        super.onConfigurationChanged(newConfig);
     }
 
-
     private void initActionbar(final Bundle savedInstanceState) {
-
-
         if (savedInstanceState == null) {
             mShouldShowUp = mPickOptions.backBtnInMainActivity;
-            getSupportActionBar().setDisplayHomeAsUpEnabled(mPickOptions.backBtnInMainActivity);
-            getSupportActionBar().setTitle(R.string.albums_title);
+            if (getSupportActionBar() != null) {
+                getSupportActionBar().setDisplayHomeAsUpEnabled(mPickOptions.backBtnInMainActivity);
+                getSupportActionBar().setTitle(R.string.albums_title);
+            }
         } else {
             mShouldShowUp = savedInstanceState.getBoolean(KEY_SHOULD_SHOW_ACTIONBAR_UP);
-            getSupportActionBar().setDisplayHomeAsUpEnabled(mShouldShowUp && mPickOptions.backBtnInMainActivity);
-            getSupportActionBar().setTitle(savedInstanceState.getString(KEY_ACTION_BAR_TITLE));
-
-
+            if (getSupportActionBar() != null) {
+                getSupportActionBar().setDisplayHomeAsUpEnabled(mShouldShowUp && mPickOptions.backBtnInMainActivity);
+                getSupportActionBar().setTitle(savedInstanceState.getString(KEY_ACTION_BAR_TITLE));
+            }
         }
-
-
     }
 
     public void initFab() {
-        Drawable doneIcon = ContextCompat.getDrawable(this, R.drawable.ic_action_done_white);
-        doneIcon = DrawableCompat.wrap(doneIcon);
-        DrawableCompat.setTint(doneIcon, mPickOptions.doneFabIconTintColor);
-
-        mDoneFab = (com.melnykov.fab.FloatingActionButton) findViewById(R.id.fab_done);
+        Drawable doneIcon = AppCompatResources.getDrawable(this, R.drawable.ic_action_done_white);
+        if (doneIcon != null) {
+            doneIcon = DrawableCompat.wrap(doneIcon);
+            DrawableCompat.setTint(doneIcon, mPickOptions.doneFabIconTintColor);
+        }
+        mDoneFab = findViewById(R.id.fab_done);
         mDoneFab.setImageDrawable(doneIcon);
-        mDoneFab.setColorNormal(mPickOptions.fabBackgroundColor);
-        mDoneFab.setColorPressed(mPickOptions.fabBackgroundColorWhenPressed);
+        mDoneFab.setBackgroundTintList(ColorStateList.valueOf(mPickOptions.fabBackgroundColor));
+        mDoneFab.setRippleColor(mPickOptions.fabBackgroundColorWhenPressed);
 
         EventBus.getDefault().postSticky(new Events.OnAttachFabEvent(mDoneFab));
 
@@ -158,64 +181,114 @@ public void initFab() {
 
     public void setupAlbums(Bundle savedInstanceState) {
         if (findViewById(R.id.fragment_container) != null) {
-
             if (savedInstanceState == null) {
-
+                AlbumsFragment albumsFragment = new AlbumsFragment();
+                albumsFragment.setmPickOptions(mPickOptions);
                 getSupportFragmentManager().beginTransaction()
-                        .add(R.id.fragment_container, new AlbumsFragment(), AlbumsFragment.TAG)
+                        .setCustomAnimations(R.anim.slide_up_enter,
+                                R.anim.slide_left_exit,
+                                R.anim.slide_down_enter,
+                                R.anim.slide_right_exit)
+                        .add(R.id.fragment_container, albumsFragment, AlbumsFragment.TAG)
                         .commit();
-
-
             }
         }
     }
 
 
     public void updateFab() {
-
         if (mPickOptions.pickMode == Picker.PickMode.SINGLE_IMAGE) {
-            mDoneFab.setVisibility(View.GONE);
             mDoneFab.hide();
             return;
         }
-
-
         if (sCheckedImages.size() == 0) {
-            mDoneFab.setVisibility(View.GONE);
-
+            mDoneFab.hide();
         } else if (sCheckedImages.size() == mPickOptions.limit) {
-
             //Might change FAB appearance on other version
-            mDoneFab.setVisibility(View.VISIBLE);
             mDoneFab.show();
             mDoneFab.bringToFront();
-
         } else {
-            mDoneFab.setVisibility(View.VISIBLE);
             mDoneFab.show();
             mDoneFab.bringToFront();
-
-
         }
-
     }
 
     public void onClickDone(View view) {
-
         if (mPickOptions.pickMode == Picker.PickMode.SINGLE_IMAGE) {
 
             sCheckedImages.add(mCurrentlyDisplayedImage);
             mCurrentlyDisplayedImage.isPicked = true;
-        } else {
-            //No need to modify sCheckedImages for Multiple images mode
         }
+        //Don't need to modify sCheckedImages for Multiple images mode
 
-        super.finish();
 
         //New object because sCheckedImages will get cleared
-        mPickOptions.pickListener.onPickedSuccessfully(new ArrayList<>(sCheckedImages));
-        sCheckedImages.clear();
-        EventBus.getDefault().removeAllStickyEvents();
+        if (sCheckedImages == null || sCheckedImages.isEmpty()) {
+            super.finish();
+            onCancel();
+        } else {
+            if (mPickOptions.shouldShowItemAfterPick) {
+                if (mPickOptions.pickMode == Picker.PickMode.SINGLE_IMAGE) {
+                    Uri destinationUri = Uri.fromFile(new File(this.getCacheDir(), "IMG_" + System.currentTimeMillis()));
+
+                    UCrop builder = UCrop.of(mCurrentlyDisplayedImage.getUri(), destinationUri);
+                    if (mPickOptions != null && mPickOptions.aspectRatioY != -1 && mPickOptions.aspectRatioY != -1)
+                        builder.withAspectRatio(mPickOptions.aspectRatioX, mPickOptions.aspectRatioY);
+                    builder.start(this);
+//                    super.finish();
+                } else {
+                    EventBus.getDefault().postSticky(new Events.OnPublishPickOptionsEvent(mPickOptions));
+                    EventBus.getDefault().postSticky(new Events.OnImagePreviewEvent(sCheckedImages));
+                    Intent intent = new Intent(this, ImagePreviewActivity.class);
+                    startActivityForResult(intent, ImagePreviewActivity.REQUEST_PREVIEW);
+                }
+            } else {
+                super.finish();
+                mPickOptions.pickListener.onPickedSuccessfully(new ArrayList<>(sCheckedImages));
+                sCheckedImages.clear();
+                EventBus.getDefault().removeAllStickyEvents();
+            }
+        }
+    }
+
+    @Subscribe
+    public void onEvent(Events.OnPublishPreview e) {
+        // Log.d(getClass().getSimpleName(), "onEvent() called with: e = [" + e.imageEntries.get(0).getDescription() + "]");
+        sCheckedImages = e.imageEntries;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_PORTRAIT_FFC) {
+            if (resultCode == RESULT_OK) {
+                //For capturing image from camera
+                if (captureImageFile != null)
+                    refreshMediaScanner(captureImageFile.getPath());
+            }
+        } else if (requestCode == UCrop.REQUEST_CROP) {
+            if (resultCode == RESULT_OK) {
+                final Uri resultUri = UCrop.getOutput(data);
+                ImageEntry imageEntry = ImageEntry.from(resultUri);
+                List<ImageEntry> imageEntries = new ArrayList<>();
+                imageEntries.add(imageEntry);
+                super.finish();
+                mPickOptions.pickListener.onPickedSuccessfully(new ArrayList<>(imageEntries));
+                sCheckedImages.clear();
+                EventBus.getDefault().removeAllStickyEvents();
+            } else if (resultCode == UCrop.RESULT_ERROR) {
+                final Throwable cropError = UCrop.getError(data);
+            }
+        } else if (requestCode == ImagePreviewActivity.REQUEST_PREVIEW) {
+            if (resultCode == RESULT_OK) {
+                super.finish();
+                mPickOptions.pickListener.onPickedSuccessfully(new ArrayList<>(sCheckedImages));
+                sCheckedImages.clear();
+                EventBus.getDefault().removeAllStickyEvents();
+            } else {
+
+            }
+        }
 
     }
 
@@ -223,89 +296,99 @@ public void onCancel() {
         mPickOptions.pickListener.onCancel();
         sCheckedImages.clear();
         EventBus.getDefault().removeAllStickyEvents();
-
-
     }
 
     public void startCamera() {
-
         if (!CameraSupport.isEnabled()) {
             return;
         }
 
-        if(!mPickOptions.videosEnabled){
+        if (!mPickOptions.videosEnabled) {
             capturePhoto();
             return;
         }
 
-
         new AlertDialog.Builder(this).setTitle(R.string.dialog_choose_camera_title)
-                .setItems(new String[]{getResources().getString(R.string.dialog_choose_camera_item_0), getResources().getString(R.string.dialog_choose_camera_item_1)}, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (which == 0) {
-                            capturePhoto();
-                        } else {
-                            captureVideo();
+                .setItems(new String[]{getResources().getString(R.string.dialog_choose_camera_item_0), getResources().getString(R.string.dialog_choose_camera_item_1)}, (dialog, which) -> {
+                            if (which == 0) {
+                                capturePhoto();
+                            } else {
+                                captureVideo();
+                            }
                         }
-                    }
-                })
+                )
                 .setNegativeButton(android.R.string.cancel, null)
                 .show();
+    }
 
+    public static final int MY_CAMERA_PERMISSION_CODE = 100;
+    File captureImageFile;
+    public static String[] PERMISSIONS_STORAGE = {
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
+    };
+    public static final int REQUEST_EXTERNAL_STORAGE = 1;
+
+    public static boolean verifyStoragePermissions(Activity activity) {
+        if (activity == null) return false;
+        int permission = ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        int permission1 = ActivityCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE);
+        if (permission != PackageManager.PERMISSION_GRANTED || permission1 != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(
+                    activity,
+                    PERMISSIONS_STORAGE,
+                    REQUEST_EXTERNAL_STORAGE
+            );
+            return false;
+        } else return true;
     }
 
     public void capturePhoto() {
-        final File captureImageFile = createTemporaryFileForCapturing(".png");
-        CameraSupport.startPhotoCaptureActivity(this, captureImageFile, REQUEST_PORTRAIT_FFC);
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
+                != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA},
+                    MY_CAMERA_PERMISSION_CODE);
+        } else {
+            StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
+            StrictMode.setVmPolicy(builder.build());
+            captureImageFile = createTemporaryFileForCapturing(".png");
+            Intent i = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+            i.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(captureImageFile));
+            startActivityForResult(i, REQUEST_PORTRAIT_FFC);
+        }
     }
 
-    private File createTemporaryFileForCapturing(final String extension) {
-        final File captureTempFile = new File(CAPTURED_IMAGES_DIR + "/tmp" + System.currentTimeMillis() + extension);
+    public static File createTemporaryFileForCapturing(final String extension) {
+        final File captureTempFile = new File(CAPTURED_IMAGES_DIR
+                + "/IMG_"
+                + new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(System.currentTimeMillis())
+                + extension);
         try {
             captureTempFile.createNewFile();
         } catch (IOException e) {
             e.printStackTrace();
             Log.e("capture", e.getMessage());
         }
-
         return captureTempFile;
     }
 
+    private void logException(Throwable e) {
+        if (BuildConfig.DEBUG) e.printStackTrace();
+    }
+
     public void captureVideo() {
         final File captureVideoFile = createTemporaryFileForCapturing(".mp4");
         CameraSupport.startVideoCaptureActivity(this,
                 captureVideoFile, mPickOptions.videoLengthLimit, REQUEST_PORTRAIT_FFC);
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-        if (resultCode == RESULT_OK && requestCode == REQUEST_PORTRAIT_FFC) {
-            //For capturing image from camera
-            refreshMediaScanner(data.getData().getPath());
-
-        } else {
-            Log.i("onActivityResult", "User canceled the camera activity");
-        }
-    }
 
     private void refreshMediaScanner(final String imagePath) {
         MediaScannerConnection.scanFile(this,
                 new String[]{imagePath}, null,
-                new MediaScannerConnection.OnScanCompletedListener() {
-                    @Override
-                    public void onScanCompleted(String path, Uri uri) {
-
-                        PickerActivity.this.runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                reloadAlbums();
-                            }
-                        });
-
-
-                        Log.d("onActivityResult", "New image should appear in camera folder");
-                    }
+                (path, uri) -> {
+                    PickerActivity.this.runOnUiThread(this::reloadAlbums);
+                    // Log.d("onActivityResult", "New image should appear in camera folder");
                 });
     }
 
@@ -316,17 +399,12 @@ private void reloadAlbums() {
             getSupportFragmentManager().popBackStackImmediate(ImagesThumbnailFragment.TAG, 0);
             getSupportFragmentManager().popBackStackImmediate();
         }
-
         EventBus.getDefault().post(new Events.OnReloadAlbumsEvent());
-
-
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
-
-
         if (mPickOptions.shouldShowCaptureMenuItem) {
             initCaptureMenuItem(menu);
         }
@@ -335,8 +413,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_deselect_all, menu);
 
 
-
-
         mSelectAllMenuItem = menu.findItem(R.id.action_select_all);
         mDeselectAllMenuItem = menu.findItem(R.id.action_deselect_all);
 
@@ -352,7 +428,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
             hideSelectAll();
         }
 
-
         return true;
     }
 
@@ -364,11 +439,9 @@ private boolean shouldShowSelectAll() {
     private void initCaptureMenuItem(final Menu menu) {
         if (CameraSupport.isEnabled()) {
             getMenuInflater().inflate(R.menu.menu_take_photo, menu);
-            Drawable captureIconDrawable = ContextCompat.getDrawable(this, R.drawable.ic_action_camera_white);
+            Drawable captureIconDrawable = AppCompatResources.getDrawable(this, R.drawable.ic_action_camera_white);
             captureIconDrawable = DrawableCompat.wrap(captureIconDrawable);
-
             DrawableCompat.setTint(captureIconDrawable, mPickOptions.captureItemIconTintColor);
-
             menu.findItem(R.id.action_take_photo).setIcon(captureIconDrawable);
         }
     }
@@ -392,56 +465,41 @@ private void showDeselectAll() {
     public boolean onOptionsItemSelected(MenuItem item) {
         // Handle action bar item clicks here. The action bar will
         // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-
-
+        // as you specify a parent activity_album in AndroidManifest.xml.
         final int itemId = item.getItemId();
-
-
         if (itemId == R.id.action_take_photo) {
             startCamera();
-
         } else if (itemId == R.id.action_select_all) {
             selectAllImages();
 
         } else if (itemId == R.id.action_deselect_all) {
             deselectAllImages();
         }
-
         return super.onOptionsItemSelected(item);
     }
 
     private void deselectAllImages() {
-
         for (final ImageEntry imageEntry : mSelectedAlbum.imageList) {
             imageEntry.isPicked = false;
             sCheckedImages.remove(imageEntry);
         }
-
         EventBus.getDefault().post(new Events.OnUpdateImagesThumbnailEvent());
-
         hideDeselectAll();
         updateFab();
-
     }
 
     private void selectAllImages() {
-
         if (mSelectedAlbum == null) {
             mSelectedAlbum = EventBus.getDefault().getStickyEvent(Events.OnClickAlbumEvent.class).albumEntry;
         }
-
         if (sCheckedImages.size() < mPickOptions.limit || mPickOptions.limit == NO_LIMIT) {
-
             for (final ImageEntry imageEntry : mSelectedAlbum.imageList) {
-
                 if (mPickOptions.limit != NO_LIMIT && sCheckedImages.size() + 1 > mPickOptions.limit) {
                     //Hit the limit
                     Toast.makeText(this, R.string.you_cant_check_more_images, Toast.LENGTH_SHORT).show();
                     break;
                 }
 
-
                 if (!imageEntry.isPicked) {
                     //To avoid repeated images
                     sCheckedImages.add(imageEntry);
@@ -455,14 +513,11 @@ private void selectAllImages() {
         if (shouldShowDeselectAll()) {
             showDeselectAll();
         }
-
-
     }
 
 
     @Override
     public void onBackPressed() {
-
         if (isImagesThumbnailShown()) {
             //Return to albums fragment
             getSupportFragmentManager().popBackStack();
@@ -478,7 +533,7 @@ public void onBackPressed() {
             if (mSelectedAlbum == null) {
                 mSelectedAlbum = EventBus.getDefault().getStickyEvent(Events.OnClickAlbumEvent.class).albumEntry;
             }
-            mDoneFab.setVisibility(View.GONE);
+            mDoneFab.hide();
             getSupportFragmentManager().popBackStack(ImagesThumbnailFragment.TAG, 0);
             getSupportActionBar().setTitle(mSelectedAlbum.name);
             getSupportActionBar().show();
@@ -530,7 +585,6 @@ private void showSelectAll() {
     }
 
     private void handleMultipleModeAddition(final ImageEntry imageEntry) {
-
         if (mPickOptions.pickMode != Picker.PickMode.MULTIPLE_IMAGES) {
             return;
         }
@@ -539,14 +593,13 @@ private void handleMultipleModeAddition(final ImageEntry imageEntry) {
             imageEntry.isPicked = true;
             sCheckedImages.add(imageEntry);
         } else {
-            Toast.makeText(this, R.string.you_cant_check_more_images, Toast.LENGTH_SHORT).show();
+
+            Toast.makeText(this, String.format(Locale.getDefault(), getString(R.string.can_choose_d_image), mPickOptions.limit), Toast.LENGTH_SHORT).show();
             Log.i("onPickImage", "You can't check more images");
         }
-
     }
 
     private boolean shouldShowDeselectAll() {
-
         if (mSelectedAlbum == null) {
             return false;
         }
@@ -567,47 +620,49 @@ private boolean shouldShowDeselectAll() {
 
     private void handleToolbarVisibility(final boolean show) {
 
-        final AppBarLayout appBarLayout = (AppBarLayout) mToolbar.getParent();
+        final AppBarLayout appBarLayout = (AppBarLayout) toolbar.getParent();
         final CoordinatorLayout rootLayout = (CoordinatorLayout) appBarLayout.getParent();
 
         final CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
         final AppBarLayout.Behavior behavior = (AppBarLayout.Behavior) params.getBehavior();
+        if (behavior != null)
+            if (show) {
+                //Show appBar
+                behavior.setTopAndBottomOffset(0);
+                behavior.onNestedPreScroll(rootLayout, appBarLayout, null, 0, 1, new int[2]);
 
-        if (show) {
-            //Show appBar
-            behavior.setTopAndBottomOffset(0);
-            behavior.onNestedPreScroll(rootLayout, appBarLayout, null, 0, 1, new int[2]);
-
-        } else {
-            //Hide appBar
-            behavior.onNestedFling(rootLayout, appBarLayout, null, 0, 10000, true);
-        }
+            } else {
+                //Hide appBar
+                behavior.onNestedFling(rootLayout, appBarLayout, null, 0, 10000, true);
+            }
 
     }
 
 
-
+    @Subscribe(sticky = true)
     public void onEvent(final Events.OnClickAlbumEvent albumEvent) {
         mSelectedAlbum = albumEvent.albumEntry;
 
 
-        final ImagesThumbnailFragment imagesThumbnailFragment;
-
-
-        if (getSupportFragmentManager().findFragmentByTag(ImagesThumbnailFragment.TAG) != null) {
-            imagesThumbnailFragment = (ImagesThumbnailFragment) getSupportFragmentManager().findFragmentByTag(ImagesThumbnailFragment.TAG);
-        } else {
+        ImagesThumbnailFragment imagesThumbnailFragment = (ImagesThumbnailFragment) getSupportFragmentManager().findFragmentByTag(ImagesThumbnailFragment.TAG);
+        if (imagesThumbnailFragment == null) {
             imagesThumbnailFragment = new ImagesThumbnailFragment();
         }
+        imagesThumbnailFragment.setmPickOptions(mPickOptions);
 
         getSupportFragmentManager().beginTransaction()
+                .setCustomAnimations(R.anim.slide_up_enter,
+                        R.anim.slide_left_exit,
+                        R.anim.slide_down_enter,
+                        R.anim.slide_right_exit)
                 .replace(R.id.fragment_container, imagesThumbnailFragment, ImagesThumbnailFragment.TAG)
                 .addToBackStack(ImagesThumbnailFragment.TAG)
                 .commit();
-
-        getSupportActionBar().setTitle(albumEvent.albumEntry.name);
-        mShouldShowUp = true;
-        getSupportActionBar().setDisplayHomeAsUpEnabled(mShouldShowUp);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setTitle(albumEvent.albumEntry.name);
+            mShouldShowUp = true;
+            getSupportActionBar().setDisplayHomeAsUpEnabled(mShouldShowUp);
+        }
         showSelectAll();
 
         if (shouldShowDeselectAll()) {
@@ -620,6 +675,7 @@ public void onEvent(final Events.OnClickAlbumEvent albumEvent) {
     }
 
 
+    @Subscribe(sticky = true)
     public void onEvent(final Events.OnPickImageEvent pickImageEvent) {
         if (mPickOptions.videosEnabled && mPickOptions.videoLengthLimit > 0 && pickImageEvent.imageEntry.isVideo) {
             // Check to see if the selected video is too long in length
@@ -638,32 +694,23 @@ public void onEvent(final Events.OnPickImageEvent pickImageEvent) {
 
         } else if (mPickOptions.pickMode == Picker.PickMode.SINGLE_IMAGE) {
             //Single image pick mode
-
-
-            final ImagesPagerFragment pagerFragment;
-
-            if (getSupportFragmentManager().findFragmentByTag(ImagesPagerFragment.TAG) != null) {
-
-                pagerFragment = (ImagesPagerFragment) getSupportFragmentManager().findFragmentByTag(ImagesPagerFragment.TAG);
-            } else {
+            ImagesPagerFragment pagerFragment = (ImagesPagerFragment) getSupportFragmentManager().findFragmentByTag(ImagesPagerFragment.TAG);
+            if (pagerFragment == null)
                 pagerFragment = new ImagesPagerFragment();
-            }
-
-
             getSupportFragmentManager().beginTransaction()
+                    .setCustomAnimations(R.anim.slide_up_enter,
+                            R.anim.slide_left_exit,
+                            R.anim.slide_down_enter,
+                            R.anim.slide_right_exit)
                     .replace(R.id.fragment_container, pagerFragment, ImagesPagerFragment.TAG)
                     .addToBackStack(ImagesPagerFragment.TAG)
                     .commit();
-
-
         }
-
-
         updateFab();
-
     }
 
 
+    @Subscribe
     public void onEvent(final Events.OnUnpickImageEvent unpickImageEvent) {
         sCheckedImages.remove(unpickImageEvent.imageEntry);
         unpickImageEvent.imageEntry.isPicked = false;
@@ -672,21 +719,22 @@ public void onEvent(final Events.OnUnpickImageEvent unpickImageEvent) {
         hideDeselectAll();
     }
 
+    @Subscribe
     public void onEvent(final Events.OnChangingDisplayedImageEvent newImageEvent) {
         mCurrentlyDisplayedImage = newImageEvent.currentImage;
 
     }
 
+    @Subscribe
     public void onEvent(final Events.OnShowingToolbarEvent showingToolbarEvent) {
         handleToolbarVisibility(true);
     }
 
 
+    @Subscribe
     public void onEvent(final Events.OnHidingToolbarEvent hidingToolbarEvent) {
         handleToolbarVisibility(false);
     }
 
 
-
-
 }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SpacesItemDecoration.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SpacesItemDecoration.java
index c08961e..6c698b7 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SpacesItemDecoration.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SpacesItemDecoration.java
@@ -1,11 +1,13 @@
 package net.yazeed44.imagepicker.ui;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**
- * Created by yazeed44 on 7/15/15.
+ * Created by yazeed44
+ * on 7/15/15.
  */
 public class SpacesItemDecoration extends RecyclerView.ItemDecoration {
 
@@ -16,7 +18,7 @@ public SpacesItemDecoration(final int space) {
     }
 
     @Override
-    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+    public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
         outRect.left = mSpace;
         outRect.right = mSpace;
         outRect.bottom = mSpace;
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SquareFrameLayout.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SquareFrameLayout.java
index 3a4d42b..a1e6fa9 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SquareFrameLayout.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SquareFrameLayout.java
@@ -5,7 +5,8 @@
 import android.widget.FrameLayout;
 
 /**
- * Created by yazeed44 on 6/16/15.
+ * Created by yazeed44
+ * on 6/16/15.
  */
 public class SquareFrameLayout extends FrameLayout {
 
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/AlbumsAdapter.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsAdapter.java
similarity index 61%
rename from imagepicker/src/main/java/net/yazeed44/imagepicker/ui/AlbumsAdapter.java
rename to imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsAdapter.java
index 844e0cd..443f993 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/AlbumsAdapter.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsAdapter.java
@@ -1,7 +1,6 @@
-package net.yazeed44.imagepicker.ui;
+package net.yazeed44.imagepicker.ui.album;
 
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,45 +9,54 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import net.yazeed44.imagepicker.library.R;
-import net.yazeed44.imagepicker.model.AlbumEntry;
-import net.yazeed44.imagepicker.util.Events;
+import net.yazeed44.imagepicker.data.model.AlbumEntry;
+import net.yazeed44.imagepicker.data.Events;
 import net.yazeed44.imagepicker.util.Picker;
 import net.yazeed44.imagepicker.util.Util;
 
-import java.util.ArrayList;
+import org.greenrobot.eventbus.EventBus;
 
-import de.greenrobot.event.EventBus;
+import java.util.ArrayList;
 
 /**
- * Created by yazeed44 on 11/22/14.
+ * Created by yazeed44
+ * on 11/22/14.
  */
 public class AlbumsAdapter extends RecyclerView.Adapter<AlbumsAdapter.AlbumViewHolder> implements Util.OnClickAlbum {
 
-    public final RecyclerView mRecycler;
-    protected final ArrayList<AlbumEntry> mAlbumList;
-    protected final Picker mPickOptions;
+    private final RecyclerView mRecycler;
+    private final ArrayList<AlbumEntry> mAlbumList;
+    private final Picker mPickOptions;
     private final Fragment mFragment;
 
-    public AlbumsAdapter(final Fragment fragment, final ArrayList<AlbumEntry> albums, final RecyclerView recyclerView) {
+    public AlbumsAdapter(final Fragment fragment, final ArrayList<AlbumEntry> albums, final RecyclerView recyclerView, Picker mPickOptions) {
         mFragment = fragment;
         this.mAlbumList = albums;
+        this.mPickOptions = mPickOptions;
         this.mRecycler = recyclerView;
-        mPickOptions = EventBus.getDefault().getStickyEvent(Events.OnPublishPickOptionsEvent.class).options;
+//        Events.OnPublishPickOptionsEvent event = EventBus.getDefault().getStickyEvent(Events.OnPublishPickOptionsEvent.class);
+//        mPickOptions = event.options;
     }
 
 
+    @NonNull
     @Override
-    public AlbumViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    public AlbumViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         final View layout = LayoutInflater.from(mRecycler.getContext()).inflate(R.layout.element_album, parent, false);
 
         return new AlbumViewHolder(layout, this);
     }
 
     @Override
-    public void onBindViewHolder(AlbumViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull AlbumViewHolder holder, int position) {
         final AlbumEntry albumEntry = mAlbumList.get(position);
         setHeight(holder.itemView);
         setupAlbum(holder, albumEntry);
@@ -62,6 +70,7 @@ public int getItemCount() {
 
     @Override
     public void onClickAlbum(View layout) {
+        // Log.d(getClass().getSimpleName(), "onClickAlbum() called with: layout = [" + layout + "]");
         final int position = mRecycler.getChildAdapterPosition(layout);
         final AlbumEntry album = mAlbumList.get(position);
 
@@ -87,14 +96,14 @@ public void setupAlbum(final AlbumViewHolder holder, final AlbumEntry album) {
 
 
         holder.name.setText(album.name);
-        holder.count.setText(album.imageList.size() + "");
+        holder.count.setText(String.valueOf(album.imageList.size()));
 
         holder.detailsLayout.setBackgroundColor(mPickOptions.albumBackgroundColor);
 
         Glide.with(mFragment)
-                .load(album.coverImage.path)
                 .asBitmap()
-                .centerCrop()
+                .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
+                .load(album.coverImage.path)
                 .into(holder.thumbnail);
 
     }
@@ -109,16 +118,14 @@ static class AlbumViewHolder extends RecyclerView.ViewHolder {
         public AlbumViewHolder(final View itemView, final Util.OnClickAlbum listener) {
             super(itemView);
 
-            thumbnail = (ImageView) itemView.findViewById(R.id.album_thumbnail);
-            count = (TextView) itemView.findViewById(R.id.album_count);
-            name = (TextView) itemView.findViewById(R.id.album_name);
-            detailsLayout = (RelativeLayout) itemView.findViewById(R.id.album_detail_layout);
+            thumbnail = itemView.findViewById(R.id.album_thumbnail);
+            count = itemView.findViewById(R.id.album_count);
+            name = itemView.findViewById(R.id.album_name);
+            detailsLayout = itemView.findViewById(R.id.album_detail_layout);
 
-            itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    listener.onClickAlbum(itemView);
-                }
+            itemView.setOnClickListener(v -> {
+                if (getAdapterPosition() < 0) return;
+                listener.onClickAlbum(itemView);
             });
 
         }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/AlbumsFragment.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsFragment.java
similarity index 73%
rename from imagepicker/src/main/java/net/yazeed44/imagepicker/ui/AlbumsFragment.java
rename to imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsFragment.java
index 523f15c..8ed26af 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/AlbumsFragment.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsFragment.java
@@ -1,36 +1,40 @@
-package net.yazeed44.imagepicker.ui;
+package net.yazeed44.imagepicker.ui.album;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.octo.android.robospice.SpiceManager;
 import com.octo.android.robospice.persistence.exception.SpiceException;
 import com.octo.android.robospice.request.listener.RequestListener;
 
 import net.yazeed44.imagepicker.library.R;
-import net.yazeed44.imagepicker.model.AlbumEntry;
-import net.yazeed44.imagepicker.util.Events;
+import net.yazeed44.imagepicker.data.model.AlbumEntry;
+import net.yazeed44.imagepicker.data.model.ImageEntry;
+import net.yazeed44.imagepicker.data.Events;
+import net.yazeed44.imagepicker.ui.PickerActivity;
 import net.yazeed44.imagepicker.util.LoadingAlbumsRequest;
 import net.yazeed44.imagepicker.util.OfflineSpiceService;
 import net.yazeed44.imagepicker.util.Picker;
 import net.yazeed44.imagepicker.util.Util;
 
-import java.util.ArrayList;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 
-import de.greenrobot.event.EventBus;
+import java.util.ArrayList;
 
 
 /**
- * Created by yazeed44 on 11/22/14.
+ * Created by yazeed44
+ * on 11/22/14.
  */
-public class AlbumsFragment extends Fragment implements RequestListener<ArrayList> {
+public class AlbumsFragment extends Fragment implements RequestListener<ArrayList<AlbumEntry>> {
     public static final String TAG = AlbumsFragment.class.getSimpleName();
     protected RecyclerView mAlbumsRecycler;
     protected SpiceManager mSpiceManager = new SpiceManager(OfflineSpiceService.class);
@@ -38,9 +42,12 @@ public class AlbumsFragment extends Fragment implements RequestListener<ArrayLis
     protected Picker mPickOptions;
     protected boolean mShouldPerformClickOnCapturedAlbum = false;
 
+    public void setmPickOptions(Picker mPickOptions) {
+        this.mPickOptions = mPickOptions;
+    }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         mAlbumsRecycler = (RecyclerView) inflater.inflate(R.layout.fragment_album_browse, container, false);
 
@@ -83,18 +90,18 @@ public void onStop() {
 
     @Override
     public void onRequestFailure(SpiceException spiceException) {
-        Log.e(TAG, spiceException.getMessage());
+
 
     }
 
     @Override
-    public void onRequestSuccess(final ArrayList albumEntries) {
+    public void onRequestSuccess(final ArrayList<AlbumEntry> albumEntries) {
 
         if (hasLoadedSuccessfully(albumEntries)) {
             mAlbumList = albumEntries;
 
-            final AlbumsAdapter albumsAdapter = new AlbumsAdapter(this, albumEntries, mAlbumsRecycler);
-            mAlbumsRecycler.setAdapter(albumsAdapter);
+            final AlbumsAdapter albumsAdapter = new AlbumsAdapter(this, albumEntries, mAlbumsRecycler, mPickOptions);
+            if (mAlbumsRecycler != null) mAlbumsRecycler.setAdapter(albumsAdapter);
 
             EventBus.getDefault().postSticky(new Events.OnAlbumsLoadedEvent(mAlbumList));
 
@@ -120,25 +127,20 @@ public void run() {
 
     }
 
-    protected void setupRecycler() {
-
+    public void setupRecycler() {
         mAlbumsRecycler.setHasFixedSize(true);
         final GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), getResources().getInteger(R.integer.num_columns_albums));
-        gridLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        gridLayoutManager.setOrientation(RecyclerView.VERTICAL);
 
         mAlbumsRecycler.setLayoutManager(gridLayoutManager);
-
-
     }
 
     public void setupAdapter() {
         if (mAlbumList == null) {
             final LoadingAlbumsRequest loadingRequest = new LoadingAlbumsRequest(getActivity(), mPickOptions);
-
             mSpiceManager.execute(loadingRequest, this);
         } else {
-
-            mAlbumsRecycler.setAdapter(new AlbumsAdapter(this, mAlbumList, mAlbumsRecycler));
+            mAlbumsRecycler.setAdapter(new AlbumsAdapter(this, mAlbumList, mAlbumsRecycler, mPickOptions));
         }
     }
 
@@ -146,6 +148,7 @@ private boolean hasLoadedSuccessfully(final ArrayList albumList) {
         return albumList != null && albumList.size() > 0;
     }
 
+    @Subscribe
     public void onEvent(final Events.OnReloadAlbumsEvent reloadAlbums) {
         mShouldPerformClickOnCapturedAlbum = true;
 
@@ -155,14 +158,17 @@ public void onEvent(final Events.OnReloadAlbumsEvent reloadAlbums) {
     }
 
     private void pickLatestCapturedImage() {
-            for (final AlbumEntry albumEntry : mAlbumList) {
-                if (albumEntry.name.equals(PickerActivity.CAPTURED_IMAGES_ALBUM_NAME)) {
-                    EventBus.getDefault().postSticky(new Events.OnPickImageEvent(Util.getAllPhotosAlbum(mAlbumList).imageList.get(0)));
-                    mAlbumsRecycler.getChildAt(mAlbumList.indexOf(albumEntry)).performClick();
+        for (final AlbumEntry albumEntry : mAlbumList) {
+            if (albumEntry.name.equals(PickerActivity.CAPTURED_IMAGES_ALBUM_NAME)) {
+                AlbumEntry image = Util.getAllPhotosAlbum(mAlbumList);
+                if (image != null) {
+                    ImageEntry imageEntry = image.imageList.get(0);
+                    EventBus.getDefault().postSticky(new Events.OnPickImageEvent(imageEntry));
                 }
+                if (mAlbumsRecycler.getChildAt(mAlbumList.indexOf(albumEntry)) != null)
+                    mAlbumsRecycler.getChildAt(mAlbumList.indexOf(albumEntry)).performClick();
             }
-
-
+        }
     }
 
 }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java
new file mode 100644
index 0000000..a350dea
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java
@@ -0,0 +1,117 @@
+package net.yazeed44.imagepicker.ui.imagePreview;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import net.yazeed44.imagepicker.data.Events;
+import net.yazeed44.imagepicker.data.model.ImageEntry;
+import net.yazeed44.imagepicker.library.R;
+import net.yazeed44.imagepicker.ui.SpacesItemDecoration;
+import net.yazeed44.imagepicker.util.LocaleHelper;
+import net.yazeed44.imagepicker.util.Picker;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+
+public class ImagePreviewActivity extends AppCompatActivity {
+    public static final int REQUEST_PREVIEW = 1120;
+    //        @Inject
+//    PhotoPresenter<PhotoView> presenter;
+    public static Picker mPickOptions;
+    Toolbar toolbar;
+    RecyclerView rvImages;
+    FloatingActionButton mDoneFab;
+    private ArrayList<ImageEntry> imageEntries = new ArrayList<>();
+    ImagePreviewAdapter imagePreviewAdapter;
+
+    @Subscribe(sticky = true)
+    public void onEvent(Events.OnPublishPickOptionsEvent event) {
+        if (mPickOptions == null)
+            mPickOptions = event.options;
+    }
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(LocaleHelper.onAttach(newBase));
+    }
+
+    @Subscribe(sticky = true)
+    public void onEvent(Events.OnImagePreviewEvent event) {
+        imageEntries = event.imageEntries;
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+//        getActivityComponent().inject(this);
+        setContentView(R.layout.activity_album_pick);
+//        setStatusBarColor(R.color.white);
+//        StatusBarUtil.setTranslucentForImageViewInFragment(this, 0, null);
+//        StatusBarUtil.setLightMode(this);
+        toolbar = findViewById(R.id.album_toolbar);
+        rvImages = findViewById(R.id.image_recycler);
+        mDoneFab = findViewById(R.id.fab_done);
+        toolbar.setTitle(R.string.add_description);
+        setSupportActionBar(toolbar);
+        toolbar.setNavigationIcon(R.mipmap.ic_back);
+        toolbar.setNavigationOnClickListener(v -> onBackPressed());
+
+        Drawable doneIcon = AppCompatResources.getDrawable(this, R.drawable.ic_action_done_white);
+        if (doneIcon != null) {
+            doneIcon = DrawableCompat.wrap(doneIcon);
+            DrawableCompat.setTint(doneIcon, mPickOptions.doneFabIconTintColor);
+        }
+        mDoneFab = findViewById(R.id.fab_done);
+        mDoneFab.setImageDrawable(doneIcon);
+        mDoneFab.setBackgroundTintList(ColorStateList.valueOf(mPickOptions.fabBackgroundColor));
+        mDoneFab.setRippleColor(mPickOptions.fabBackgroundColorWhenPressed);
+        mDoneFab.setOnClickListener(view -> onDoneClicked());
+
+//        presenter.onAttach(this);
+        rvImages.setHasFixedSize(true);
+        final GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 2);
+
+        gridLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+
+        rvImages.setLayoutManager(gridLayoutManager);
+        if (rvImages.getItemDecorationCount() <= 0)
+            rvImages.addItemDecoration(new SpacesItemDecoration(getResources().getDimensionPixelSize(R.dimen.image_spacing)));
+        imagePreviewAdapter = new ImagePreviewAdapter(imageEntries, rvImages, mPickOptions);
+        rvImages.setAdapter(imagePreviewAdapter);
+
+
+    }
+
+    boolean done = false;
+
+    void onDoneClicked() {
+        done = true;
+        EventBus.getDefault().post(new Events.OnPublishPreview(imagePreviewAdapter.getImages()));
+        onBackPressed();
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (!done) {
+            setResult(RESULT_CANCELED);
+        } else {
+            setResult(RESULT_OK);
+        }
+        super.onBackPressed();
+    }
+}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
new file mode 100644
index 0000000..34bb685
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
@@ -0,0 +1,171 @@
+package net.yazeed44.imagepicker.ui.imagePreview;
+
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import net.yazeed44.imagepicker.data.model.ImageEntry;
+import net.yazeed44.imagepicker.library.R;
+import net.yazeed44.imagepicker.util.Picker;
+
+import java.util.ArrayList;
+
+/**
+ * Created by yazeed44
+ * on 11/23/14.
+ */
+public class ImagePreviewAdapter extends RecyclerView.Adapter<ImagePreviewAdapter.ImageViewHolder> {
+
+
+    protected final ArrayList<ImageEntry> imageEntries;
+    protected final RecyclerView mRecyclerView;
+    protected final Picker mPickOptions;
+
+    protected final Drawable mCheckIcon;
+    protected final Drawable mVideoIcon;
+
+
+    public ImagePreviewAdapter(final ArrayList<ImageEntry> imageEntries, final RecyclerView recyclerView, Picker pickOptions) {
+        this.imageEntries = imageEntries;
+        this.mRecyclerView = recyclerView;
+        mPickOptions = pickOptions;
+
+        mCheckIcon = createCheckIcon();
+        mVideoIcon = createVideoIcon();
+    }
+
+    private Drawable createCheckIcon() {
+        Drawable checkIcon = AppCompatResources.getDrawable(mRecyclerView.getContext(), R.drawable.ic_action_done_white);
+        checkIcon = DrawableCompat.wrap(checkIcon);
+        DrawableCompat.setTint(checkIcon, mPickOptions.checkIconTintColor);
+        return checkIcon;
+    }
+
+    private Drawable createVideoIcon() {
+        if (!mPickOptions.videosEnabled) {
+            return null;
+        }
+        Drawable videoIcon = AppCompatResources.getDrawable(mRecyclerView.getContext(), R.drawable.ic_play_arrow);
+        videoIcon = DrawableCompat.wrap(videoIcon);
+        DrawableCompat.setTint(videoIcon, mPickOptions.videoIconTintColor);
+        return videoIcon;
+    }
+
+    @NonNull
+    @Override
+    public ImageViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+        final View imageLayout = LayoutInflater.from(mRecyclerView.getContext()).inflate(R.layout.element_image_preview, viewGroup, false);
+
+
+        return new ImageViewHolder(imageLayout);
+    }
+
+    @Override
+    public int getItemCount() {
+        return imageEntries == null ? 0 : imageEntries.size();
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ImageViewHolder imageViewHolder, int position) {
+        imageViewHolder.description.setTag(position);
+        final ImageEntry imageEntry = imageEntries.get(position);
+        setHeight(imageViewHolder.itemView);
+        displayThumbnail(imageViewHolder, imageEntry);
+        drawGrid(imageViewHolder, imageEntry);
+        imageViewHolder.description.setText(imageEntry.getDescription());
+
+    }
+
+
+    public void setHeight(final View convertView) {
+        final int height = mRecyclerView.getMeasuredWidth() / mRecyclerView.getResources().getInteger(R.integer.num_columns_images);
+        convertView.setLayoutParams(new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, height));
+    }
+
+    public void displayThumbnail(final ImageViewHolder holder, final ImageEntry photo) {
+        Glide.with(holder.itemView.getContext())
+                .asBitmap()
+                .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
+                .load(photo.path)
+                .into(holder.thumbnail);
+    }
+
+    public void drawGrid(final ImageViewHolder holder, final ImageEntry imageEntry) {
+
+
+        holder.videoIcon.setVisibility(View.GONE);
+        holder.itemView.setBackgroundColor(mPickOptions.imageBackgroundColor);
+        holder.thumbnail.setColorFilter(Color.TRANSPARENT);
+        holder.itemView.setPadding(0, 0, 0, 0);
+
+
+        if (imageEntry.isVideo) {
+            holder.thumbnail.setColorFilter(mPickOptions.videoThumbnailOverlayColor, PorterDuff.Mode.MULTIPLY);
+            holder.videoIcon.setImageDrawable(mVideoIcon);
+            holder.videoIcon.setVisibility(View.VISIBLE);
+        }
+
+    }
+
+    public ArrayList<ImageEntry> getImages() {
+        return imageEntries;
+    }
+
+
+    class ImageViewHolder extends RecyclerView.ViewHolder {
+        private final ImageView thumbnail;
+        private final ImageView videoIcon;
+        EditText description;
+
+        public ImageViewHolder(final View itemView) {
+            super(itemView);
+            description = itemView.findViewById(R.id.edt_des);
+
+            thumbnail = itemView.findViewById(R.id.image_thumbnail);
+            videoIcon = itemView.findViewById(R.id.image_video_icon);
+
+            itemView.setOnClickListener(v -> {
+                if (getAdapterPosition() < 0) return;
+            });
+            description.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+                }
+
+                @Override
+                public void afterTextChanged(Editable s) {
+
+                    if (description.getTag() != null) {
+                        int position = (int) description.getTag();
+                        if (position >= 0 && position < imageEntries.size())
+                            imageEntries.get(position).setDescription(s.toString());
+                    }
+                }
+            });
+
+
+        }
+    }
+}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagesThumbnailAdapter.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photo/ImagesThumbnailAdapter.java
similarity index 77%
rename from imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagesThumbnailAdapter.java
rename to imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photo/ImagesThumbnailAdapter.java
index cae7b02..b739c17 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagesThumbnailAdapter.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photo/ImagesThumbnailAdapter.java
@@ -1,31 +1,35 @@
-package net.yazeed44.imagepicker.ui;
+package net.yazeed44.imagepicker.ui.photo;
 
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
+import net.yazeed44.imagepicker.data.Events;
+import net.yazeed44.imagepicker.data.model.AlbumEntry;
+import net.yazeed44.imagepicker.data.model.ImageEntry;
 import net.yazeed44.imagepicker.library.R;
-import net.yazeed44.imagepicker.model.AlbumEntry;
-import net.yazeed44.imagepicker.model.ImageEntry;
-import net.yazeed44.imagepicker.util.Events;
 import net.yazeed44.imagepicker.util.Picker;
 import net.yazeed44.imagepicker.util.Util;
 
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
 
 /**
- * Created by yazeed44 on 11/23/14.
+ * Created by yazeed44
+ * on 11/23/14.
  */
 public class ImagesThumbnailAdapter extends RecyclerView.Adapter<ImagesThumbnailAdapter.ImageViewHolder> implements Util.OnClickImage {
 
@@ -50,7 +54,7 @@ public ImagesThumbnailAdapter(final Fragment fragment, final AlbumEntry album, f
     }
 
     private Drawable createCheckIcon() {
-        Drawable checkIcon = ContextCompat.getDrawable(mRecyclerView.getContext(), R.drawable.ic_action_done_white);
+        Drawable checkIcon = AppCompatResources.getDrawable(mRecyclerView.getContext(), R.drawable.ic_action_done_white);
         checkIcon = DrawableCompat.wrap(checkIcon);
         DrawableCompat.setTint(checkIcon, mPickOptions.checkIconTintColor);
         return checkIcon;
@@ -60,14 +64,15 @@ private Drawable createVideoIcon() {
         if (!mPickOptions.videosEnabled) {
             return null;
         }
-        Drawable videoIcon = ContextCompat.getDrawable(mRecyclerView.getContext(), R.drawable.ic_play_arrow);
+        Drawable videoIcon = AppCompatResources.getDrawable(mRecyclerView.getContext(), R.drawable.ic_play_arrow);
         videoIcon = DrawableCompat.wrap(videoIcon);
         DrawableCompat.setTint(videoIcon, mPickOptions.videoIconTintColor);
         return videoIcon;
     }
 
+    @NonNull
     @Override
-    public ImageViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+    public ImageViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
         final View imageLayout = LayoutInflater.from(mRecyclerView.getContext()).inflate(R.layout.element_image, viewGroup, false);
 
 
@@ -80,7 +85,7 @@ public int getItemCount() {
     }
 
     @Override
-    public void onBindViewHolder(ImageViewHolder imageViewHolder, int position) {
+    public void onBindViewHolder(@NonNull ImageViewHolder imageViewHolder, int position) {
         final ImageEntry imageEntry = mAlbum.imageList.get(position);
         setHeight(imageViewHolder.itemView);
         displayThumbnail(imageViewHolder, imageEntry);
@@ -106,9 +111,9 @@ public void displayThumbnail(final ImageViewHolder holder, final ImageEntry phot
 
 
         Glide.with(mFragment)
-                .load(photo.path)
                 .asBitmap()
-                .centerCrop()
+                .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
+                .load(photo.path)
                 .into(holder.thumbnail)
         ;
 
@@ -170,7 +175,7 @@ public void pickImage(final ImageViewHolder holder, final ImageEntry imageEntry)
 
     }
 
-    public static class ImageViewHolder extends RecyclerView.ViewHolder {
+     static class ImageViewHolder extends RecyclerView.ViewHolder {
         private final ImageView thumbnail;
         private final ImageView check;
         private final ImageView videoIcon;
@@ -178,15 +183,13 @@ public static class ImageViewHolder extends RecyclerView.ViewHolder {
         public ImageViewHolder(final View itemView, final Util.OnClickImage listener) {
             super(itemView);
 
-            thumbnail = (ImageView) itemView.findViewById(R.id.image_thumbnail);
-            check = (ImageView) itemView.findViewById(R.id.image_check);
-            videoIcon = (ImageView) itemView.findViewById(R.id.image_video_icon);
+            thumbnail = itemView.findViewById(R.id.image_thumbnail);
+            check = itemView.findViewById(R.id.image_check);
+            videoIcon = itemView.findViewById(R.id.image_video_icon);
 
-            itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    listener.onClickImage(itemView, thumbnail, check);
-                }
+            itemView.setOnClickListener(v -> {
+                if (getAdapterPosition() < 0) return;
+                listener.onClickImage(itemView, thumbnail, check);
             });
 
 
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagesThumbnailFragment.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photo/ImagesThumbnailFragment.java
similarity index 54%
rename from imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagesThumbnailFragment.java
rename to imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photo/ImagesThumbnailFragment.java
index f938e13..c1f4420 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagesThumbnailFragment.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photo/ImagesThumbnailFragment.java
@@ -1,23 +1,28 @@
-package net.yazeed44.imagepicker.ui;
+package net.yazeed44.imagepicker.ui.photo;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import net.yazeed44.imagepicker.library.R;
-import net.yazeed44.imagepicker.util.Events;
+import net.yazeed44.imagepicker.data.Events;
+import net.yazeed44.imagepicker.ui.SpacesItemDecoration;
 import net.yazeed44.imagepicker.util.Picker;
 
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 
 
 /**
- * Created by yazeed44 on 11/23/14.
+ * Created by yazeed44
+ * on 11/23/14.
  */
 public class ImagesThumbnailFragment extends Fragment {
 
@@ -25,21 +30,25 @@ public class ImagesThumbnailFragment extends Fragment {
     protected RecyclerView mImagesRecycler;
     protected Picker mPickOptions;
 
+    public void setmPickOptions(Picker mPickOptions) {
+        this.mPickOptions = mPickOptions;
+    }
+
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         mImagesRecycler = (RecyclerView) inflater.inflate(R.layout.fragment_image_browse, container, false);
 
         setupRecycler();
 
-        mPickOptions = EventBus.getDefault().getStickyEvent(Events.OnPublishPickOptionsEvent.class).options;
+//        mPickOptions = EventBus.getDefault().getStickyEvent(Events.OnPublishPickOptionsEvent.class).options;
 
         return mImagesRecycler;
     }
 
     @Override
     public void onStart() {
-        EventBus.getDefault().registerSticky(this);
+        EventBus.getDefault().register(this);
         super.onStart();
     }
 
@@ -49,7 +58,7 @@ public void onStop() {
         super.onStop();
     }
 
-    protected void setupRecycler() {
+    public void setupRecycler() {
 
         mImagesRecycler.setHasFixedSize(true);
         final GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), getResources().getInteger(R.integer.num_columns_images));
@@ -57,23 +66,26 @@ protected void setupRecycler() {
         gridLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
 
         mImagesRecycler.setLayoutManager(gridLayoutManager);
-        mImagesRecycler.addItemDecoration(new SpacesItemDecoration(getResources().getDimensionPixelSize(R.dimen.image_spacing)));
+        if (mImagesRecycler.getItemDecorationCount() <= 0)
+            mImagesRecycler.addItemDecoration(new SpacesItemDecoration(getResources().getDimensionPixelSize(R.dimen.image_spacing)));
 
 
     }
 
-
+    @Subscribe(sticky = true)
     public void onEvent(final Events.OnClickAlbumEvent event) {
         mImagesRecycler.setAdapter(new ImagesThumbnailAdapter(this, event.albumEntry, mImagesRecycler, mPickOptions));
     }
 
-
+    @Subscribe(sticky = true)
     public void onEvent(final Events.OnAttachFabEvent fabEvent) {
-        fabEvent.fab.attachToRecyclerView(mImagesRecycler);
+//        fabEvent.fab.attachToRecyclerView(mImagesRecycler);
     }
 
+    @Subscribe
     public void onEvent(final Events.OnUpdateImagesThumbnailEvent redrawImage) {
-        mImagesRecycler.getAdapter().notifyDataSetChanged();
+        if (mImagesRecycler.getAdapter() != null)
+            mImagesRecycler.getAdapter().notifyDataSetChanged();
 
     }
 
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagePagerAdapter.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagePagerAdapter.java
similarity index 55%
rename from imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagePagerAdapter.java
rename to imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagePagerAdapter.java
index 064fdcd..a550574 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagePagerAdapter.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagePagerAdapter.java
@@ -1,30 +1,33 @@
-package net.yazeed44.imagepicker.ui;
+package net.yazeed44.imagepicker.ui.photoPager;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.view.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import com.bumptech.glide.Glide;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.PagerAdapter;
 
-import net.yazeed44.imagepicker.model.AlbumEntry;
-import net.yazeed44.imagepicker.model.ImageEntry;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.github.chrisbanes.photoview.OnViewTapListener;
+import com.github.chrisbanes.photoview.PhotoView;
 
-import uk.co.senab.photoview.PhotoView;
-import uk.co.senab.photoview.PhotoViewAttacher;
+import net.yazeed44.imagepicker.data.model.AlbumEntry;
+import net.yazeed44.imagepicker.data.model.ImageEntry;
 
 /**
- * Created by yazeed44 on 6/20/15.
+ * Created by yazeed44
+ * on 6/20/15.
  */
 public class ImagePagerAdapter extends PagerAdapter {
 
 
     protected final AlbumEntry mAlbumEntry;
     protected final Fragment mFragment;
-    protected final PhotoViewAttacher.OnViewTapListener mTapListener;
+    protected final OnViewTapListener mTapListener;
 
-    public ImagePagerAdapter(final Fragment fragment, final AlbumEntry albumEntry, final PhotoViewAttacher.OnViewTapListener tapListener) {
+    public ImagePagerAdapter(final Fragment fragment, final AlbumEntry albumEntry, final OnViewTapListener tapListener) {
         mAlbumEntry = albumEntry;
         mFragment = fragment;
         mTapListener = tapListener;
@@ -36,20 +39,22 @@ public int getCount() {
     }
 
     @Override
-    public boolean isViewFromObject(View view, Object object) {
+    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
         return view == (object);
     }
 
+    @NonNull
     @Override
-    public Object instantiateItem(ViewGroup container, int position) {
+    public Object instantiateItem(@NonNull ViewGroup container, int position) {
         final ImageEntry imageEntry = mAlbumEntry.imageList.get(position);
         final PhotoView view = new PhotoView(mFragment.getActivity());
         view.setOnViewTapListener(mTapListener);
 
 
         Glide.with(mFragment)
-                .load(imageEntry.path)
                 .asBitmap()
+                .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
+                .load(imageEntry.path)
                 .into(view);
 
         container.addView(view, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
@@ -57,7 +62,7 @@ public Object instantiateItem(ViewGroup container, int position) {
     }
 
     @Override
-    public void destroyItem(ViewGroup container, int position, Object object) {
+    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
         container.removeView((ImageView) object);
     }
 }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagesPagerFragment.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
similarity index 71%
rename from imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagesPagerFragment.java
rename to imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
index e735549..22bc66f 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/ImagesPagerFragment.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
@@ -1,29 +1,35 @@
-package net.yazeed44.imagepicker.ui;
+package net.yazeed44.imagepicker.ui.photoPager;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.melnykov.fab.FloatingActionButton;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
+import com.github.chrisbanes.photoview.OnViewTapListener;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import net.yazeed44.imagepicker.library.R;
-import net.yazeed44.imagepicker.model.AlbumEntry;
-import net.yazeed44.imagepicker.util.Events;
+import net.yazeed44.imagepicker.data.model.AlbumEntry;
+import net.yazeed44.imagepicker.data.Events;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 
-import de.greenrobot.event.EventBus;
-import uk.co.senab.photoview.PhotoViewAttacher;
 
 /**
- * Created by yazeed44 on 6/20/15.
+ * Created by yazeed44
+ * on 6/20/15.
  */
-public class ImagesPagerFragment extends Fragment implements PhotoViewAttacher.OnViewTapListener, ViewPager.OnPageChangeListener {
+public class ImagesPagerFragment extends Fragment implements OnViewTapListener, ViewPager.OnPageChangeListener {
 
     public static final String TAG = ImagesPagerFragment.class.getSimpleName();
     protected ViewPager mImagePager;
@@ -32,7 +38,7 @@ public class ImagesPagerFragment extends Fragment implements PhotoViewAttacher.O
 
     @Nullable
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
         EventBus.getDefault().post(new Events.OnShowingToolbarEvent());
         removeBehaviorAttr(container);
@@ -70,7 +76,7 @@ public void onDestroyView() {
     @Override
     public void onResume() {
         super.onResume();
-        EventBus.getDefault().registerSticky(this);
+        EventBus.getDefault().register(this);
     }
 
     @Override
@@ -85,7 +91,7 @@ public void onPause() {
     public void onViewTap(View view, float x, float y) {
 
 
-        if (mDoneFab.isVisible()) {
+        if (mDoneFab.isShown()) {
             //Hide everything expect the image
             EventBus.getDefault().post(new Events.OnHidingToolbarEvent());
             mDoneFab.hide();
@@ -94,7 +100,7 @@ public void onViewTap(View view, float x, float y) {
         } else {
             //Show fab and actionbar
             EventBus.getDefault().post(new Events.OnShowingToolbarEvent());
-            mDoneFab.setVisibility(View.VISIBLE);
+//            mDoneFab.setVisibility(View.VISIBLE);
             mDoneFab.show();
             mDoneFab.bringToFront();
 
@@ -124,14 +130,19 @@ private void updateDisplayedImage(final int index) {
         //Because index starts from 0
         final int realPosition = index + 1;
         final String actionbarTitle = getResources().getString(R.string.image_position_in_view_pager).replace("%", realPosition + "").replace("$", mSelectedAlbum.imageList.size() + "");
-        ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(actionbarTitle);
-
+        if (getActivity() instanceof AppCompatActivity) {
+            ActionBar ab = ((AppCompatActivity) getActivity()).getSupportActionBar();
+            if (ab != null) {
+                ab.setTitle(actionbarTitle);
+            }
+        }
     }
 
 
+    @Subscribe(sticky = true)
     public void onEvent(final Events.OnPickImageEvent pickImageEvent) {
 
-        mDoneFab.setVisibility(View.VISIBLE);
+//        mDoneFab.setVisibility(View.VISIBLE);
         mDoneFab.show();
         mDoneFab.bringToFront();
         if (mImagePager.getAdapter() != null) {
@@ -147,10 +158,12 @@ public void onEvent(final Events.OnPickImageEvent pickImageEvent) {
 
     }
 
+    @Subscribe(sticky = true)
     public void onEvent(final Events.OnClickAlbumEvent albumEvent) {
         mSelectedAlbum = albumEvent.albumEntry;
     }
 
+    @Subscribe(sticky = true)
     public void onEvent(final Events.OnAttachFabEvent fabEvent) {
         mDoneFab = fabEvent.fab;
     }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CameraSupport.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CameraSupport.java
index b51ef68..eca359d 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CameraSupport.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CameraSupport.java
@@ -3,6 +3,8 @@
 import android.app.Activity;
 import android.content.Intent;
 
+import com.commonsware.cwac.cam2.CameraActivity;
+
 import java.io.File;
 
 /**
@@ -29,7 +31,7 @@ public static boolean isEnabled() {
     }
 
     public static void startPhotoCaptureActivity(Activity parent, File file, int requestCode) {
-        final Intent captureIntent = new com.commonsware.cwac.cam2.CameraActivity.IntentBuilder(parent)
+        final Intent captureIntent = new CameraActivity.IntentBuilder(parent)
                 .skipConfirm()
                 .debug()
                 .to(file)
@@ -44,8 +46,6 @@ public static void startVideoCaptureActivity(Activity parent, File file, int vid
                 .debug()
                 .to(file)
                 .build();
-
         parent.startActivityForResult(captureIntent, requestCode);
     }
-
 }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CommonUtils.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CommonUtils.java
new file mode 100644
index 0000000..43f1455
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CommonUtils.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2017 MINDORKS NEXTGEN PRIVATE LIMITED
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://mindorks.com/license/apache-v2
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package net.yazeed44.imagepicker.util;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.Uri;
+import android.os.Build;
+import android.text.Html;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.util.Linkify;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.RecyclerView;
+
+import net.yazeed44.imagepicker.library.BuildConfig;
+import net.yazeed44.imagepicker.library.R;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.Normalizer;
+import java.util.Locale;
+import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by anhtt on 27/01/17.
+ */
+
+public final class CommonUtils {
+
+    private CommonUtils() {
+        // This utility class is not publicly instantiable
+    }
+
+    public static int random(int min, int max) {
+        if (min >= max) {
+            throw new IllegalArgumentException("max must be greater than min");
+        }
+        Random r = new Random();
+        return r.nextInt((max - min) + 1) + min;
+    }
+
+    public static AlertDialog showLoadingDialog(Context context) {
+        AlertDialog proDialog = new AlertDialog.Builder(context).create();
+        proDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        proDialog.setCancelable(true);
+        try {
+            proDialog.show();
+        } catch (Exception e) {
+            if (BuildConfig.DEBUG)
+                e.printStackTrace();
+        }
+        proDialog.setContentView(R.layout.layout_loading);
+        if (proDialog.getWindow() != null) {
+            proDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+            proDialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+        }
+        return proDialog;
+    }
+
+    public static boolean isEmailValid(String email) {
+        Pattern pattern;
+        Matcher matcher;
+        final String EMAIL_PATTERN =
+                "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@"
+                        + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
+        pattern = Pattern.compile(EMAIL_PATTERN);
+        matcher = pattern.matcher(email);
+        return matcher.matches();
+    }
+
+    public static boolean isPhoneValid(String phone) {
+        Pattern pattern;
+        Matcher matcher;
+        final String PHONE_PATTERN = "(84|\\+84|0)\\d{9}";
+        pattern = Pattern.compile(PHONE_PATTERN);
+        matcher = pattern.matcher(phone);
+        return matcher.matches();
+    }
+
+    public static boolean isNetworkConnected(Context context) {
+        boolean haveConnectedWifi = false;
+        boolean haveConnectedMobile = false;
+        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        if (cm == null) return false;
+        //noinspection deprecation
+        NetworkInfo[] netInfo = cm.getAllNetworkInfo();
+        for (NetworkInfo ni : netInfo) {
+            if (ni.getTypeName().equalsIgnoreCase("WIFI"))
+                if (ni.isConnected())
+                    haveConnectedWifi = true;
+            if (ni.getTypeName().equalsIgnoreCase("MOBILE"))
+                if (ni.isConnected())
+                    haveConnectedMobile = true;
+        }
+        return haveConnectedWifi || haveConnectedMobile;
+    }
+
+
+    public static String unAccent(String s) {
+        String temp = Normalizer.normalize(s, Normalizer.Form.NFD);
+        Pattern pattern = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
+        return pattern.matcher(temp).replaceAll("").replaceAll("Đ", "D").replaceAll("đ", "d").toLowerCase();
+    }
+
+    public static void marginLastItem(RecyclerView.ViewHolder holder, int position, int count, int margin) {
+        if (holder.itemView.getLayoutParams() instanceof ViewGroup.MarginLayoutParams) {
+            ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) holder.itemView.getLayoutParams();
+            if (position == count - 1)
+                lp.setMargins(0, 0, 0, (int) UIUtil.dpToPx(holder.itemView.getContext(), margin));
+            else
+                lp.setMargins(0, 0, 0, 0);
+            holder.itemView.setLayoutParams(lp);
+        }
+    }
+
+    public static String getSampleAssessment(String orig, String studentName) {
+        return orig.replaceAll("@tenbe", studentName)
+                .replaceAll("@ten-be", studentName)
+                .replaceAll("ten-be", studentName)
+                .replaceAll("Ten-be", studentName)
+                .replaceAll("tenbe", studentName)
+                .replaceAll("Tenbe", studentName);
+    }
+
+    public static void callPhone(Context context, String phone) {
+        try {
+            Intent intent = new Intent(Intent.ACTION_DIAL);
+            intent.setData(Uri.parse("tel:" + phone));
+            context.startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+//            ToastUtils.showToastErrorConfirm(context, R.string.device_not_support_phone_call);
+        }
+    }
+
+
+    public static String formatCurrency(Double amount) {
+        return new DecimalFormat("###,###,###,###", DecimalFormatSymbols.getInstance(Locale.getDefault())).format(amount);
+    }
+
+    public static String formatCurrency(String amount) {
+        try {
+            return new DecimalFormat("###,###,###,###", DecimalFormatSymbols.getInstance(Locale.getDefault())).format(Double.parseDouble(amount));
+        } catch (Exception e) {
+            return amount;
+        }
+    }
+
+    public static void setWebViewContent(WebView webView, String content) {
+        if (webView.getSettings() != null) {
+            webView.getSettings().setDefaultTextEncodingName("utf-8");
+            webView.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH);
+        }
+
+        if (Build.VERSION.SDK_INT >= 19) {
+            webView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        } else {
+            webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        }
+        content = content.replaceAll("<!--.*?-->", "")
+                .replaceAll("/^\\s+|\\s+$/g", "");
+        String htmlPrefix = "<style type=\"text/css\"> @font-face { font-family: MyFont; src: url(\"file:///android_asset/fonts/Montserrat-Regular.ttf\") } body { font-family: MyFont; font-size: 14; text-align: justify;max-width: 100%; word-break: break-all; word-break: break-word}img{display: inline;height: auto;max-width: 100%;}</style>" +
+                "<html><body><p align=\"justify\" line-height=\"1.5\" >";
+        String htmlPostfix = "</p></body></html>";
+        String html;
+        if (content.contains("http")) {
+            Spannable sp = new SpannableString(Html.fromHtml(content));
+            Linkify.addLinks(sp, Linkify.ALL);
+            html = htmlPrefix + Html.toHtml(sp) + htmlPostfix;
+        } else {
+            html = htmlPrefix + content + htmlPostfix;
+        }
+        webView.loadDataWithBaseURL("", html, "text/html; charset=utf-8", "utf-8", "");
+    }
+
+}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/LoadingAlbumsRequest.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/LoadingAlbumsRequest.java
index 043c4bf..cd2b660 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/LoadingAlbumsRequest.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/LoadingAlbumsRequest.java
@@ -4,23 +4,27 @@
 
 import com.octo.android.robospice.request.SpiceRequest;
 
+import net.yazeed44.imagepicker.data.model.AlbumEntry;
+
 import java.util.ArrayList;
 
 /**
- * Created by yazeed44 on 6/13/15.
+ * Created by yazeed44
+ * on 6/13/15.
  */
-public class LoadingAlbumsRequest extends SpiceRequest<ArrayList> {
+public class LoadingAlbumsRequest extends SpiceRequest<ArrayList<AlbumEntry>> {
     private final Context mContext;
     private final Picker mPickerOptions;
 
+    @SuppressWarnings("unchecked")
     public LoadingAlbumsRequest(final Context context, final Picker pickerOptions) {
-        super(ArrayList.class);
+        super((Class) ArrayList.class);
         mContext = context;
         mPickerOptions = pickerOptions;
     }
 
     @Override
-    public ArrayList loadDataFromNetwork() throws Exception {
+    public ArrayList<AlbumEntry> loadDataFromNetwork() {
         return Util.getAlbums(mContext, mPickerOptions);
     }
 }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/LocaleContextWrapper.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/LocaleContextWrapper.java
new file mode 100644
index 0000000..8f69064
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/LocaleContextWrapper.java
@@ -0,0 +1,43 @@
+package net.yazeed44.imagepicker.util;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.os.LocaleList;
+
+import java.util.Locale;
+
+public class LocaleContextWrapper extends android.content.ContextWrapper {
+
+    public LocaleContextWrapper(Context base) {
+        super(base);
+    }
+
+    public static LocaleContextWrapper wrap(Context context, Locale newLocale) {
+
+        Resources res = context.getResources();
+        Configuration configuration = res.getConfiguration();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            configuration.setLocale(newLocale);
+
+            LocaleList localeList = new LocaleList(newLocale);
+            LocaleList.setDefault(localeList);
+            configuration.setLocales(localeList);
+
+            context = context.createConfigurationContext(configuration);
+
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+
+            configuration.setLocale(newLocale);
+            context = context.createConfigurationContext(configuration);
+
+        } else {
+            configuration.locale = newLocale;
+            res.updateConfiguration(configuration, res.getDisplayMetrics());
+        }
+
+        return new LocaleContextWrapper(context);
+    }
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/LocaleHelper.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/LocaleHelper.java
new file mode 100644
index 0000000..cc4a372
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/LocaleHelper.java
@@ -0,0 +1,124 @@
+package net.yazeed44.imagepicker.util;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.os.LocaleList;
+import android.preference.PreferenceManager;
+
+import java.util.Locale;
+
+public class LocaleHelper {
+
+    /**
+     * @param context Should be Application Context
+     * @return wrapped context
+     */
+    public static Context onAttach(Context context) {
+        String lang = getPersistedData(context, Locale.getDefault().getLanguage());
+
+        return setLocale(context, lang);
+    }
+
+    public static Context onAttach(Context context, String defaultLanguage) {
+        String lang = getPersistedData(context, defaultLanguage);
+        return setLocale(context, lang);
+    }
+
+    public static String getLanguage(Context context) {
+        return getPersistedData(context, Locale.getDefault().getLanguage());
+    }
+
+    public static Context setLocale(Context context, String language) {
+        persist(context, language);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return updateResources(context, language);
+        }
+
+        return updateResourcesLegacy(context, language);
+    }
+
+    public static Context setLocaleDontWrap(Context context) {
+        String language = getLanguage(context);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return updateResourcesDontWrap(context, language);
+        }
+
+        return updateResourcesLegacy(context, language);
+    }
+
+    public static Context setLocale(Context context) {
+        String language = getLanguage(context);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return updateResources(context, language);
+        }
+
+        return updateResourcesLegacy(context, language);
+    }
+
+    public static String getPersistedData(Context context, String defaultLanguage) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getString("ls_language", defaultLanguage);
+    }
+
+    public static void persist(Context context, String language) {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = preferences.edit();
+
+        editor.putString("ls_language", language);
+        editor.apply();
+
+    }
+
+    @TargetApi(Build.VERSION_CODES.N)
+    public static Context updateResources(Context context, String language) {
+        Locale locale = new Locale(language);
+        Locale.setDefault(locale);
+
+        Configuration configuration = context.getResources().getConfiguration();
+        configuration.setLocale(locale);
+        configuration.setLayoutDirection(locale);
+        LocaleList localeList = new LocaleList(locale);
+        configuration.setLocales(localeList);
+        context.getResources().updateConfiguration(configuration, context.getResources().getDisplayMetrics());
+
+        return LocaleContextWrapper.wrap(context.createConfigurationContext(configuration), locale);
+    }
+
+    @TargetApi(Build.VERSION_CODES.N)
+    public static Context updateResourcesDontWrap(Context context, String language) {
+        Locale locale = new Locale(language);
+        Locale.setDefault(locale);
+
+        Configuration configuration = context.getResources().getConfiguration();
+        configuration.setLocale(locale);
+        configuration.setLayoutDirection(locale);
+        LocaleList localeList = new LocaleList(locale);
+        configuration.setLocales(localeList);
+        context.getResources().updateConfiguration(configuration, context.getResources().getDisplayMetrics());
+
+        return context.createConfigurationContext(configuration);
+    }
+
+    public static Context updateResourcesLegacy(Context context, String language) {
+        Locale locale = new Locale(language);
+        Locale.setDefault(locale);
+
+        Resources resources = context.getResources();
+
+        Configuration configuration = resources.getConfiguration();
+        configuration.locale = locale;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            configuration.setLayoutDirection(locale);
+        }
+
+        resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+        return context;
+    }
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/OfflineSpiceService.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/OfflineSpiceService.java
index 254cd94..708b55a 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/OfflineSpiceService.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/OfflineSpiceService.java
@@ -6,15 +6,15 @@
 import com.octo.android.robospice.SpiceService;
 import com.octo.android.robospice.networkstate.NetworkStateChecker;
 import com.octo.android.robospice.persistence.CacheManager;
-import com.octo.android.robospice.persistence.exception.CacheCreationException;
 
 /**
- * Created by yazeed44 on 6/13/15.
+ * Created by yazeed44
+ * on 6/13/15.
  */
 public class OfflineSpiceService extends SpiceService {
 
     @Override
-    public CacheManager createCacheManager(Application application) throws CacheCreationException {
+    public CacheManager createCacheManager(Application application) {
         return new CacheManager();
     }
 
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
index 3fcbdd8..f563787 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
@@ -3,29 +3,33 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StyleRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.ColorUtils;
 import android.util.TypedValue;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+
+import net.yazeed44.imagepicker.data.Events;
+import net.yazeed44.imagepicker.data.model.ImageEntry;
 import net.yazeed44.imagepicker.library.R;
-import net.yazeed44.imagepicker.model.ImageEntry;
 import net.yazeed44.imagepicker.ui.PickerActivity;
 
-import java.util.ArrayList;
+import org.greenrobot.eventbus.EventBus;
 
-import de.greenrobot.event.EventBus;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 
 /**
- * Created by yazeed44 on 6/14/15.
+ * Created by yazeed44
+ * on 6/14/15.
  */
 public final class Picker {
 
     public final int limit;
-    public final Context context;
+    public final WeakReference<Context> context;
     public final int fabBackgroundColor;
     public final int fabBackgroundColorWhenPressed;
     public final int imageBackgroundColorWhenChecked;
@@ -48,9 +52,12 @@ public final class Picker {
     public final int videoThumbnailOverlayColor;
     public final int videoIconTintColor;
     public final boolean backBtnInMainActivity;
+    public final boolean shouldShowItemAfterPick;
+    public float aspectRatioX = -1;
+    public float aspectRatioY = -1;
 
     private Picker(final Builder builder) {
-        context = builder.mContext;
+        context = new WeakReference<>(builder.mContext);
         limit = builder.mLimit;
         fabBackgroundColor = builder.mFabBackgroundColor;
         fabBackgroundColorWhenPressed = builder.mFabBackgroundColorWhenPressed;
@@ -74,23 +81,23 @@ private Picker(final Builder builder) {
         videoThumbnailOverlayColor = builder.mVideoThumbnailOverlayColor;
         videoIconTintColor = builder.mVideoIconTintColor;
         backBtnInMainActivity = builder.mBackBtnInMainActivity;
-
+        shouldShowItemAfterPick = builder.shouldShowItemAfterPick;
+        aspectRatioX = builder.aspectRatioX;
+        aspectRatioY = builder.aspectRatioY;
     }
 
     public void startActivity() {
-
-        EventBus.getDefault().postSticky(new Events.OnPublishPickOptionsEvent(this));
-
-        final Intent intent = new Intent(context, PickerActivity.class);
-
-        context.startActivity(intent);
-
+        if (context.get() != null) {
+            EventBus.getDefault().postSticky(new Events.OnPublishPickOptionsEvent(this));
+            final Intent intent = new Intent(context.get(), PickerActivity.class);
+            PickerActivity.mPickOptions = this;
+            context.get().startActivity(intent);
+        }
     }
 
 
     public enum PickMode {
-
-        SINGLE_IMAGE, MULTIPLE_IMAGES
+        SINGLE_IMAGE, MULTIPLE_IMAGES, SINGLE_VIDEO, MULTIPLE_VIDEOS, MIX
     }
 
     public interface PickListener {
@@ -100,39 +107,51 @@ public interface PickListener {
 
     }
 
-    public static class Builder {
+    public static final class Builder {
 
         private final Context mContext;
         private final PickListener mPickListener;
         private final int mThemeResId;
+        private boolean shouldShowItemAfterPick;
         private int mLimit = PickerActivity.NO_LIMIT;
         private int mFabBackgroundColor;
+        @ColorInt
         private int mFabBackgroundColorWhenPressed;
+        @ColorInt
         private int mImageBackgroundColorWhenChecked;
+        @ColorInt
         private int mImageBackgroundColor;
+        @ColorInt
         private int mImageCheckColor;
+        @ColorInt
         private int mCheckedImageOverlayColor;
+        @ColorInt
         private int mAlbumImagesCountTextColor;
+        @ColorInt
         private int mAlbumBackgroundColor;
+        @ColorInt
         private int mAlbumNameTextColor;
         private PickMode mPickMode;
         private int mPopupThemeResId;
+        @ColorInt
         private int mDoneFabIconTintColor;
+        @ColorInt
         private int mCaptureItemIconTintColor;
         private boolean mShouldShowCaptureMenuItem;
+        @ColorInt
         private int mCheckIconTintColor;
         private boolean mVideosEnabled;
         private int mVideoLengthLimit;
+        @ColorInt
         private int mVideoThumbnailOverlayColor;
+        @ColorInt
         private int mVideoIconTintColor;
-        private boolean mBackBtnInMainActivity;
+        private boolean mBackBtnInMainActivity=true;
+        private float aspectRatioX = -1;
+        private float aspectRatioY = -1;
 
-        //Use (Context,PickListener,themeResId) instead
-        @Deprecated
         public Builder(final Context context, final PickListener listener) {
-
-
-            mThemeResId = R.style.Theme_AppCompat_Light_NoActionBar;
+            mThemeResId = R.style.PickerTheme;
             mContext = context;
             mContext.setTheme(mThemeResId);
             mPickListener = listener;
@@ -180,21 +199,30 @@ private int getColor(@ColorRes final int colorRes) {
             return ContextCompat.getColor(mContext, colorRes);
         }
 
-
         private void initUsingColorAccent(final TypedValue typedValue) {
             mContext.getTheme().resolveAttribute(R.attr.colorAccent, typedValue, true);
             mImageBackgroundColorWhenChecked = mFabBackgroundColor = typedValue.data;
         }
 
-
         /**
-         * @param limit limit for the count of image user can pick , By default it's infinite
+         * @param limit limit for the count of image user can pick, By default it's infinite
          */
         public Picker.Builder setLimit(final int limit) {
             mLimit = limit;
             return this;
         }
 
+        public Picker.Builder withAspectRatio(float x, float y) {
+            aspectRatioX = x;
+            aspectRatioY = y;
+            return this;
+        }
+
+        public Picker.Builder setShowItemAfterPick(final boolean isShow) {
+            shouldShowItemAfterPick = isShow;
+            return this;
+        }
+
         public Picker.Builder setFabBackgroundColor(@ColorInt final int color) {
             mFabBackgroundColor = color;
             return this;
@@ -299,7 +327,5 @@ public Picker.Builder setVideoIconTintColor(@ColorInt final int color) {
         public Picker build() {
             return new Picker(this);
         }
-
-
     }
-}
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/UIUtil.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/UIUtil.java
new file mode 100644
index 0000000..4427325
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/UIUtil.java
@@ -0,0 +1,289 @@
+package net.yazeed44.imagepicker.util;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.view.Display;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+
+import java.lang.reflect.InvocationTargetException;
+
+import static android.content.Context.WINDOW_SERVICE;
+
+/**
+ * Created by yshrsmz on 15/03/17.
+ */
+public final class UIUtil {
+
+    public static float dpToPx(@NonNull Context context, float dp) {
+        Resources res = context.getResources();
+        return dp * (res.getDisplayMetrics().densityDpi / 160f);
+    }
+
+    /**
+     * Show keyboard and focus to given EditText
+     *
+     * @param context Context
+     * @param target  EditText to focus
+     */
+    public static void showKeyboard(Context context, EditText target) {
+        if (context == null || target == null) {
+            return;
+        }
+        InputMethodManager imm = getInputMethodManager(context);
+        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY);
+        target.requestFocus();
+    }
+
+    /**
+     * Show keyboard and focus to given EditText.
+     * Use this method if target EditText is in Dialog.
+     *
+     * @param dialog Dialog
+     * @param target EditText to focus
+     */
+    public static void showKeyboardInDialog(Dialog dialog, EditText target) {
+        if (dialog == null || target == null) {
+            return;
+        }
+
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        target.requestFocus();
+    }
+
+
+
+    /**
+     * hide keyboard
+     *
+     * @param context Context
+     * @param target  View that currently has focus
+     */
+    public static void hideKeyboard(Context context, View target) {
+        if (context == null || target == null) {
+            return;
+        }
+
+        InputMethodManager imm = getInputMethodManager(context);
+        imm.hideSoftInputFromWindow(target.getWindowToken(), 0);
+    }
+
+    /**
+     * hide keyboard
+     *
+     * @param activity AdvanceLearnActivity
+     */
+    public static void hideKeyboard(Activity activity) {
+        if (activity == null) return;
+
+        View view = activity.getWindow().getDecorView();
+
+        hideKeyboard(activity, view);
+    }
+
+    private static InputMethodManager getInputMethodManager(Context context) {
+        return (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+    }
+
+
+    public static Point getNavigationBarSize(Context context) {
+        Point appUsableSize = getAppUsableScreenSize(context);
+        Point realScreenSize = getRealScreenSize(context);
+        if (appUsableSize == null || realScreenSize == null)
+            return new Point();
+
+
+        // navigation bar on the right
+        if (appUsableSize.x < realScreenSize.x) {
+            return new Point(realScreenSize.x - appUsableSize.x, appUsableSize.y);
+        }
+
+        // navigation bar at the bottom
+        if (appUsableSize.y < realScreenSize.y) {
+            return new Point(appUsableSize.x, realScreenSize.y - appUsableSize.y);
+        }
+
+        // navigation bar is not present
+        return new Point();
+    }
+
+    @Nullable
+    public static Point getAppUsableScreenSize(@NonNull Context context) {
+        WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        if (windowManager == null) return null;
+        Display display = windowManager.getDefaultDisplay();
+        Point size = new Point();
+        display.getSize(size);
+        return size;
+    }
+
+    public static Point getRealScreenSize(Context context) {
+        Point size = new Point(1080, 1920);
+        WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        if (windowManager == null) return size;
+        Display display = windowManager.getDefaultDisplay();
+
+        if (Build.VERSION.SDK_INT >= 17) {
+            display.getRealSize(size);
+        } else {
+            try {
+                size.x = (Integer) Display.class.getMethod("getRawWidth").invoke(display);
+                size.y = (Integer) Display.class.getMethod("getRawHeight").invoke(display);
+            } catch (IllegalAccessException ignored) {
+            } catch (InvocationTargetException ignored) {
+            } catch (NoSuchMethodException ignored) {
+            }
+        }
+
+        return size;
+    }
+
+    public static int getNavigationBarHeight(Context context) {
+        Resources resources = context.getResources();
+        int id = resources.getIdentifier("config_showNavigationBar", "bool", "android");
+        if (id > 0 && resources.getBoolean(id)) {
+            int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
+            if (resourceId > 0) {
+                return resources.getDimensionPixelSize(resourceId);
+            }
+        }
+        return 0;
+    }
+
+    public static int getStatusbarHeight(Context context) {
+        int statusBarHeight = 0;
+        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            statusBarHeight = context.getResources().getDimensionPixelSize(resourceId);
+        }
+        return statusBarHeight;
+    }
+
+    public static int getActionBarHeight(Context context) {
+        int actionBarHeight = 0;
+        final TypedArray styledAttributes = context.getTheme().obtainStyledAttributes(
+                new int[]{android.R.attr.actionBarSize}
+        );
+        actionBarHeight = (int) styledAttributes.getDimension(0, 0);
+        styledAttributes.recycle();
+        return actionBarHeight;
+    }
+
+    public static int getNavBarHeight(Context c) {
+        int result = 0;
+        boolean hasMenuKey = ViewConfiguration.get(c).hasPermanentMenuKey();
+        boolean hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK);
+
+        if (!hasMenuKey && !hasBackKey) {
+            //The device has a navigation bar
+            Resources resources = c.getResources();
+
+            int orientation = resources.getConfiguration().orientation;
+            int resourceId;
+            if (isTablet(c)) {
+                resourceId = resources.getIdentifier(orientation == Configuration.ORIENTATION_PORTRAIT ? "navigation_bar_height" : "navigation_bar_height_landscape", "dimen", "android");
+            } else {
+                resourceId = resources.getIdentifier(orientation == Configuration.ORIENTATION_PORTRAIT ? "navigation_bar_height" : "navigation_bar_width", "dimen", "android");
+            }
+
+            if (resourceId > 0) {
+                return resources.getDimensionPixelSize(resourceId);
+            }
+        }
+        return result;
+    }
+
+
+    private static boolean isTablet(Context c) {
+        return (c.getResources().getConfiguration().screenLayout
+                & Configuration.SCREENLAYOUT_SIZE_MASK)
+                >= Configuration.SCREENLAYOUT_SIZE_LARGE;
+    }
+
+    // Custom method to get screen width in pixels using Context object
+    public static int getScreenWidthInPx(Context context) {
+        /*
+            DisplayMetrics
+                A structure describing general information about a display,
+                such as its size, density, and font scaling.
+        */
+        DisplayMetrics dm = new DisplayMetrics();
+
+        /*
+            WindowManager
+                The interface that apps use to talk to the window manager.
+                Use Context.getSystemService(Context.WINDOW_SERVICE) to get one of these.
+        */
+
+        /*
+            public abstract Object getSystemService (String name)
+                Return the handle to a system-level service by name. The class of the returned
+                object varies by the requested name. Currently available names are:
+
+                WINDOW_SERVICE ("window")
+                    The top-level window manager in which you can place custom windows.
+                    The returned object is a WindowManager.
+        */
+
+        WindowManager windowManager = (WindowManager) context.getSystemService(WINDOW_SERVICE);
+        if (windowManager != null)
+            windowManager.getDefaultDisplay().getMetrics(dm);
+        return dm.widthPixels;
+    }
+
+    public static Rect getViewRect(View view) {
+        Rect scrRec = new Rect();
+        view.getGlobalVisibleRect(scrRec);
+        return scrRec;
+    }
+
+    // Custom method to get screen height in pixels using Context object
+    public static int getScreenHeightInPx(Context context) {
+        if (context instanceof Activity) {
+            Rect scrRec = new Rect();
+            ((Activity) context).getWindow().getDecorView().getGlobalVisibleRect(scrRec);
+            return scrRec.height();
+        }
+        DisplayMetrics dm = new DisplayMetrics();
+        WindowManager windowManager = (WindowManager) context.getSystemService(WINDOW_SERVICE);
+        if (windowManager != null)
+            windowManager.getDefaultDisplay().getMetrics(dm);
+        return dm.heightPixels;
+    }
+
+    @NonNull
+    public static Point getLocationOnScreen(@NonNull View view) {
+        int[] location = new int[2];
+        view.getLocationOnScreen(location);
+        return new Point(location[0], location[1]);
+    }
+
+    public static void changeStrokeColor(View view, @ColorInt int color) {
+        if (!(view.getBackground() instanceof GradientDrawable)) return;
+        GradientDrawable border = (GradientDrawable) view.getBackground();
+        border.setColor(0x00ffffff);
+        border.setStroke((int) dpToPx(view.getContext(), 5), color);
+        view.setBackground(border);
+    }
+
+
+}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java
index 81fb234..08efe04 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java
@@ -1,44 +1,71 @@
 package net.yazeed44.imagepicker.util;
 
+import android.Manifest;
+import android.annotation.TargetApi;
+import android.app.Activity;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
+import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import net.yazeed44.imagepicker.library.R;
-import net.yazeed44.imagepicker.model.AlbumEntry;
-import net.yazeed44.imagepicker.model.ImageEntry;
+import net.yazeed44.imagepicker.data.model.AlbumEntry;
+import net.yazeed44.imagepicker.data.model.ImageEntry;
 import net.yazeed44.imagepicker.ui.PickerActivity;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collections;
 
 /**
- * Created by yazeed44 on 11/22/14.
+ * Created by yazeed44
+ * on 11/22/14.
  */
 public final class Util {
+    public static String[] PERMISSIONS_STORAGE = {
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
 
-
+    };
+    public static final int REQUEST_EXTERNAL_STORAGE = 1;
     public static final TypedValue TYPED_VALUE = new TypedValue();
     public static final String CAMERA_FOLDER = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath() + "/" + "Camera/";
 
-
     private Util() {
         throw new AssertionError();
     }
 
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+    public static boolean isStoragePermissionGranted(@Nullable Activity activity) {
+        if (activity == null) return false;
+        int permission = ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        int permission1 = ActivityCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE);
+        if (permission != PackageManager.PERMISSION_GRANTED || permission1 != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(
+                    activity,
+                    PERMISSIONS_STORAGE, REQUEST_EXTERNAL_STORAGE
+            );
+            return false;
+        } else return true;
+    }
+
+
     public static ArrayList<AlbumEntry> getAlbums(final Context context, final Picker pickOptions) {
         final ArrayList<AlbumEntry> albumsSorted = new ArrayList<>();
 
-        final HashMap<Integer, AlbumEntry> albums = new HashMap<Integer, AlbumEntry>();
-        AlbumEntry allPhotosAlbum = null;
+        final SparseArray<AlbumEntry> albums = new SparseArray<>();
+        AlbumEntry allPhotosAlbum;
 
 
         Cursor imagesCursor = null;
@@ -47,7 +74,7 @@ public static ArrayList<AlbumEntry> getAlbums(final Context context, final Picke
 
             imagesCursor = queryImages(context);
 
-            allPhotosAlbum = iterateCursor(context, imagesCursor, allPhotosAlbum, albumsSorted, albums, false);
+            allPhotosAlbum = iterateCursor(context, imagesCursor, null, albumsSorted, albums, false);
             if (pickOptions.videosEnabled) {
 
                 videosCursor = queryVideos(context);
@@ -55,7 +82,7 @@ public static ArrayList<AlbumEntry> getAlbums(final Context context, final Picke
             }
 
         } catch (Exception ex) {
-            Log.e("getAlbums", ex.getMessage());
+//            Log.e("getAlbums", ex.getMessage());
         } finally {
 
             closeCursors(imagesCursor, videosCursor);
@@ -68,6 +95,11 @@ public static ArrayList<AlbumEntry> getAlbums(final Context context, final Picke
             album.sortImagesByTimeDesc();
         }
 
+        Collections.sort(albumsSorted, (o1, o2) -> {
+            int o1Id = o1.name.contains("IMG") ? Integer.MAX_VALUE : o1.id;
+            int o2Id = o2.name.contains("IMG") ? Integer.MAX_VALUE : o2.id;
+            return Integer.compare(o1Id, o2Id);
+        });
 
         return albumsSorted;
 
@@ -138,7 +170,7 @@ public static AlbumEntry getAllPhotosAlbum(final ArrayList<AlbumEntry> albumEntr
         return null;
     }
 
-    private static AlbumEntry iterateCursor(final Context context, final Cursor cursor, AlbumEntry allPhotosAlbum, final ArrayList<AlbumEntry> albumsSorted, final HashMap<Integer, AlbumEntry> albums, final boolean isVideoCursor) {
+    private static AlbumEntry iterateCursor(final Context context, final Cursor cursor, @Nullable AlbumEntry allPhotosAlbum, final ArrayList<AlbumEntry> albumsSorted, final SparseArray<AlbumEntry> albums, final boolean isVideoCursor) {
 
         if (cursor == null) return null;
 
@@ -189,7 +221,7 @@ private static boolean shouldCreateCameraAlbum(final ImageEntry imageEntry) {
     }
 
     @NonNull
-    private static AlbumEntry createNewAlbumAndAddItToArray(final HashMap<Integer, AlbumEntry> albums, final int bucketId, final String bucketName) {
+    private static AlbumEntry createNewAlbumAndAddItToArray(final SparseArray<AlbumEntry> albums, final int bucketId, final String bucketName) {
 
         final AlbumEntry albumEntry = new AlbumEntry(bucketId, bucketName);
         albums.put(bucketId, albumEntry);
@@ -197,7 +229,7 @@ private static AlbumEntry createNewAlbumAndAddItToArray(final HashMap<Integer, A
     }
 
     @NonNull
-    private static ImageEntry getImageFromCursor(final Cursor cursor, final boolean isVideoCursor) {
+    public static ImageEntry getImageFromCursor(final Cursor cursor, final boolean isVideoCursor) {
         final ImageEntry imageEntry = ImageEntry.from(cursor);
         imageEntry.isVideo = isVideoCursor;
         return imageEntry;
@@ -206,7 +238,7 @@ private static ImageEntry getImageFromCursor(final Cursor cursor, final boolean
     @NonNull
     private static AlbumEntry createAllPhotosAlbumIfDoesntExist(Context context, AlbumEntry allPhotosAlbum, ArrayList<AlbumEntry> albumsSorted) {
         if (allPhotosAlbum == null) {
-            allPhotosAlbum = new AlbumEntry(0, context.getResources().getString(R.string.all_photos));
+            allPhotosAlbum = new AlbumEntry(Integer.MIN_VALUE, context.getResources().getString(R.string.all_photos));
             addCameraAlbumToArray(albumsSorted, allPhotosAlbum);
         }
         return allPhotosAlbum;
diff --git a/imagepicker/src/main/res/anim/cwac_cam2_fade_in.xml b/imagepicker/src/main/res/anim/cwac_cam2_fade_in.xml
new file mode 100644
index 0000000..8ffcea2
--- /dev/null
+++ b/imagepicker/src/main/res/anim/cwac_cam2_fade_in.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:fillAfter="true">
+
+  <alpha
+    android:duration="500"
+    android:fromAlpha="0.0"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toAlpha="1.0"/>
+
+</set>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/anim/cwac_cam2_fade_out.xml b/imagepicker/src/main/res/anim/cwac_cam2_fade_out.xml
new file mode 100644
index 0000000..901a907
--- /dev/null
+++ b/imagepicker/src/main/res/anim/cwac_cam2_fade_out.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:fillAfter="true">
+
+  <alpha
+    android:duration="500"
+    android:fromAlpha="1.0"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toAlpha="0.0"/>
+
+</set>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/anim/down_out.xml b/imagepicker/src/main/res/anim/down_out.xml
new file mode 100644
index 0000000..87a48b3
--- /dev/null
+++ b/imagepicker/src/main/res/anim/down_out.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:fromYDelta="0%p"
+        android:toYDelta="100%p"
+        android:duration="300"/>
+</set>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/anim/fade_in.xml b/imagepicker/src/main/res/anim/fade_in.xml
new file mode 100644
index 0000000..ce0168f
--- /dev/null
+++ b/imagepicker/src/main/res/anim/fade_in.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromAlpha="0.2"
+    android:toAlpha="1.0">
+
+</alpha>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/anim/fade_out.xml b/imagepicker/src/main/res/anim/fade_out.xml
new file mode 100644
index 0000000..834565d
--- /dev/null
+++ b/imagepicker/src/main/res/anim/fade_out.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="50"
+    android:fromAlpha="1.0"
+    android:toAlpha="0.2">
+
+</alpha>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/anim/slide_down_enter.xml b/imagepicker/src/main/res/anim/slide_down_enter.xml
new file mode 100644
index 0000000..410ec4d
--- /dev/null
+++ b/imagepicker/src/main/res/anim/slide_down_enter.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromYDelta="-100%p"
+        android:interpolator="@android:interpolator/decelerate_quint"
+        android:toYDelta="0%p" />
+
+    <alpha
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromAlpha="0.0"
+        android:interpolator="@android:interpolator/decelerate_quint"
+        android:toAlpha="1.0" />
+</set>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/anim/slide_left_exit.xml b/imagepicker/src/main/res/anim/slide_left_exit.xml
new file mode 100644
index 0000000..16ca389
--- /dev/null
+++ b/imagepicker/src/main/res/anim/slide_left_exit.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="0%p"
+        android:interpolator="@android:interpolator/decelerate_quint"
+        android:toXDelta="-100%p" />
+
+    <alpha
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromAlpha="1.0"
+        android:interpolator="@android:interpolator/decelerate_quint"
+        android:toAlpha="0.0" />
+</set>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/anim/slide_right_exit.xml b/imagepicker/src/main/res/anim/slide_right_exit.xml
new file mode 100644
index 0000000..f4ff8df
--- /dev/null
+++ b/imagepicker/src/main/res/anim/slide_right_exit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="0%p"
+        android:interpolator="@android:interpolator/decelerate_quint"
+        android:toXDelta="100%p" />
+
+    <alpha
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromAlpha="1.0"
+        android:interpolator="@android:interpolator/decelerate_quint"
+        android:toAlpha="0.0" />
+</set>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/anim/slide_up_enter.xml b/imagepicker/src/main/res/anim/slide_up_enter.xml
new file mode 100644
index 0000000..2884c80
--- /dev/null
+++ b/imagepicker/src/main/res/anim/slide_up_enter.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromYDelta="100%p"
+        android:interpolator="@android:interpolator/decelerate_quint"
+        android:toYDelta="0%p" />
+
+    <alpha
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromAlpha="0.0"
+        android:interpolator="@android:interpolator/decelerate_quint"
+        android:toAlpha="1.0" />
+</set>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/anim/up_in.xml b/imagepicker/src/main/res/anim/up_in.xml
new file mode 100644
index 0000000..8b68bbf
--- /dev/null
+++ b/imagepicker/src/main/res/anim/up_in.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+<translate
+    android:interpolator="@android:anim/linear_interpolator"
+    android:fromYDelta="100%p"
+    android:toYDelta="0%p"
+    android:duration="300"/>
+</set>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/color/white_text_selector.xml b/imagepicker/src/main/res/color/white_text_selector.xml
new file mode 100644
index 0000000..7beea80
--- /dev/null
+++ b/imagepicker/src/main/res/color/white_text_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white_70" android:state_enabled="false"></item>
+    <item android:color="@color/white" android:state_enabled="true"></item>
+</selector>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_action_facing.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_action_facing.png
new file mode 100644
index 0000000000000000000000000000000000000000..953c353128ca879b2872aace14ce7b607a6cee43
GIT binary patch
literal 870
zcmV-s1DX7ZP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009mNkl<Zc-rk)
zTWb?R6mHd8ttk3ZMX8EL(;CSAswqa4Vry+`B@r(mZ3U$dn$n9XUZSOfSbdO4(|_yt
z$yprY?Chqb$qIAeusgGJIp4X>obBtgWXX~xOO`DCrBbPMD3M59apO=ZG#Cg$)9LiX
zR4VnFoJ=MkJN=nVW(41M+!!EE2Lb>DUje@ZPeh~9VF;eV`x3ysH37hwH!}Ah#@xBC
z0m$WY$EZzgTmgSK3GJ5wpw=z-Nr2a}Vbev++u&FDejDv;e6r1c4-m^;0RV4VHE8i8
z<G^L!2)_pw0EL5=hd2iBW9VB%n`0OA`TUr~&X55_?*P!9Alz9Ia<<jI*pA2JWyKQB
zpaH0f@S_IzBFIs(P%TgZkdY=Oz!y9Mb%EnJK4=ygcg_cob6`a*FdnoZo)W?4J#ziL
zSZXS00RC*A&1NsVoe%8icLA`hvCe8wvk+3{d9lK@E(@_={QsN|B>L7mDrh7UImj!6
z-*W&O{Dgba5yui}Kc%MmL<+scetzdT7YlU;05yb7o?+1j-fy;Z5@X(H#}ci?emCLW
z008(^o*%_x@r0+~^?H3DgsV!v{>FPurBd174ge+J^L9CnvDf*OcGF|tnr5#H__j%9
zavjR(3IGG{i55TTTt`{7DnZy$#{Lg<`xOd>!>l_5=zY^2pIYC6|Hgt=>G3Wl%H1*n
z*idqHe~<t`rmEu|CIA&B7?*qn4uI}uoy)c9T8dl~u7f4TeNh6d!P++#i=8nP@ducB
zz!y6yI5N+1>^<qYwG-sr&p46wEd|nKmG?|%%<rnk1;DmcTQj<><;RNQaQG+`6~SJ2
z!RxKn8`>`!%<Y(MPAs6y^}h&+g$lT=rbia-RDvdRodVwyt<HiUVcv5o^0y4vk01Dc
zV^=Xrt#Ct+GEfKbr`%5al{z}x<{BIHci&p~GBLG^g-bl4WpS?peUn;m13*J^eOXTO
zz0HDjGnR(@AJpnz6oU6Cbv*rB1mxZ51*Sd0^A0%2QWQMUs~=ngYFUXB{N#W4FBF1*
w#icJDw8PIA@p45F_P4erOO`BIva}2O4WpA{6JS{%>i_@%07*qoM6N<$g02>o<NyEw

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_action_settings.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_action_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..acf1ddf85b3388b4fb02a683664d7599d96ebfe3
GIT binary patch
literal 453
zcmV;$0XqJPP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004uNkl<Zcmd_r
zJ!?~87{}qOFPMOR5&Z~?+R`dj5p>bdAc8oEppaIOE(LXPbaD_uiXgfuI0y=Ui?$Rg
z3N9|rijvq&CiQlchlhJevpDqnjrr%mb8?c{t6qzumxlIL6n!zIh8<DVGj1p|qUwkN
z&AVX|FzSw|S}_8ca?`Awai4{4&zyF~mPq>Gl(U}e3LlM0Ef;V2BeJSjZb=;SQ|z+u
z4yaibL-bf>PG6*TZCbM}(t2i;JWOXDi<+RJrJZgbD4Fy&xy-!MTym*5Ce+-mj<=}R
zs*bfH=Sq2RG}Riq#p042E*7&*ne}3EUJe(E*_zBou{bA(tHo?vL#<gJ&1I<(_p6_c
zmfDgi>bs|A+IvyeHm7t#M^wEtHOK?m*3tk?OFDx*kh6Lst!v$eu1NdssLB&DM32-Q
z^h4~jZ>A+~7n2>4r=NU@Dq}tg9ji`Suql$(%v<o(FJa3lxf$2&2aH$|Rm%V-TzAZX
vj*F_phO*C2^-+)g=f7-T>Hn+eg}v!7dsOm%)+nCb00000NkvXXu0mjfkE75f

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_check_white.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_check_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..729f290104788ce25a026cd1842e625ed29469d3
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8ji-xah{y4_S9bF@81T3TmS5N?
z#C(9Q$LV3`iyt|zzNMK?OD+gTJ2maGvJ86jqI1fWJrY@L@@dRh+8HxyC3MfUOIWFC
zSzj(@_&m4jkH)bAn}wUwn%lHbyQcPAEcKb)b;T<=reaCi=lz``&(3vDxn&&?D<LQt
e{CnyjZS^{VAA0!=HDy3|FnGH9xvX<aXaWH2@<NUP

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_close.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a9cd75a0d2692fa380f367bdb41c2420df310b0
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpG*1`DkP61PSG>8J9RwIIzPh7b
zJflYMsk(bE^P@Beu4=(eGmA7oyR_x~a$D?{a5p37g|Cs|p&E~Q4@@WZu3cW0RzKfl
zOG4W1`7<rjzc~9@CSNI%iRiF;JjK{+?eT+CHH@6DO6**0r98#B^hN&uYw<r+LK-=x
z=P)g94o;{k(CP_bJ;t_t$BlC<pY$DneQ8zgpQNAtZt-*3r-keNYU~2KkipZ{&t;uc
GLK6TsDN>gJ

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_close_white.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_close_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceb1a1eebf2b2cc9a008f42010e144f4dab968de
GIT binary patch
literal 221
zcmV<303!d1P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0001_Nkl<ZNXPBe
zOAf;z3`NnvzLLeX&8G5ODmR1D52avmqE5=2A|Dx9cGtDEyoUjkeYXrH%!p%3Q&=_}
zSGgMpkfN|`063v53^Vu4G4*7~^(<0VjHeb~u)GSYneUW}@zm-ISB#p8C_VG>og+*{
z>6z1@lfD*AYSPav7<hhhiWzwai<$J|R5R67ei_2WId<3{l%tn=x)q(;%kPeV%RglY
XS@w-?sj^|900000NkvXXu0mjfa64QO

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_flash_auto.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_flash_auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..95ba4652baf01a5613a4d7c55bac3d71ade416bb
GIT binary patch
literal 370
zcmV-&0ge8NP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003wNkl<Zcmd^<
zAxlG16o9{}C?;jWFx0N_njjcvFf5Dg4>*%mu<iwgmxX5#e}SNg$s!xr2ZMnoVTyu?
zMqN;^aKhnQ+`aRF!S957?-#!G&f`Cj;(nM4C?{f$2MKjRnWQJK$3%RnhQfy0_1MrO
zW1uu~Tyc%#A~sY9Wrj~2yJR>%D8+={m;z;6+yaYoZpDNS@oD3@1q$5bXvKu)K}p2y
z0kALkxzNx#KAE^vGBVEOz7ra%fKs3<&YzpGPzRr~xF#twT*`YXBvixaKwMehEAr0!
zhx`u_MtQ+;M?uXH4>+C}=@)8|>Lg6dxr)!4xKjA8bs4w$ja0!R)BuanI|&2wJ(Pn*
z=$WETXcH_#ZH8?^%U}^Y0*lZqvo@hRzeTspBvb{9Py-8OyG+P2qR3zJ1u79?+5m}R
Q^Z)<=07*qoM6N<$f>ZIG)c^nh

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_flash_off.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_flash_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..89086220e3fc5bb96461acb22f595b7e631c51ab
GIT binary patch
literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002wNkl<ZcmeIx
zF-pWh6vyGO@dVk`-cl3`!FsUNBX|WnFR&L8uVJB(#(rHDJb;zh*oc*5u>=VT!RJh;
zzv(|71Al+5g*@?+$#ykAf?AX9d$rUIq3Au=vaF+yeEjYn8p|GaVw_6UpjxOwC2CMD
zM5((GDp7-Kg=?%vs8lkMZ|aH?XzZ^(9Y&#!n)Rql;?R(KvlWHLsWYLH#rpNBl5#C7
z*P?PUHGtk_*~+X8dbaJcgzBJEY<lQZap)GxsP(!Ibj^EI5V`<5%DwExP81rhYwpG#
jQRrNio@}VnvH!jRWVQt@7HJUp00000NkvXXu0mjfJ12fy

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_flash_on.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_flash_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..5921a0e25dd77b224346ad167c6397e680f1f96e
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8pQnpsNCo5D%L@gY3<X#px+;7$
zao~P&IkQQtPTp5|B~$%0p%o1MhZ!EluoxS>PMH7y&g1K^Z0_sGXdG-j)F>pQfyTJ>
z|5o!}W?q8@($VZuKUOTbuJ-KEtoO4Pu(6deG4I-3yg*sv!qi@7*#iyd*08L&m+HX0
kuxdJ!uEf>dJyQSUI9wQSN{c9q0A0r5>FVdQ&MBb@06Z{9i2wiq

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_refresh_white.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_refresh_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffa7be9337df524557807b421e8f0c5a5f53ed08
GIT binary patch
literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003>Nkl<ZNDb}5
zy)Hv>9LM4B;APNAOe8{k>Ka6ZdoY+NjnQBvqLY`~Fj)kHsiE3P+(RRg*h+08!O+I(
zho6SjasKC2x=Ei$>e7EgnjA%{)Oq895;;7zU`O%rIKd~#=a8g6u?vdBGOxHivmmj@
z2SsC(rUrR3c=XakiVOw5T<}RzSf;7Wqym`bmKJiu;}uh4Kp`07j&E|~7*l3Iq1dB^
zTu9>s4JH+eU4D=YIZR%m*dahJ6fqfvV4Gj$LKWkwQ`9lN>J)WMpE|`oCaq3U#4ITW
zE0|Ncu!T8O42qaFxsbxgOeq30m^#C9;|Oz2LJkaagV|RUlDuFpNhkz^Twxv=Q8Y3%
zT{Eo!X1Kxl%qbr0d^sn}1pV|eL6!nd4OZ127J0_yiFvh;aSrhbdgFjm{S`?zDNvzC
hjS6RMFs3g3C-2Jk?*l<_)DHjv002ovPDHLkV1oL9pSu76

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_remove_red_eye.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_remove_red_eye.png
new file mode 100644
index 0000000000000000000000000000000000000000..329e617e9c7e4036e3a16f19beea3b37531cb538
GIT binary patch
literal 470
zcmV;{0V)28P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004<Nkl<ZcmeIy
zK}%Fo7{>9R<Xtt6<Ek1(q9_Ezwd1U!us(z!BJ&9}BigGA7X`Hp3IfI1r!E6&RTP*=
zyOK)OpoLb;X%}<f!%cB1{@>m6Jm=-`T+Ve0Iitsry1F4fPDI(brtey9^UbnxU5-tk
zr+#S_%%LZG9Z9E${%9RBzdg|T|GT^iM}BHrFl)(vaMoQ?z@V?W=$?iQKxV>j&fhjb
z%C!*ts9&UNBbV86MWF0cxJ^HxX3C5@px0h5x1}V<%g{grRIL0{)>Ob`NIuubXi{+o
zR&wep$dcM`0d)8ftR|>wg{gt%puPjRn;cjGQ;9we<`Vr*(V|%}Q?O`0(MN#}?}M=f
z>dAp&&<yHZ0B#3sUk284>MM}>5z;rc@gkTLpklRcO*d$S<TE+CY~}1-RY1+OX~TfN
z@bNdD7r1IC7unD&(q}XLp)Qj$U^_gM$=suDgxh>}T>(|=N$tz#%xfkUzjlFQI^9qH
zj_Dk_=bR&{dhDQZ$$>{MIyNO^7DH!WEE-dCBD&o$V#J`bQ^y&90R)t%5-bJZl>h($
M07*qoM6N<$f(1_1<^TWy

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_stop.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..090ddaddcfcb2fa5f5ac63b474b7302f43fac117
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;lBbJfNCjiE#G3?>o~HjT4^J3n
oTv-s<?8Yl)n(^SEh6F1^&@-nqt6N?<0#!43y85}Sb4q9e0GC1;9{>OV

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_switch_camera.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_switch_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd43121aac5467f6be4f8b4bf2b2d18115836049
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i0wmS%+S~(Di#%N%Ln;{WPCm$a$U%T%xzNY;
zq9>MeEzbA$VB}n~>IYYh<RfkVwGTd-HJ#Yh(Y;-O!{T$)p#qiZsfF9VxNJ;!X3Ku(
zlaas1Kx0K_eB4BbJ$vSxifHut+>{fra=)hN;x3kcPH6Egw;;c196VWa94gwE1?44$
z>Q1XPO`06h)Z!MF7<{&F*8jVI;xAR^d;g6||Iha0+uMV3t_v3a%{<$;|2gMz?ot-!
Tp!-@t*D`pz`njxgN@xNAY^78i

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_videocam.png b/imagepicker/src/main/res/drawable-hdpi/cwac_cam2_ic_videocam.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a1e9b08ac01f46cbe0360bdb4df44b4ef2d114b
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8fv1aONCo5DD~fy#20U&L)h#(B
z!ykI6D3qD_Io;4La1K1;Gr2x#(fWVFJ<~GIENXQs^-=t2ez7EA?&i;1H(i`^H^A(f
zqW1*D(3YM+#blQkCT=Y`Ot1cL{QCTQy+^HU%hI>?ZbI9;ch0zdSj@HgD^uN(t*u*R
S*WU)(&EV<k=d#Wzp$P!5SU`LL

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-hdpi/ic_action_camera_white.png b/imagepicker/src/main/res/drawable-hdpi/ic_action_camera_white.png
deleted file mode 100644
index 317527f2632424603df6cc98b6a265dd1468f448..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0006`Nkl<Zc-qaD
zPe@fk6vm(4d`9^)B`Auhh=OR_LL?+>VIWZ&Midl5i*~iC78!<yxG+TDi`-P3RtmYX
zMYxR0$cS3FNTEga=e<fH!bIhLeNNBooIB^<t`y?AFq}DO?r+}AJM+y=An|{m#PWiQ
z{{^%f4d}%PCXol&K1cb|K^17ncSyU#cqK-09jUmW)A)v<O<)5v8RLJ!@i?G5Xm*jA
zy_oa+X?Rhf`Azlk*1?Qo6*EI3)+bRCl*Tc(2OUryqeq=+CJc0f$#Ep<4Tu*88A)PH
zS#XmEDo4&FuhQR%X@Bqxb}@2A-MK8*xuDiU@&`7t*WnNDWN#y*y0rvBN$W4a&wdJ@
ztvT-^%(5tvpd(f?k9~}sGyZvcr7Xf5q0eRs%7}TMGE#(>copZANzicMC!b=h8vDiI
zT6J;HBq$e1f4~}L-iHb(CqXmLfK~;x!zzmfo0FitGhhna6jb})KoiQ3?o&Wz_!Pag
z5p^SL1mpm!*q#lH8D6Spdw7EvEQ%twwxuO#YedO4n}dA8ymp3OmDtgG2`W`oalv|x
z_<lA1N33P<fwe;=!KJl@U?z>ocKiLC>}|o%utS@``of$+yTsfc%=-Ob*v?3ELA_I&
zu$@#ee?<1Ni1nMx>OH;2FsZ%mfDQ+gVX-Wl&=s!P9*fYnM@FgMIiS}@6^f&-BM&{6
z$nIw3vbuAJ;#`o8g=26lL}atJ=tp1KWw^#Vp1<qwIVY=SQSjq`ja1+X=bz=1<3~gf
ht2ntrzK@m@^cz}71EJ=N8VUda002ovPDHLkV1f)ZFw_75

diff --git a/imagepicker/src/main/res/drawable-hdpi/ic_video.png b/imagepicker/src/main/res/drawable-hdpi/ic_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..f82b13d24f24e673610967428e51b57b004bb6ab
GIT binary patch
literal 368
zcmV-$0gwKPP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003uNkl<Zc-rll
z%?g4*6ouXQ^8^u8&`Y$aMVoR{xQ|{dsTQ?~9-*awD7bOq`*bvoQT!ta=hi)N5eAj>
zIY-C2io#;CSS;2r$S{nVZQB>ivK}qf)p4BpN9JAE9at~<EtlhY-l)!R7=~Ru?8$oo
z7p^2Q9~Y9asWKk~K?mk_oTrNMQDp&uIjzS0ApxZYAetu!kYrxZMU4hPn)!lvMSg&M
zY)AnV#fA((S!_rEU^U*A#fAg`%51pcNekdJ00S@p1GHDBY1*U#u!!wZC&~aCjy=r8
znJhrEPw!VjkocXBW&(923y?w-%>=0}Wl@~SZR(?$5Wh|&+bSYN1^@$Vi8eIbnl54-
zr#!&0=?eJm)*^h28?-_rh-qdJ0}I^X)>d;D(YV9IlH2So7K_FDD?I^-n@4LtT}K=M
O0000<MNUMnLSTZ{XqQ+3

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_action_facing.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_action_facing.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd4af5d014bfe122ca9eff260aa67c58cc2d397e
GIT binary patch
literal 596
zcmV-a0;~OrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006TNkl<Zc-rk&
z*-8U36s;RB1#!cD0UZP%obIi~B2^SbsDjd>h=SsiTJ=Fx#H9+Zpsfqm{;lUg3L&Ib
zYX@H@aLG(^bI+N(WgHHB*ux$_7@<(8F%Ss!K|1;F^Z6RwZuf#L*qgA70F1`~dJdWN
zdc7tj;rIJ<vS9C?da`&tp7M}_@h*VO6GQ?1z?@deNc$J%aDNBB_)|8F_h)=v7yvcY
zK?s`Y6^-8Ip9uh{TQU0Pa=Ci2J^%tqf?$0m91hpxdDe0Qh;0I3EdYN}zz$NWR3+AL
zt@eP4c}5p=62tz6r38Y(pbK7@))9zABF&Z)V6qViuFfbKzb8U)C#_wT1j>XeL;&(`
znr1H>69Bd$XCxJkM(eOQr;z#`0T>!%?b1*Y0y$Cp<A!0>QU_saWhJO(s1ks!B-Tc?
z;5e{^%_kT!<aK;)J7cL6(H)Nq?Zf7d($M;`_DC!pfizud^}Pa&MPljN?ID{C<`7;h
zbcYe=>OX>yh~(YXWjj0DtH|_I#u)B*DqdO_1b>y#u<ggWeUTfFcy7}wv&Ax|QW9k`
zpTfX0uUim166;&MlBGOxvOy7uHz1y4(AyL_l9lWwS;F74Mph5wz#0ra6uIf{Aw$Bo
zMiIRXn^Ru5l&iQ6;uST1llKh0lJ6HHeAf&eOAYfXWC~szjK||uWy@gEcurVO|MF|b
iFDg_a_OORNN*!Mc;2|Ix{v-_m0000<MNUMnLSTZn{RPGV

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_action_settings.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_action_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..c59419c02b6273e09063a0529d2239784818207f
GIT binary patch
literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003ANkl<Zcmc)I
zKS~2p5XbTF?%MgM6%kJ%3Z6m)(ZZmJH?S}u*oYvKY#{{1LJ(8v3A9iIEwr(gC6$Dr
zcmh|l`UDw<*#}`?m(Q>J%}fHzV<>iUk{yCv=|P(yFM9CIKrv6;vdj!^e)OQ=oM~3L
z<B^DxEm`@+Y0Awy#sr_Zio7$1I`W3EG-#4}?E$JrZU)E103@_b`^75899{kO7(t@{
z^2RKlJsCByQfccj=%5*Pus}~n83}?BI?{HT$JpQ-r)iPM`iW_C)=-Du2h2!G>3Hov
zYMc*TMS6^4Y*s#v8YK}AT(ig&XB4{J=afm7xZ$2C{CQWp)PoCx)G7YcXPY7T1DnU)
UWG_v5V*mgE07*qoM6N<$f<$+V!T<mO

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_check_white.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_check_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfcb55d02bd8b9a70b0da278800e74ad3fac1577
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i08bak5R2aA1PRt12kK)lO>zJK
z|MUJvlc)bXuNjm~`JeuC|Cf3T&Sn4kS-t-Kly_`O{%78>)n(FyvK7-bg!XV<bqYGs
luti|K%&JzAr^?I>3_cwNy;D|IOb43H;OXk;vd$@?2>^BlGsOS^

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_close.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..40a1a84e34f4fb9c31b1dccf1b2bd7f5a50ac00d
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iY)==*kP619lQs%6EAp^x=L~Fl
z``+Hk)n<pB%!Iph+z+<r>=Dm!pL5PtJwWQDwD%^7mKX72vfc*YT)xac;A{}-v*=ps
zr9JO5s)Jrvt$1~wJ<6?Hv?}9?*Yy)i*G<&jSt@L~vF4xM{qD^_8RvC6y^4F&G81Sm
NgQu&X%Q~loCIAp8KMVi>

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_close_white.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_close_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..af7f8288da6854204dcc4e6678b9053cd72032c4
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iGEW!B5R21KC-3Avpdi4K$<+1X
zay^SH!@6{thMdKZi+L1hS^BMZUAdKCT}(HRw{NeWg~AlBHtr3jj>2B5kK^|J))MUC
zlz7ydwCsb8xn}W?^r?}5wtsjdmvX{3=JbT!J9sKPrYmk={m|7^>A|Z*7j^D$`>}ry
Zqi^Z9GQN4ct^!@a;OXk;vd$@?2>?I&LQeny

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_flash_auto.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_flash_auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..636a4ec35faa6792dbf69f32adae08d6a6590382
GIT binary patch
literal 256
zcmV+b0ssDqP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002TNkl<ZcmciA
zKPyL37{Kw*N!R3>Z6+g=xFy+@ve?LLFn9^_XRs=ZQ89ZB@(NJu7mG!T;-=*It<pWW
zr{sI4=hSC<9{*PU^)3N3hLh=jum;#Sob2|2ff0~AxOU@SDuXS+l5EGGY_SAh)PQ5z
ztVVWJ0*8Q6&)%)u(0WpJflrfw)gS*WUEmDBxojRR$WFUJ0~pu310(})#!7p*h;91A
zR16%%F6vPo1Diy^l@tMA=7@k3BH-0T3~UQ^s}gG2-}eo~0G%WkZbCZ%0000<MNUMn
GLSTY!{A}p}

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_flash_off.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_flash_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..4367ecbca128e532be71270be4d2e54ff8b00c34
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i>7Fi*Ar*{AFB)<kau8{GD1RiW
zm{I?MZ48U_-oED>{iKsbc`JDP6V*BFq-C8r-rRVx|Esx<O<kNpow(Yq3lo+x&g_(G
z>SMWb&Q4{Q`OLuS-(4*_d%pWlI;hrKJ5gf7oBI!Ke%!dosB|YX$|0qFD#s6pBkcT5
z^PV)RYgaXM$TXZ%J=n|Iu_blG^I+H0vz)@8)m)us|BcDsr$q6+Z~SJU6B#^R{an^L
HB{Ts5p6X9*

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_flash_on.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_flash_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..a621a7075baa3528deea009563f72e76d659e92c
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iBu^K|kP615mliTQFo>`{6n44G
z6gDA#TZ^VnB4_Z6^->2}b}dujx+MDUeEjd9dtPtdq9Ef@0LMHPX4VB4EDUxv=Y;Tm
wNjTt?c)*jJ%_rf2-`fKXSxZY6JU*V+tyt9m{PKz)K-(BRUHx3vIVCg!04sDi82|tP

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_refresh_white.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_refresh_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..97e42b5251a984f151a3fc469c583c360763aa17
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iqn<8~Ar^vn58C=20?J;<7d+)D
z!|^{xU``;1V%Y-~zhmA4){=|W3l^Ae^mp#jTxxh`k9c8Y&l00n|Cv_|_|7cq>|2|>
zG$hGy&ZUnnds{bdo7Op%Nx$xhX7rv{ZmkRX*#pyC_U6eHJ`TU)xv@j}**}-LJdalx
z1PhjOZFyV+!t)F}KkqyqYqH^3?iERmr&WQ;3qCxx^7H(-OkVWYy^TF;Lj5OneM?oA
zg%#QC=t>h>85EkiR`kE&hK-Z8-{gFG#8k`7Qt>7y-mx$k=phDAS3j3^P6<r_WD;j9

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_remove_red_eye.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_remove_red_eye.png
new file mode 100644
index 0000000000000000000000000000000000000000..58597e91b97dda5cef43b40691793da044e2a662
GIT binary patch
literal 309
zcmV-50m}Y~P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002|Nkl<Zcmdta
zPs&nZ7>4oRAdjLA!j=$GOA!1wD58Z(%>yB7{_)W_5fllEprBcZw1WnQAhZ=d4l}Sb
zdUys07vOb`?)!e;*Hu#Jd+mMYD}4<YdFr#$Ia&JTiCUWO{L9DT$p?iD9@@si4+E{r
zp;dGnU5Wet#PmjH8vRa3@IC!b%hFM4p^0^DUjbe^hXX7l%`r;rb6}gQ7LJh)Xs7je
z{ev>nzW%|BR1L9+G{ZQp&j7wfwL;U}!QM=PpRs)rbnK#@%Djz!t1Z#BiD_-5T{%v_
z|MEZvg<GdM$o_Ssp_a!!I^<(}OOIUSo}P(!l@q-xT_OJgy>h$wK1Ej+00000NkvXX
Hu0mjfuP=*W

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_stop.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..0588f0b4cf92eca1c16aa65c47550dddf8a39099
GIT binary patch
literal 82
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1NlzEYkP60R1<9VK{}u{-2CEW7
em^%|h7#LjB`wN$O|Lg=RV(@hJb6Mw<&;$UT`4g=G

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_switch_camera.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_switch_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6247b3453ba18464807de7525773ae975e541e3
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mvOQfKLn;`P6=ZK1nK&%e)l+@O
z6EE@4`C&SnaENDVTf2a!566_iW{p*hMFoemIu^0*>5{r2I@ftaf#$5^4_KxbF?})+
zWn`Tx!6G5EAb{b-Z1;IeKCeAWEgmW;C>mUqkb4kP)bH5Zc#nbMSMJh7<{NK?1FdE7
MboFyt=akR{02}i)g8%>k

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_videocam.png b/imagepicker/src/main/res/drawable-mdpi/cwac_cam2_ic_videocam.png
new file mode 100644
index 0000000000000000000000000000000000000000..0722a69290367ad1e31ad9a158b9eef749de7980
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1H%}MGkP60R1;(DH$vpoH4+sZ{
za;=d1_qZ+KDSyW`hR}cWGk67_s$?)|s{0<UkIHhe=q#J(#-iOSSkAQk)8Y?H98Dxx
Z8JuGdrFZl`ehf5`!PC{xWt~$(699)SC-eXS

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-mdpi/ic_action_camera_white.png b/imagepicker/src/main/res/drawable-mdpi/ic_action_camera_white.png
deleted file mode 100644
index df7442e44542499e124d1939fe63c7d2a3771194..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 428
zcmV;d0aN~oP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0004VNkl<Zc-oaz
zO)o=16m3;sgOEtXlK6;)wOBS0v5}Ba5*5UzVqqiU2arg_s%&ih0UD8X=T{&sgaxe%
z3yIhiPdQG#@#fB}SM9lZnVB>9%-nhR&IAys&ip2Vw2B0Em`559_@bS`LJz+(f*HDM
zETNI(EMk6wPJ9aY3)Es$^^-b4?VjMbCj>+2!karvdIeJ?<7mZ;a!8Xqg2cEKL~u_k
zi+Zg7OunNVgD{bCj{kdD2Wup+*=`|(b9fQgf<r~+(S}hxqUpcHW!zQvIqGw#7mXcm
zwZIm1RIC?b@-%EMC<yulH9|5VW<InaXKcOTy7!Co86o{`&3M8vI`FClDJ_^Q`Gv*6
zcGzAbj19$2%f#h8f+%_!a}mpEP-(SfNRx*90hwdfe?|*t*~YxZx9z&;(T))z-({^P
zN~<-<igd8f&98)@zy*9R&=_uT#}ZsIif*FZ6%F$mMR3Zj+7zc)a8_lHK-I5?uYCjM
WVjcBpj;U+_0000<MNUMnLSTY3D!z^Y

diff --git a/imagepicker/src/main/res/drawable-mdpi/ic_video.png b/imagepicker/src/main/res/drawable-mdpi/ic_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..a83e91fe795b4c5d257862377c628d45c7b71463
GIT binary patch
literal 270
zcmV+p0rCEcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002hNkl<Zc-muN
z7zLwX6ac}|qetBiA3nSdNFSgUK62#9zC(u&)va2!iW!@o|NsAIf^&e1Hv#b(T412Z
z^wBLpbLI>yP_7c$0lR4E0COyscY*Ary90pH!3MSb4BZ`o<nuFhcL18t>FWR>w!vaK
z{Tu+ylIwBE(Jchdj5=V%J7Cj*I^f{JgLXi=Z@?UYR1ozIm;;dNfxZEA02W8=8j$K3
z$q~DdTSS{_SQHzeH%LH^06MG&IRrd`0z0VOB-;<fO}Lt54Gj%UqmAKFFbY5b05GP;
UCOGLh5&!@I07*qoM6N<$f;*gRegFUf

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_action_facing.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_action_facing.png
new file mode 100644
index 0000000000000000000000000000000000000000..a67a17297df2a983c3dedc378a7256cca469d80e
GIT binary patch
literal 1120
zcmV-m1fTnfP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000ChNkl<Zc-rk+
z2~QJ27;RO&C7w}8j90aoBGAJgS`&<D@CrsLY6J~N<x+vD7)6Ar@rXzeCE&mHJu{O`
zHr?G>YD=fgOD64hXJ_Yo^L_Ij(@@C5!otGB!otGB!os5b2q%-tI=@yZ6xJIlU0Yk*
z8MQ%}CiQ+goj#FDrT+M}L?Y2+BmoW~mhsu`xF6La0K^qcCSVfnA~axUdwct45OEFy
zz0naoXv4S<s)_(is6nXu5lpZT*9+wkTxk!hN%*a3=h3Eg1%P(Uq5lW8ufk-4YQUpv
z5xxl%`W-;%tMPbzUl9T`xc}BT0!{;(6CQ49Y1!uIDluFK`YzQJ0b;UYDP%UAJ&E7%
z;P)Y{dOtq%u~=-Q91|Ln@-qu#2oQE&$G+46d>?f&k8kiE#}%*AT`L+8XFs^b4Sp^W
zB>ci~2StCn(K(|Dz$CxV%*?D4{W>)Fir0!3+%=j2tl$%6r`L9onM`IspTYA<(@o%(
zk_asY@bmx72Ak#KS|K2`RtXqT?0Hg`02wIJ9h$xg&dN=Yp|Xzf81AJU8+*V#kFf`h
zaD&{)*pGz{Tu=CTfS*|PM)uF;a$9gc@6mV2ltAcXBof)A#Qei9{XS!;qsr>v_8GTw
z1kf!ZRNY=eC_E@lK?oP&21z@{<GoCT7$_<Cvl^jrc?n?Hib-@bloc<HmY58Ug2;NW
zcakKSz-68E*oy!Xi$2Xt{t>KriAh|L_J_|!Zbs2)bVn%!h_U9;ZU{RMD;idh`)Bc<
z=>TJS5il$B5b092z!jkDQeHG6qq0)d;UWSo(C*QGtnm3E50kCuePtu=S543r=y*+i
zfli4U{f<%PD&1In^wVU>(<|jcrrD)Kz$f{Do64I6dLJ2qQrmROTVIrDtkHA=AkSX8
zp>lC`G+;z6WTeySJtnU{<awp;13CmGokdKZ@&t7!!hFK3B|MWT)uT`gpwWl4Tp&7+
z6$xjj8Jx({mQHlYn7+~)#0?qq9B{@FbiIKBAUyESt*p(MfJIF;a&vQy!tZCwB`{qZ
z!)Ls!O9|MVtuL@PvK}W~jc4M5_KeXYqeRB}Zm|I_AFKCQ8ktg!#reTaj62Rbc+78+
z0bQx*ea#r?eSqMEr#xf$d{OM4^Tb$1Yinza+J#Bq7vw+1^#qftpvP?J{~V+r_+OgF
za@HvfJQA>~Q_O^xdHP$-e1s;Ia#*^=q>KANSra6B1r|HKO4b^aopPQMt%Lv)N-dEm
z(v|i$)Qko}2y^#w9&Y$$a`Y(b0Z0%6XbKb<>fM9y35}z+RSQ5mU6P+mZb=F2e_~Um
z8|&vkMey7e`EQe4F1LF%V~arGq#dh1kk99Lh1Lp~+skqoclXd*12q74dR;eitVM)F
m78Vv378Vv378Vv3Rf@ks{~<5eDDu1j0000<MNUMnLSTYLWCj8N

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_action_settings.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_action_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..e84e188a1de15564930f961aefb5e591b2fa34ec
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005>Nkl<ZcmeI!
zziSg=7{Kvwv^9nP(593myW&u32Y*08EtU>a9V}f0{{|82kXi@9MRd@?$weK4A^ju7
zLRBcZi6~YV4Y?x0YCBk^ee93}@A5qN9`;=V`Fy9md5-r8<ldugbi6@gt>94+Q7Vwa
zKGHbsTJ3CbB>k$}G!3du63TIxO+;yvI}8$<q{?@uamezydHH+h$Z>@RV#hZwGsJa1
zG(UeLOQIW*%YP$A_S8JsifkZzY=a`Er-+B1U^vMR;-MW*pvdqV@zg66vq)lJDKSEJ
zw`0sxb4<_B;v8FuS(#q`)kg&}+hPL6xOrb?GQ?%fExvFHL!Kq|$LU4WPhFXQ&M?@z
zxR1mtVOeOIy~lo>;tz)rETgf>fK;}TNLegBvB^Ki<JucZx50Yq=l)Tm8tx6cc}R|^
zi>Q=u3Ot|-Y(<ulmTL5&86Z%mm&ju{Lmg48sDHFYW4gvTimAlor9yw~?iUk}pb1)B
zLK3U9z$iVtjd7E}F?|8WGUBNhsE&I&aJCu4@EGyXBTRXIB71C|VX&1V!@m$aV``2>
z2Uu+mzU3;1m}L#YE?|a1uJMlWb*&qR^Q=+kG@*msHr|$gaEk##XL&}z6#u1a9Hidf
vu2=2VHre2#z3N8+Q5wRd6(rV6I@-ivWBUX&LwAlh00000NkvXXu0mjfs0IG%

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_check_white.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_check_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b2b65d26291575f2741d223cdf80facb436dc20
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DK2I0Nkcif|mv{3vD2TKsT6rJ;
zxO0YV_Rhw~KO`R95NK`?{Vrkn{Yy<f(?N;3e#@)NB@7FHGB-T^q@ZduPf%ly{FMLt
z`|GE=_e%0kj%QeNzSCykp+|jrFI~RfJsfvjnDYyhf3^3PM}LZ)disUtTF9#(`KhpR
ya^2eL2_HIJOypH0_DoOssCV#5sZ}haHRI)mIl|jd9moc{jKR~@&t;ucLK6Te9#8TB

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_close.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bc437298ab7bfbfbf128acdf5849e304b3c6903
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DO`a}}Ar*{or)}gqq9DL3|6^j{
z=hBm&C)~N@b{5Sp4w$_m*}geiNBekToKL{TWpQP5xqRwZuPjq53pI^Z3A|FbUaRcY
z{O^J0fmhZ3y?R?;$@JP$iP2W!Cd>8DEZ3V|*s2`1aV~kzx#D@}&nn~61<yHG#mh(7
zE3I3f=I(nvzf0xdSALCyU(F^idwFn~>{Xzi+b(jKntiPo%%5fP`-@uPgu|~7wTA~r
iR9eY#70Eo`TEl2=&Qt5V_=GOd^$eb_elF{r5}E*W<X(IL

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_close_white.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_close_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7c7ffd0e795ba76ed3a062566c9016448795f7a
GIT binary patch
literal 257
zcmV+c0sj7pP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002UNkl<ZSi|j>
zOA5m<3<U)_WPYbhYC;cbm@Wz>jYBNi%A&<@ZO?$P9};P4Y5CjG5$M&YXI45J{s}~#
zf|&?x1_gn4B7+hS@X!l}&!voFhmZP^sujifL@~PKMMM~{6xH}^g$q7WOzwCQ5vHTU
z6`v~H@rlA8e;CUh_(b84zg=+ih`wG<)HiJjzSlQx5#CnjMR;A)R^jtaTa9;7<U8lQ
zY2EPWP3wxUP_XL%>rSy)7O%~`cm?ZjXImW?6TYRT<;U^@VKiSj`soFk00000NkvXX
Hu0mjfhD&W|

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_flash_auto.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_flash_auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..050fae73d640688eb701ba1d29068b6114137616
GIT binary patch
literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004rNkl<ZcmeH}
zuS-Kw7>1vVUfZmS#k641By$KNh6N2`SswTg$dGk|GF%uaC}LSKIjai>^Uz>b5fle9
zP^V~61b@NdV|We@y!Y+{!=4-Nx$k@733ul^qr*Sr>rYn|n~`QS+#W$1o7HBMZ-?ND
zE`H)sYj)Ro(FIv-CarcNs^EzjHrpmY<;>i-q6&)G^zdNv74qiZz>gw$XAqk?X+{~7
z)oc_&8J9hi*8q<jv)+v&NMh5=tI5{^*fi@GVqpbUT;`>j0w5(%nXrO1E{7(+m!0AB
zXr2$k3ET|^1ALg~j(xcr@>A#wBgo>i*z(;4S`cJ|!AZ-vkAn+}xC}{CveF$%<NQW|
z4F=27rL1&X(xqU6GA?jwn!5ApySX*_MKD1UmvL#<aM_S15&pob=pLDG#B~J)&=k~(
z=?XHSDLBH@{EzfW0yG6B&=fq=uPexbrr;c3S1<#bf(i;a(??TKKm%v`C<-#@pfG(L
soav(@D4~Z;A5}pPRb=|;A=9VBH>99+&ewRRdjJ3c07*qoM6N<$f-*b9-T(jq

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_flash_off.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_flash_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..70ba9d28be2ff4f90d54bb6d52dc33c681987a99
GIT binary patch
literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002~Nkl<ZcmeIv
zF)l<=6vyFDp+cg=lp@0dEa29bAa-F7tim1?`u8f04UFE<Npv)>L~|3*%S<xoBqZ}Y
z3;6!Y@yA<Nm%2V1D3)xZGo=-~f8tR!Zv?UXJ5~KbJjCs1YCa%#7ZQa`qK8bPkV*8A
zNfa`P9x{nSCecGCQHUVw2+<3wju0gnSn%$<2w<G}a1;TI6W7E6L*mI+C@>(-2?Pej
zj<^Oycr}}-*+k7IYAP`RUK^1C+?slBL^Sa3ka(g2SAgSKqCIw-c%lIp&<HOPL<8<^
zFhX>z1D{R}JNYJN4ps+l;8&uv&#J(iJ&9G9Qk&V7+L?9#v@f}d(G$Gm@VEc~002ov
JPDHLkV1kB0eh&Zu

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_flash_on.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_flash_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..44a7f41189e1d016bcd4729eb259032927273158
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D<(@8%Ar*{or!C}dG8AFs59~~5
z40Bk#+hzF+q1Z*iSCS<c3jdL7XH0SRbuQvm`M;O(-IeLb&-H(f+cjHv$0yw~dz|q9
zs~Gd}4^Q53am{GzU99bq!1Ye%4FBV!tUivc!5<zx;WC=h<X6Bd=;P>|5GU^&5HRDq
zyO4^?v0olNUj<o3CvLQxrLg!C=L(m9Q|9t}D4ufrUm<iF=wt>@S3j3^P6<r_=nYbK

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_refresh_white.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_refresh_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..1989184b14751617cf6e19e833810f91563f7522
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005RNkl<ZSPAXH
zL2rw30LSs)o^91_9dR=nk*dT=yoloBxHX8w-idWJS{x(}rR=hBkT`h}6H7=l=go{+
zE5t!lX-U3he@{x==lTDO=k|O)QY;p8!Za7T&l(@;@SRV*V3|woS05HMEKaaYi$PjE
zAgkX{01bl)Zt;yU9d3}+9v1mY?#S{A7wcpsitLdqPSc=kgC%mzkYJQUoT1EHx*AmZ
zMQ+H_z_-aPo_a9GJiGLf3no~{x5A_XaFD0;kPFKAN(zNXjX%haEFFv$Sx}^h?5JXF
zGO17$=_4CbG%@BBibV#H4S9?WJcXdZK(e8Nv7`_b2p}6)F>(sT0)b>h9b-n(poNi8
zG-zQY6b*JU4l5e0V&oJJDj3%k4Q4T3<H-?Yyu&yz8>VPt<mHHYjL#%x$32WKrsRMF
z>|orM3o^7Z9?FUlo?v_>EjL`pcT=Gl;SRnlaz&CFzDJ}KfN37%TVq`A$WX`kh6{M=
z!6=v6#<xRS!{HQly0$2BmNfeq=LqL0vrX4~PHK2$sNv!zNA-6|QldkcHdjgLUvQi%
zO$PZwg=6|3NRj6*&uGx5!v~&IVUCnyv6zz|xDIBu=FRP200000NkvXXu0mjfG=1C*

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_remove_red_eye.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_remove_red_eye.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f7b4cc8f24b2f7632cd7568f236c7d765d8e352
GIT binary patch
literal 593
zcmV-X0<QguP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0006QNkl<ZcmeI!
zOG|up7zgmr1Uf=m(nVy(2Hi%r35s?}3PL;ag6lx7!4%&@L<E9wAR<wWgkC^mZHf#p
zh2lo6Z5JqWsHU+P&)?O+|L|~_8R3tM`8><#`8vnng>!UtbleXE=B(Ruq2mABs<^Oc
z-JECL(G$w{-ALkc<6H0O)0U@vs3K{iu6&?hOLE@!r=*3tv>>NR1z$<ps4op_!fSpD
z!ZjNvm2~M+GHFvSnEKVLvU$_LLGV)rX+=B1WYvTW6Ry({b&Fz@)r0?aOw3FE3Z7|E
zmU57&cp*OXKZT0}&|}rHnwldk@&MsNT|{?dGu+w&;5laxbxsulL#~75$5O^6L2Uqf
zoTYnCbOW}+?5GAFa~cj!0#?KBGGHp~{vfAeRuWbTa2$3I0mE_Hw1)5E5nX^<*sTKc
zaoYYP{DGP5C2|yY4*(-^+LVTzlgv$C3A;;x>9G5~oCe+qhc*Fur@<-d25g7f*QI<C
zUbG^h=p^;$3xHC1(LR!<&yT_2X8`h+9jdB2u%sKn=RxXRufU7pE3z!hyWuPJc`;+b
zfvhWwv8)~(-ccDQ{1ZIWjv;BKaB==NE}K{U5(KYpnKCRdZ^X3iaBF||vL+1LleAI0
z1~e&W-XD?{>UVExQNQ<_{5HDuo+q`X*Me^{J{{}6Ht%tF^o&_+cAdNO-)&tv_k}ex
fp4QRPaUVPY1vc-$n*zk(00000NkvXXu0mjfH$oNV

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_stop.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..b002ab78c9e23934f3efb6077312bbb948e21c8c
GIT binary patch
literal 99
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tEl(H6kP61PXB~MN7&wj?{F%+h
syXV2AGN!OSY+sC+A)xuoLE8q#b^mSedpm4T2kK(*boFyt=akR{06NMVRR910

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_switch_camera.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_switch_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd4e074b2a1649777ceb47df15331984078dae68
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpYEKu(kP61PQw_PA9RwJbTdnsx
z^~BQd>?N-q_hZCQuutOu(RNtx?$Wq&!932U88h>`8NcQ|?YT2^rFMFrNzqeZ)0)DC
zjVC5&oo?>qwGwK*^}<O>!6Rfjr(<C|SJSKS9Si&CRXEKIJnL4JtsyLVr9?qWv+-O)
zn?VrM+{Sr{sr+tU3yh;(KJh6YU;OsNCfWJ*?aVKCD5*y(ch_J2m-W-1qv>^d$P5md
bY4-8c9H%{PKlLI8=xhd0S3j3^P6<r_(3)8D

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_videocam.png b/imagepicker/src/main/res/drawable-xhdpi/cwac_cam2_ic_videocam.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0a3b44d154ae04a54b04ceac0d7322a08f8bf68
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DB2O2`kP61PR}XR?HV|;Rct645
zWyYzqyE;z>o>WZWp5|eY|L&jo;#5mPL4U6McTOHmZB-Ae5w@=^n%`p0d}uD?!*dM<
z=?*)L74Aq1yyLZKWV!a=SF$s9e%HhsKX=M?+Rr;9?Ej|p?+f`WN1n^Oxahp&eQwIR
UE#vBiFre)Wp00i_>zopr08juyvH$=8

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xhdpi/ic_action_camera_white.png b/imagepicker/src/main/res/drawable-xhdpi/ic_action_camera_white.png
deleted file mode 100644
index 90f3fe0782439c12589ddcba95ec4903d6db6cc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 851
zcmV-Z1FZasP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0009TNkl<Zc-rk)
zU5Lz46rbIhT|-ifwcDC($OA$`?1PjCN|9Jwl$5-nkn*ua+1M0q+nTlH>wy=-JlK7Z
ze5Ccjg9mmcHnuFWm|?JX*4Upj=YRd@<9^J4K9u52&D{Svzk7c7-v7PloI5VK{_Mx~
z&k+=$F#iN@EWiP@p$mP8$yYo@02TQmn1BZKLYA9s9fP`bL?&YyP9qAHL@|vKr>Gr4
z6Gmo3uofZc<TxW{;-`4-MRleG8=;pVMlt4YlGYDTCIn;YRqA95BWfglE4)q!+?dS2
z`!w#K@JNTETVZRHXCV{#@t8<lG@5QD!6GAlb2@@m4BMR0PL^wI@!^|x0c%VIqw#@3
zAH~MIlhQeYNvywM*aGj#i<Y3-h8^SQ8TLlB<S1*aFbI?Qbp$>P*q|Sn%DR&Y9p7OD
zN23QYON2Zr2@WU0Zm_NtpKQ$r)~rK%saFvcq9+BmjP={a(?gD<!|}!eK~Fs9#tEt<
z*mD$<zKCLHOy=jB4{8-7*~ykA)Vi2^!nvv-2vbCj*)C(8)O9@i4T}_z2|AR(vurC;
zj;`K7&?yrHmB2yF)=uB_!b38_fChTcu)_K+8<h$4r*n;=1i0^<Agm>Lg<)EXd76O*
zWrAmhS5~KVUd-R;l|4FSf>r}TA1WpH6KV6tek+u@?@I2KU4Yyy=GI;X!R}lM7AB-m
zFJ4Lnb7TTH-Z}_l)(dyzk$B$9eXAu@focXv91vJrc2mNEvhvsMB-BB5KB%NLW0rQt
zm59V@NsGvR@fxr{v7Ag^*%L<hzr#jT%8{C$(zj8clS?Vx>*X9{rbzR=B?^X+NUSBM
zvSqc_eHi78xUR6RV9PdcFHcu^wP*--v304^_5wr5=Amudn7*>}Pyr}Q7YBx7Z9v&0
zme1{^`1LBnhBfgW+6DZgyNIaIsfP+Lxr8ahXTug)pXmi;rG0gZiX!Zc)_E2e5bHoS
z;JaN4&PpjG<8@q?S19XKj{V|3)2?v-8i(krl9zk350~iP5Txab(t+xvBBvH}<00+;
dUkQIR!7rMncdCJE1gHQ2002ovPDHLkV1k}flYamJ

diff --git a/imagepicker/src/main/res/drawable-xhdpi/ic_video.png b/imagepicker/src/main/res/drawable-xhdpi/ic_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7c5c1956674f26f3fa69466cd3e9b8b67199264
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004yNkl<Zc-rln
zJx;?w5QS4A3Pb}Da0d#+K`1x~bd(enG)U>V0SRHNAX2Vm$v?6s-1<Jem0VcPI`Kvn
z*_rpGX}lh5=kxApe`YeFD2k#eilQh=y^5l^&hvZ*Tfx?cYUrndJy~nd{yX>-R>xxK
z^P*{*lh9a=F-IE@@xiy4g74T}NbqTzPT}*i(U4`?XN&;Q?}w1!-Kc@z(l-K@kpg%e
z6MT{+=XihK`so7Tg2$i#==kXY&>8l%Isk3Ln|u7^189f+V!%%}fL_AW1z<$*asdn^
zJRJbGBs}>5b|gI60NlF1x5!Zk;CBxnQ2=TJAOHd&00JNY0^mYOD}Yznms$XBGi0s3
zaJNNj0kj7pmjMuD9*6`$kb5NNro)JwAp1~s1O)lV;yV(fj*F2kIYH0W*Z>4wm!qDX
zpznITmlH$*7+oOInGRk6vq<*>_kkrcS8o5{E0VfFLl#+)l&PxfG_*(xBjMQFP?qH_
zKKc&(Ipi`q*f;Fi&1)7nQWQl|6h%=KwU7P)FExm+3WWUd00000NkvXXu0mjfZ&1dv

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_action_facing.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_action_facing.png
new file mode 100644
index 0000000000000000000000000000000000000000..55f68b6061eeb8a682168f773b204211f4793e38
GIT binary patch
literal 1717
zcmV;m21@yfP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000JjNkl<Zc-rk;
z32z%k6n3EDNIAq!fr_I6Q!E_YiS3v;mANXVYD7sf6cup<A}EDIAe1It7EwyuK+EAk
z`M11JdPdvPtUWus>p1rJNl)3>yR*CRn|asFIFlg=f*=TjAP9mW2!bF8f*=TjAP9mO
zZ4`^e$7g0{-tdufxqOfs3}9+%Dkn;L(<Y@-DQ~-`P$;}0%KX<yq}?*L9)Rd$F-%$0
z)6*wNK%WT^rSC}3{}M`;;|ZM8Y&LJ!k+KMp@6Y-YAZ>osX~#pJ8fF4E<oK0(y?#&U
zI~<F$kIQ#kz6wuL#P_^BbOg-K&OTACRv+s8-)J=U2@wT(;m@SE{xb-Q56G)SYl`yu
z{DZLhB9{hC=|MR*R7%(0UX~YIjoaICy~w7Rtn&~Yr!azshXApsGoqm1;wVHE{g=r5
z($;giT<#Y09{3E-8|UC$5)gpA%xf_ee_j4A*J`zUUGE2nj%)N<65vY!da{h1sx&d?
zaoaIzqaxBK0UiXX8OhodE2idA`L3ak`~;5inT;s4;c1dan*i<kH$W757&(N^wBR$j
zW*z64*P$&Bb2PdHAcHk~y(n<WCDMVSajr2M#?U4SaFceWQn}CQ`AZ%qY{_)YD1DHC
z-m+|%k7s?N8H^Umybl}Cu}lJbEADy2bX<s$uw5`lQl12KSJ+NIpWh$o{Rd*k@@Vrw
zpuLF*W@sb{xM-N4dfbc_Z5X-176}M<oExqaI1!xjqCx692?&?(44ZvCE&(9Xc$N(k
z5N<AhF|M0Spr|%yIQ5Gppo<gE<#Km)uEXR_+%hxf9s=_a`=!0VNkA8oBy7sC*=sQz
z@LI4fwC(FVMuq^f*(-)0nDiM1xTa7jJZ-eK;+sj2QX;k!G#kFo7}pph>HY}jXLJcr
z63&>#G}vU9k)Y=svlQdb#Hl5X;(WlorL25N<m)cw=&x{&rHnlvHKQJQ0<=spo8o-H
zj!_r-zc&|)#RqV2Id4IZ7jO&{W1Emc{U>4-bZ`m4OCmbJDg;~UAV~r`B#2W!lJT69
zM9=q8eiQ=aytfc2v|6p3Qd2zQae1f@Eibd>a^pCY@*STLT+rq6ytpP#A<vZnxzC?^
z{!i#E^8a{ZiidKw9@91y@&}Zf&1UaRa|BpS(kCLNV8zr(vP2K1k9~W+4*_y+%Pc5j
z8BT2FHyVxGuyEG0L<A$@?zEk7uW3hlhHa4_M1GXdt|YxOF2V>HM<+E&#}w$~<m9d1
zJzp9)XHFFgvo#-koHPObkf=@=NuRm+O#c4@D*}DO#yLxmEBTJ5N~Q7)V)H#FS&#R8
z(qgV(^oe%Xj7C1q5KfTJdfL$4x(@-HF1uF<tMyngbhqh4!1sntY$Y0A4KI*;oHxw(
zH$DWsXRA_T`w(^P-ut~XYPql&5*@4tw-pgL=1XSchr*!bCy)8$0Q*co5McBwJbO~3
z0r&EH$N_<b=8uT-*BqBvM)KzQZslLyl~T8DmWTo*E1Fp^q*_l&*w#bwqN5MObR^$h
zu2!pe#SN)mcPJ5T!_MJ>e3CQ}(21Q<YSyaeK%!Qw-Hw&ky|!7QK7^bg5vHZVQ?65h
zSl5G|9JW@!7Xd2QG~*tm3h=x<*I6B@y)x*lsE#H&++g#g?li#;NJLZEgpKNCn9r~f
z(0P%S;0lR;I8vAlWWd;>il{H@E>48+QL46)07oe|_%=p0b6bmhCozG7J;SJ`qUaY!
zE);-Gd2yZ_#N!@NF6NqH8sOhhI!28Oc3l1<cE93VzSbT8OR48dTBNIr{G3F=3zOtJ
zWUu$wlG=2AIqZ_u(TCo9P0dC-%7lExclcaQZhzxmdC_TvU;WzQj<U1M&(Fm9ZHXuy
zM}5MfU3XHjd6=fej8NRA<Sx5s@Ea4|!qqeh&{1_VH9H^ISt}VYK?(A(zo%HMKOGij
zB~1X<tIFTEu~WyZw!h2i`9X1_M?~Jm%4gW)n4_evvrpq`i~#jFmoTk~j-;DA#xlbK
zoxXb*zmOuwN40jo>ZqJ^E<@ji09Ew1Zhu<Vr7d~g95_4*cO+$^hq<{7hwrKw9dV}+
z7U~k3qq;n$glR*Nh>Ug*l|6Qc09^&qL<~<Y^_c)niSFeJ>7D|z;eg_QMd^a(p^wlV
z>?q{DV_R@V^r6H%l)q3&5ClOG1VIo4K@bE%5ClOG1VIo4vAg&W6i5OSi8oSB00000
LNkvXXu0mjfO-3y~

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_action_settings.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_action_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..3023ff8daa925ac79e863caf679d03c56c3afc93
GIT binary patch
literal 827
zcmV-B1H}A^P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj00095Nkl<ZcmeI%
zTS#nG7{Kwr=gf4dbBc31j(SK(3$aW@qz6M1B7)w6AW5PS!@`2<q1T{{oY64C>>`06
zl!7Kix5q+Fq6=w?Bq2zRX%{Q=l9q~JFAfaD-fMk(ql<y&_kSK(%&fKcn!U)&%gb4}
zvV!=O;%1!dLJU2Rb7P31VVs*q41I-j+lZk*ajXQfbQ!0b5KFh?)FX(chjA)_SnA}2
zonf4H2B;_7IUeUH#8Qe5&XMgl-r_e#C?K$Q<hZYC=R9dGq!494@&IWUc#Ln5<5~&m
zI(|hm+T;!DDB)uyU>{OMJp*hZ8Le@FKzb36b`fRvPbJZ#ihbmi`-huQ`v`H+dnnz5
zIO;AGB7BE9YM!%LJ&ic*2`mcPKpgfvmoR!03D^-c43Z$hAhR4H0ecmL8#qMtu}v3c
zWQvny2hqm?F?<yT+WJ1F6fbcm5p_FU#GsK?MAZlp{6rZ=RISi}MKKeqZzqCDlqtm8
zC&W;Q&}*GLrP#!+bE%uNsNHWo#CM_5jrg|7eFRj^qVGa4L!;bx6Ih^%5FSK4n?Y+1
z@vNCpo<TetL~97~>?uNd0r4z>Rub{-SwiV_KcJlc$@G(Y7OnY{oYXaZ@4M{dXjJ$v
z`$eh=sKvO?Cei3I?)A;6Md`CXq2t(8SWgZw6G7n$pCQ&JiDGgU(}=YRim_<oXGGN~
zQNwWFMO3ZQh(U}!MBNl|yi_oasQa5s__`AC2)jc!<ynL2VHeTIK7|;(7UGaU#}G-9
z3^5<#kpBus*YgMBuyrnC@g(A~4y+<9AddQ$Gbr4RIO<N6-bWlXj#?%EBB$IQH=@T&
zKKqV@XxskJ#qL^uK{DE)j~ZfpfCOxe%hb}(Us;cg^Wopse@-h`lh({KqHKwKNxOzN
zz6k%G9|{;|g??(u7UfY=h@~HBBSN-1UT2NBDZu^J0#3CdmL9^XI}l3^|MLqx*vhRd
zPMARqeTj3Uh@p3I?nT7Vb2xVk%N%-kz!H_@<>lq5{{Tt>$z%L(Sw8>(002ovPDHLk
FV1g%Ge~AD9

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_check_white.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_check_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c2ad771f72c8beaa5adbff66526893d8767990d
GIT binary patch
literal 276
zcmV+v0qg#WP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0002nNkl<ZXx{DC
z!41MN5Jb_ffC?av1VZ#j11XI{NP>i*jo}i373|mq*}I4NcaPr1vPBqUj4{So^{}zU
z+2V@M76*V4(wk$0gq_FHCw*~rLF6PjJvrp8;xy!tvzjxILyidcxS;vzge%E8;0~bA
zCza(K@t8(4No6@FJiXx|O)AO}!Fe{GAi-fQe6!HylPYi`B&W#9B~|3)kkD4;1WDtE
zgcdi2M<Pa2;>1XboCryi6C~+>FcwG}oCT5=CqmNX1W4MP8OZ|2BU#~0BugB|7-NjF
ae|iA|xq+-YC!0F}0000<MNUMnLSTZ0hICK>

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_close.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..51b4401ca053ca8cad6e9903646709a2f44444df
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw{&>1LhEy=Vy<yFF$UwmLV))FX
zs)>sgJ$~x+g}6OvsxLimbaeN-!xQItoH=3nd`|H@dF!kYp_dChV`b9AudQLRn7yg2
zv~UiON9*MGOYAy6D=_*g@;c3(5`S(Hi^X<huBlrXE*Z1OSSv8{sT%UBug&L=pK7t(
zuCv&pv-s5{i}uL^?UU{53W6WasStYJGTB0X+LZ~PA6Ee-z^V>;wk8Ms*3SMP^!WTf
z-E_DAd$kLMWY`Z`);MuKF9=d$?_mzLoFj7Xp~|_3ODg!(3;AT&wLoS^O+0tsvcZJ&
zD(m_$dNm(!9@n+CTyDa$w$*a^-$!>qK3P{4end8+qbAwoFEAV!JYD@<);T3K0RXh>
Be)#|Z

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_close_white.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_close_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b717e0dda8649aa3b5f1d6851ba0dd20cc4ea66
GIT binary patch
literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0003ZNkl<ZXx{DE
z$qj=r5QSk*P#lm(36WTegVW0)mXaWBuxGIk^A}(~iOrs>vMkH8EXyh{JTRapt<YdZ
z%g5OPOz9*vSOM%TB*#HI$#DQ+N5{uWB>iwcq@D(P;=ehLbl?EMKm*m7(@7_siS}}k
zNFtnck{HL4mc!ypcyUoqJV~4rM^fS3C#iAnkyJU3biCmDy`VZLOv=LXld^HVq<kFD
z?a9fxB<XX4q&yriDIcdeP+_;Mu!p*^*Z%aYJkyQ?+?<+r9AM|rPblo1ETro{di-%f
zl%q<zzu!?I#cjXDN%6ZuQBvCGG<+OT=ZKMLTXz8xUbLU)32CH(TIP}7Mjm{kV;p*J
tJagEdX)L^PPO3{9oLiP<S(asS_6B%=VW~4aPyhe`002ovPDHLkV1iG3n$iFO

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_flash_auto.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_flash_auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..a22082120ddb8910d352466084de845bb57758ed
GIT binary patch
literal 638
zcmV-^0)hRBP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006-Nkl<ZcmeH~
zyNeT16o<dTjV}_l5L|4m6fCsU4T4xGqCsQ}Q&>pA(n1W9KR^&4DN-mbB1ljXF@lv5
zS+EWw*s36kiin^FSJnrvkM3|W_mGQwXXX_1O*3=mm*H#X{4x|26y(64|2_uz+3Kd)
zlATZ;Kj+;PXR{J|$r5}dyvEJFBFRRmiJx5~$(>mUeWrq+%OlxKSqOFTvy@LG*^iXc
z7Fu8fex@b!gr{<TFm0h88n-2LhI4X$D{Y}Fepc~KGTWGv^RHCW6dIs$R5EW!NO&vP
zjWmVoXgrY2MF3{xdX`Y4Eksz)FG=kNV6XEUOr|B&MB}9MqE7%&Vkol{gb{5a!edEY
zmDvrMJxWKYgT`hjH7(Oa&U6zYL|TY&T2k|@kZIXj1gGK)_0V}Cse7z(j#-&Mk1te3
zV@J^Mr{W3?(3uH(!iBg(bu>zR2ztVMCKyMAg$M_NpRzBWP!pY-PK}oNm(_fi`_~yq
zgoRjUe#{?@J97UEE8_@t&^h8=i7s^~ahNeIb|J!j$qiYCkLAos=57q39y;q-klYnC
zu1V%6YZot6Md!Ga+k?h_Cv_~XFW0`UZ~Gr?v?bIAOG59c*b-`hC838TmV|z@9V`iT
z!IID%lPKh)*aAyJ&nVdvs(~e;K6wz(UPgr4<b&Q`wuBnwhTdNJptYAJp)Pr%w3i{F
z7WtyIml>fNSQ6@E0HwVw2(__*+g`SW8W=&^3nNH-SrY1E2Wc-uLM<#I?PZ1<1qB*^
Y0SS$V2wyCV?EnA(07*qoM6N<$f;=-5a{vGU

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_flash_off.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_flash_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1fb7a7882dbdf81b33a2950324147850ee9b3ac
GIT binary patch
literal 435
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKNz*yz!;uuoF`1Xoz)|5bz;}6v*
zybOBH_J}X3-g{&BefbwkP1+kS*>)@yVv*jsf9ekAjhh65vS;=@-YR<Xv?SZT!-Dtj
z=jMO>px?LDNmsXbZv1+-tjYx~wPAj;><f<6hTW6a(^EaW-T#23@RC2ZbEJ-`ysZ9a
zC$rnY*XmB=l@%_p0y<I18M8~Wt0(bI_2~6lf<js@*(kcwGy90j+>`)^tWS>Ccb4``
zE_mzteBIN=wo;EOPdN>>xt1qbjxJGu(wKBfy}EM2j4g#OKv7$DL6OOywB4nydMuX8
z3{eJ}{3GPvH2zg?Qmh_|FJ{LxYKm?td{XG(#k!ZNpD9S{MZ0!GJEJCN2@|8H;FqIa
z4O6&wJ-jc+vLw<`KIYor1{3KQcN8m^NPIa|@_o(!Uq98DOP(<tSyKMZ*umfR?$&t^
z&M^GS@xLRR|JK<4#rD@i-Hz*5viy3PrF+46>94G%A?CWex_`_6GN!x`omTw*rztQp
O7(8A5T-G@yGywo!$i8X-

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_flash_on.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_flash_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..89425636098d465734acdb056d7a1ee49e5cc288
GIT binary patch
literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw-g>$?hEy=Vy|FR(P=JKnMdyc?
z_KJVtS{Gc+xh#QmS_0RvEj<TVzLc1#XuC{Qy6f@2np@`XyT8Yd9dr8q>+A0|jdp)d
zCe>c~wc=~w>&4gH*Y-!rZ?((9EpYt&?=SyTuZz7%&22n4#eu(=yJQK=F3Twn`O>Nv
zT7_O@X3pK<H^remn0rewQ><oV+%>TmKAc|+wmZ0cEtu`h`DI%mQ>;egylG-DTsTY2
xw>ns>UYII`+q6c%pxv{VY?GFj{$2i??b=RuQx)Io?|>d>@O1TaS?83{1ONdmgZTge

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_refresh_white.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_refresh_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..1692d8a242162dc878d42fb1b112e918cc25c3ac
GIT binary patch
literal 734
zcmV<40wMj0P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0007|Nkl<ZXa()T
zPiW3@0LSsq#N#yS*<!=N!8V23;xMGNgSgQY&rp_-<==r;yV#x`750Rb+=v6$vD8we
zWQ8j;%4OIi_IS3oJ<r}G`Tn-Y^XL2hJv@i~UN0#S2m}IwIg4sqh|$L&aVANVV2FNV
z>}R?1pi{*}C8ro5mjO-_Ru*)DiiH)#7^4tLdZ<zcy7)=OK!^^K*htXMe0dP%7x_mW
zuW<348vRC;-{cp~ByjbW9r}rG{*XVkktWk1SBOwgm=N<=%vvH`<{g<*9Hbi$`N1(}
zOL3D%Wx*EiGEGi$M>A<=>SdMkpq|I%AXn6pz$;0s3PKrYm?8_gA;c@ZhG~!mn)t?F
z$qgNN4O1ga+~BX|f)yk&k~GK?-DDvb#PDjBCA!H<_NZhGqgR%Ql7sAV3M0iTSs_YJ
zvc~|%O<AFfJY<V%yc%VJF7lEsS}@+o0-Y2<wuoU|QNie>AhJatMnt8@AV$4Pk2pqH
zrN<;jNTtUlMo6Vc93!mKV-TZWrAHq|M5RX$##I#o*D*R}iwMSB`9>KZFt*DURd{Wb
zPi)1Qpj`HNj&VyqaS!9ZTyPR2MXh{b9chdMazO=2j0bW?8T}X|ER-8A;dMxkIDywW
zxnddLF~(Rg2W(;jBhDhZqaCl0)X5U-7{TkX{9pku@%qFDS)h^6cs-&_{!mK-uW^p3
zK(sNA*C&?CKX#F3riZLn9;~6CnI>pbad4E`Qru><vS2fJNHbHKy(%7#k|xs-*VxB;
zDp^Q~3L4nQRo;_nioGf>b~1{qINMZw)bIiqPg$vdg9V)BJ2t*?ntA${sOADm3Ngxg
zD)c{4!Ev53O*Yd!;W*{`zgWT^F4D^zJ~P22UwF-ZF0h-W3IqayKw!@L0j`rmsrdc?
QM*si-07*qoM6N<$f&f-ZIRF3v

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_remove_red_eye.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_remove_red_eye.png
new file mode 100644
index 0000000000000000000000000000000000000000..c816ab49dca80cea33cd7815db4549dfa8978579
GIT binary patch
literal 868
zcmV-q1DpJbP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0009kNkl<ZcmeI$
z+e>U^7{~GN8fWWGhuM42IP8C5!>|i9#YQF&F;lz{3G6^3me%AU6$^wyL`3L7AqCN4
zn~D;6F&88HAB2e)VOWu<qh;n@$k>H5nX9>bSL4ijX1Ugg7whx8eV&I0*1HZYTrQW(
z<#OF5cc`L`C?mX=$p}%}c#1n*GmT0{iF1gaCx^rtr2>tj3-cMr=mqAOPpP3u%IM}N
zbgXBKS1H9&UV8Zx-A0ax;>97)v5oFPe&tzgyUjehgPG$tHq`PPy2Cl(X|Cuk{t<?!
zh|^D)0Hv7(2s6MkX`w4kFP3?j7RLU?7<b9V&p0PS_eW^f)>#k+eoFu|L6(FGvv??w
zM>xpmM3F&1=caRJ&?v~q!aC1WsCHqc_mL4rH%$~P`h;oS2x>?RXXpPkT394OniP91
z&`cKLETyQz#N#A{J1c<E12!(ztP{d0DBN*7JW5_O=%yLNsDZz8R-ICh(S$Jd3-YKF
zAA@&M9;kJ4tQ11=3&-Gs2swDfkBc~p#)fI_8b&L^<R9^HNf)}1ev}rmx(Q`atnMI-
zmjkgWjIt<J&!a@d>I7blco|(x03{(-@1m5;(|G|S*5wvTQPN`d8A_Qvo$u`}lq&W@
zFIl`~dt&vDy-Vh0-_oI8kUv%}9qK(w$kHh`4WKlO)r}}aV)ZLr;$cf@TDEZNzQbr$
zn7oNb4$p8QygK|SAx`sFCb^Fi5WdYXs3niD&`mRrQGK43lGI@|DNOyGydGoMwDp7_
zMj_U6T&(*T-6Lr_bDKvnQ7t@SmdMt`JiDA_vcnvWWQz$;t4aht;wx5U;kDWYvJZui
z{B{cUBLAAsnxY^YGr~%JfNW4$=SwsS<Y5+FI7>my+#@DT_!<ohG(Hdpo-l!*Tmnpz
z6uPI-u<T9b-v%oT5}};3Ov;Hc#47SHiXN`0h68kmlb{+Ke0<~RIuG$-TLZs1vdqua
z<B$@1_`}vRzw;U;IO-OiY@%a5KhVJ~ilmBZjx78P{)9@d!IQj0%;XN-C&t@6!L{>I
uK`U=C%)6Nk^E$0m;KSu|xm+&S&G8>_o}3QQ)9<4I0000<MNUMnLSTZZI+AYy

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_stop.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d6b65da7292c38ccbc98c0ccbe6326af05fb552
GIT binary patch
literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xf3?%cF6<L53TYyi9E06|)rRh7*11ZLmAirP+
zhi5m^fE;m87srqa#$<_E2mby4|Gz%tlvFCOCj&#S^7M!0Y{lgueV(p<F6*2UngHRZ
B94!C<

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_switch_camera.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_switch_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..d757b6f3dfdeb6adb71c3ade54a9af3519a23f5f
GIT binary patch
literal 314
zcmV-A0mc4_P)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM00032Nkl<ZcmeI#
zK}y3=6ouhmLB}@BQMaKTRh&6+0Ufnu2|;iT;tniMvVzd17!8gB*9AOIp2EEn!u!uK
zgAd9}nowG7=WMCPww&SEDX*9wFPz}kGnUyCPSqIs?QrN3`{f?^Q&$}L!kqTaJJ*PA
z88PRLtVv@<j|Hq}MbZWf+8s%|Fl?_6xc}<qV+HFt%4<hDPpqS&l~-FT&1p<iOk!wG
zW0J~Zn$wu1@|fl{CMalV#Tw9@#x#{rb9pRJX>R72|IZkIK;n=7{BLUi$5r5ic>aGe
z<+Y$-?Emxi`#ucYkW}#*LVa*S8tagc!JDbi+`$bRc;k}gRw|W#0N2CQ$RZF(fB*mh
M07*qoM6N<$f^T|_!2kdN

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_videocam.png b/imagepicker/src/main/res/drawable-xxhdpi/cwac_cam2_ic_videocam.png
new file mode 100644
index 0000000000000000000000000000000000000000..0039e804eb1684ea4ebc31799709a087f572e5f5
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawmV3H5hEy=Vy|MA+VFv-1hn?^8
z4~ug1g)FcZ2tQ~w=Lplx+X;0Q`O-fM6yDE!@w@{FUidGcwkmVlvbJqjp=XW1?wu~T
z^_Jsx-sfxGL;v3?&|*&U<2W%#V1lKfLa~y=Gna-loeVRD8I9DLAQAzLOe`D%^2a{x
z=bL%t*T#(tHXb^qa&Ey|=ZV3$mi+%IV|?53_`T+<7p`3W@mfYIs|#!;^C!uxN8C@h
R>H?k2;OXk;vd$@?2>^U;U)TTu

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/ic_action_camera_white.png b/imagepicker/src/main/res/drawable-xxhdpi/ic_action_camera_white.png
deleted file mode 100644
index 67f56680bb9746e7a6d8d2cc344979fc3742bf58..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1202
zcmV;j1Wo&iP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000DeNkl<Zc-rln
zc}N#Q6vr*QQ@ZbqprT9Y#7NMHEV?f$BPb9e2)c`mq>QLPf(oIFh)&Wnx}y*?=rTn+
zhzdICzO(z#(r=TlZ-2jaXXfqtTl0_K+kbXv-kbgWW@g{ad-DrHNY%PRf<Qr_Dgsmu
z)&Dn8V~oKn9L6=gMgjgwp}5P#0VJYx<pOm;0&-9cnS4RZ$^#mXbOlPOB#`!Dq+y_U
zK(V+Ay*xl|Lw}f2at@J!2WpSw;K?|{q6Y5xl<q~dKmyGW^MWU5$!4yl<{hC{7-$=~
z@&`Q)n<mJ&soyC2EdW64*g%`fW{X549bpv*3K#x`BOiosDz%6ZeI=7zG;|A8pYGyW
zKyyexQ>m9LexeJYnqq=ZHtwqn53G}0G(W~`bu;91Ne;A07(PZ_<0(q}l2}8tHXbs1
zGubK7WW#U;m82?PaDwy_m><AICqS*}qy3JyMp--jkTza`PGtF&3G@Li_&^7J3{$8y
zN!s{2(%B8Zq;i2`EQV1=c|AO}ZTK~PHT|^<uYJoJpeq)$JhA;Mt(j`uY&=<J!I@m*
z01Z*T@{)~LDZ`xx=Q2nSbW%Aeeaj6>6uHsoE`W~efZC!+Gi`TDCgy6mkw4<QR01v0
ze%LL1wj$q!Gbr2E{)9W3rv}PmxW1)Sw$ke`sG(w&28J41wQ#@W`3Ws7o&k+ecJ6Ij
z633Q2Pw_rbT%j57xulta3(BxD+rcbaE(bcOG0hiS(^AbI=&k&vPJDKX94J?7yoKHQ
zd)PoZa-io7zY)O%;;;Kp<v>3e=9%n1TE+zWCI>2FH86n*#M?VU%r+?yPaaXQth**K
zmk%ir*Zn83hb^;WL-vXZ^wqi~O0Ni|@7GT1tL#s87rT$PYTL?|107-m6{DXLBNE+>
zyQa2LzI1Qx-%OGNhkseQbmWLAzU*n9rlmyhv#>KtUNp)!QzYL-cm@=PmnAQ{C&F?6
zT$-Ky_K)<v09s2gTSR52q(JA@JI2K>H=<^Q+Y!I0^b?vJrCm@cv0UJ8ldlsq2XMr%
zd^?q|celw`b*@~@EXiO?O%Zw-H4X5_#`2gxE{k;mRF+2y#ZAQ=nQ3Dg!wIFc9pad;
zoNZe_iPB!zEj1V1B^%UY4oV}umkekfLnGQ!Gmx8(Npk>XPTORLFZOMDzmtU3M<&iE
z%FuTcE>6C|Xj3l2eMc_AQA$rI3&|o~skg6O4q%*{q^C~q(&8{$yE_;_X|HGEd4s#O
zuueu&aD9&v?3j6^Gr~c*NSudjveT!vITL@GPWtuS9xXIdgpP&iYG^gbXBN;4pR)ni
zXC2|v$-0qrcCcN<nm`;+h1xEQZ|Ml7kAvknIZy|9V+4S|%%ZxBOqhJc1@efqsfaVo
ze8vqrrH^Ccq;XHGo$LhrA;Xf)tt&~TTf>29?~chMMbKidK`XUE^6~PSXz%`N(N1h!
z<y-gjn2*+#``?dFSSr@2EIbjRb&<Hfi2=+O{kL2MHetbk#{_|bKvfm!FG*Mql(8(T
Q%m4rY07*qoM6N<$g3H%28~^|S

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/ic_video.png b/imagepicker/src/main/res/drawable-xxhdpi/ic_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..273cdc310ba162d86edba64763d7ba6179e53893
GIT binary patch
literal 708
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VCwdCaSW-r^>)r~uOkj34x(E&
zYz%PO_<{S%q41^kN*ZQO9sd&&SN3LThADMCU}j!@(Ba#`rk~5do-@)el)w4HM(LT%
zjw4EG=HGqN-Wko5lw<@N4F?*si4uO-v$oE)=sW-V>#yEFwb5+>-?a)aW|(|aVc*=U
z62I@jqMDi2o&23kmMnbtH!$gJ_NS#s&xfqOx?4znpY=SIXSvUI+|2Py<Gi8v(spCM
z^2fDd*&&nm>s+^%tC+OqU$D?W+bc5!TrbY(ed1lmyz^da*#COZOZ(eZ-g>b;<vg6X
zd~S`d2%{bAi$!W4wt*ZUR2}~1d#?L<>FQF&1MLiVKgIv*(c~!5b=dmHZ+<^RKU2`s
zv<ZQsiU(R7N>*AfS>xKk%~(09pTV7Jm$xrVg~)~VS6mv@8JoR)SuDgREWhR0pv+jg
zT9(B^C}C0!iv-sN=DdU=Tb4gT4N?WZQFcr`EJq6We7u~+&iL(7sC!exf5W4l3@i!^
zj2sROOacw)%zER*g);XA10J;W$ZS{9;?OAY3hG;Jrj{m<V4%5v+S*xO4h@YAU;QS`
zldp4iXw*-e>EY0@G+bCU{Pq5c4Gi7-&tEm}Y-(VN_rK0u%*x2Bcj1R;XBUIJ_moe4
zoE!x^JoNobTNsX?4r%vvXn5Ru%ggDSei}=~tyKvDKxO^2OTTCb3O=aZE%jGrkK%#@
zyt6N<W-Vi|eAu((`?s5(lX_<7MP6Ik*JjJOTV=00UvBQL<tiS1{%rF^TrbY4dBE)X
z|5e?UMSECh-wyLCH#5z7e?fHPm!5`iMOV%`m7Sl;KTrHOdzI6#Z7GGi-)mELKV^m|
d6d+^DWPkS?TVLm_wEYMY_H^}gS?83{1OTVACPV-L

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/drawable-xxxhdpi/ic_action_camera_white.png b/imagepicker/src/main/res/drawable-xxxhdpi/ic_action_camera_white.png
deleted file mode 100644
index 91264ff4fb6f6fc91fcf9faf33f648e169e8cf71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1675
zcmV;626Xv}P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000J3Nkl<Zc-rk-
zYfx2H6cz!IQj^l?MGt%1%dBRyXvQHUNRl+8sF@y))u@G9qSM1+{FBqeDYYz<U@Agw
z9Fwd`EoqGDN19C|Al;A@Ed>z_MnFXT+BnGF`*P0Nd#!Wsz1rN5KXA_8Yp;*9_u6Z(
zwRS)BJF|cKMF>O)L<mF({I3Z_A^OZBa0xOoA4Mob4G!Zty3vUy_^=uIn1fU#oSp;*
zBMXJ7g&x_b8-Zwy#~QT53}s5+JHkz1u$UCJFvkhpCiTt|Ps;He284$|JYGQ~Xef~S
z55%6Hr+;GxVnR(ITMSD@3lb#>^Obi#WQ2~uW!MA`<|@{zwa@!CxF8e+o<K88{c2^d
z7g@Gx5Jott1mds)T*#`85zE;Q@6y%-jlj9&WqS&nl-+r&W82Lb8oVj=B1`>F+#tz#
zTHC%ttdSrQh!Mi+SSm>vg#89Rb_-Jxq(wZAtbU`Idj9?k4SVfIl2-&0P>lZ4-z7u>
zFGzhy;HYuGN)yLVuYN4H2w~4kPp(1-LH!EFp<YX({-fR^=?T1lQdB+8k)FLpP-2|a
zFNHk)7P}=dxmVO8#fhskRG>uhTX!%Fz$7;WE)s{5Q#gieq&HKH2JgU?QlDuo6WoZ4
z`2@aJM18AlM%xSqe^W694a`k&9hbnwKBCg3w|8j=t`k$u-+nRpn8+azCoFLwsuZhG
ztQmHS)b@I@8}m_Pf9SC%FxyhpER9R-$2Kv|{B1YD9cEJroP~pyf(~Pt)GE(m$h)O>
z8E}gO;si$`kYg+ABjs3WcOqV?Y=wWqJ!Vh{M2X{v9lCIf)bdfwHm!;u^D?}EPnnV$
z0{3Y)c)9IQ7A^9m_vhnZc!PV*34Eau^{~|TR`E?#)QYL)f4>4=;Zsur@s8G|8-FQF
zDp1A8q<5qG(Bq@UY9U(@c*sE5Ysw^PwvD}oB|5#_fWQ&qC;5BKk(T)A@Dr#u`k<dH
zhSJybG(Y_Lf#Jq+&O7^TRn1E5EldO+FkV!@D3<v<@g&!1&{th7<TO2jc?5A!O8u_G
zPQy5JoUmeC<mw3&5XAk1L5ejp{qU361oHI+N=X9WV9woACV^5tfj>wBkKzgzft!2s
zXH-<_2~ZDyYnk8RLl%L0J%M(z&=eMdVQ69yXx9^<`z||}x!{=$0$q9n986~sh!KXD
zisO0$9Sj18nCa_O@<^?E0=yK)66R7~PaLOCPk?uR?ZikHfva(hG)|?Sz!v5fvyu4?
z-eISzYzTbD-sUG5D=nu}hX~tlj*s;O_`YJbp)(hcUAR{Idn#d!m-GbO1fk{{5y%S&
z6!*t=;}Px;f5lc(Psku$dX{W_h)M`Qft9^(S*-MQ70(8Ro<Ooqz%~hOyxk_W>PO*M
zB~UzEdbhxUK)M-$v$cUOitlohLt<*V5)a?2k=1Nv<(%iKdn|KI4XT0SY>li!^Vn#b
zN9s4>JWX;|4HTC-N*hZFuh)1&Ajcp*K3Qrr+Tk=(K}&GV@<9DcC8JhiTN5FNY(KG;
zHkF!UYH&>;)iC4my3{VwrXFmcott8B@^W3Ozuve==ZKQZwjOsHC(XLYh58-B(>E`Z
zDw5g`um~>u?2A5}ww*^@5O|wZsCEKlr1lf^5mD2f_#3AB^}@>!taow7RwYopQF-?z
zzg8kiD)yj2wiq`W#^9ck`izwF`Ue$<gX{}sG1T9#)OY=0*lWKMC|=V0e7rXWPZT6e
zy)y~@7AmzZhx)7~S0!iWSfyB$U8F$q2&wP%lSlYy_XN8C8<oaNv?)3IdBkt`l~UhT
ztdzOAD!WWF-V+umv4<9KvhiNjjb3g<VXtsO{Cx@;2B4f8D5hNRDc24!-;cT7p}^b2
zKryB9P>o4cbM!wmH$h^cn0n!7k%K!R-;a5m?S#A+%<}v0p9gJfxe63#d>>2sMyK*V
z@2;REVzosjNg^@A&=>1)VdyRarK8F=sCcPSj3=;wCzGcMKgJV-=X)#W)UfVqqVfkY
zlYf`YU7#u!&*1lf!1_HT<$c0z4h;8Q%27(B`8Pw=Tf{jm#k!C$oVQs`V*OQEh75QA
z_uvs2g0aZK2iPF??K-iTyToy(P5ibK-y>ff*wd84*~pFV2!RNJ2!RNJ2mzNr{{i*J
V-szO7MQH#4002ovPDHLkV1k3q8IAw|

diff --git a/imagepicker/src/main/res/drawable/btn_round_green_disable.xml b/imagepicker/src/main/res/drawable/btn_round_green_disable.xml
new file mode 100644
index 0000000..f9b5e39
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/btn_round_green_disable.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/green_70"></solid>
+    <corners android:radius="@dimen/btn_radius"></corners>
+    <padding android:left="@dimen/margin_text" android:right="@dimen/margin_text"></padding>
+</shape>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/btn_round_green_enable.xml b/imagepicker/src/main/res/drawable/btn_round_green_enable.xml
new file mode 100644
index 0000000..695879d
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/btn_round_green_enable.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/green"></solid>
+    <corners android:radius="@dimen/btn_radius"></corners>
+    <padding android:left="@dimen/margin_text" android:right="@dimen/margin_text"></padding>
+</shape>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/btn_round_green_selector.xml b/imagepicker/src/main/res/drawable/btn_round_green_selector.xml
new file mode 100644
index 0000000..6ce526c
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/btn_round_green_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/btn_round_green_disable" android:state_enabled="false" />
+    <item android:drawable="@drawable/btn_round_green_enable" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/check_green.xml b/imagepicker/src/main/res/drawable/check_green.xml
new file mode 100644
index 0000000..965d965
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/check_green.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@mipmap/ic_checked"
+    android:tint="@color/green"/>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/checkbox_checktor.xml b/imagepicker/src/main/res/drawable/checkbox_checktor.xml
new file mode 100644
index 0000000..1f04f37
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/checkbox_checktor.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/ic_check" android:state_checked="false"></item>
+    <item android:drawable="@drawable/check_green" android:state_checked="true"></item>
+</selector>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/checkbox_selector.xml b/imagepicker/src/main/res/drawable/checkbox_selector.xml
new file mode 100644
index 0000000..246ef97
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/checkbox_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/ic_check" android:state_selected="false"></item>
+    <item android:drawable="@drawable/check_green" android:state_selected="true"></item>
+</selector>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/image_border.xml b/imagepicker/src/main/res/drawable/cwac_cam2_action_bar_bg_translucent.xml
similarity index 63%
rename from imagepicker/src/main/res/drawable/image_border.xml
rename to imagepicker/src/main/res/drawable/cwac_cam2_action_bar_bg_translucent.xml
index 3b285c7..255a9f0 100644
--- a/imagepicker/src/main/res/drawable/image_border.xml
+++ b/imagepicker/src/main/res/drawable/cwac_cam2_action_bar_bg_translucent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
 
-
-    <solid android:color="#ffffff" />
+	<solid android:color="#AA000000"/>
 
 </shape>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/cwac_cam2_action_bar_bg_transparent.xml b/imagepicker/src/main/res/drawable/cwac_cam2_action_bar_bg_transparent.xml
new file mode 100644
index 0000000..b570d27
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/cwac_cam2_action_bar_bg_transparent.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+
+	<solid android:color="#00000000"/>
+
+</shape>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/cwac_cam2_ic_action_camera.xml b/imagepicker/src/main/res/drawable/cwac_cam2_ic_action_camera.xml
new file mode 100644
index 0000000..6d7d4d9
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/cwac_cam2_ic_action_camera.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="18dp"
+    android:viewportWidth="22"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M5.937,2.8454C6.0079,2.7469 6.0865,2.6263 6.1869,2.4637C6.2431,2.3726 6.4483,2.0333 6.4818,1.9784C7.3108,0.6224 7.9134,0 9,0L13,0C14.0866,0 14.6892,0.6224 15.5182,1.9784C15.5517,2.0333 15.7569,2.3726 15.8131,2.4637C15.9135,2.6263 15.9921,2.7469 16.063,2.8454C16.1097,2.9103 16.1505,2.9619 16.1838,3L19,3C20.6569,3 22,4.3431 22,6L22,15C22,16.6569 20.6569,18 19,18L3,18C1.3431,18 0,16.6569 0,15L0,6C0,4.3431 1.3431,3 3,3L5.8162,3C5.8495,2.9619 5.8903,2.9103 5.937,2.8454ZM3,5C2.4477,5 2,5.4477 2,6L2,15C2,15.5523 2.4477,16 3,16L19,16C19.5523,16 20,15.5523 20,15L20,6C20,5.4477 19.5523,5 19,5L16,5C15.3357,5 14.8876,4.6364 14.4394,4.0133C14.3362,3.8699 14.2341,3.7133 14.1111,3.5141C14.049,3.4135 13.8409,3.0691 13.8118,3.0216C13.3595,2.2817 13.0867,2 13,2L9,2C8.9133,2 8.6405,2.2817 8.1882,3.0216C8.1591,3.0691 7.951,3.4135 7.8889,3.5141C7.7659,3.7133 7.6638,3.8699 7.5606,4.0133C7.1124,4.6364 6.6643,5 6,5L3,5ZM18,8C18.5523,8 19,7.5523 19,7C19,6.4477 18.5523,6 18,6C17.4477,6 17,6.4477 17,7C17,7.5523 17.4477,8 18,8ZM11,15C8.2386,15 6,12.7614 6,10C6,7.2386 8.2386,5 11,5C13.7614,5 16,7.2386 16,10C16,12.7614 13.7614,15 11,15ZM11,13C12.6569,13 14,11.6569 14,10C14,8.3431 12.6569,7 11,7C9.3431,7 8,8.3431 8,10C8,11.6569 9.3431,13 11,13Z"
+      android:strokeWidth="1"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/imagepicker/src/main/res/drawable/ic_action_camera_white.xml b/imagepicker/src/main/res/drawable/ic_action_camera_white.xml
new file mode 100644
index 0000000..a0ab295
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/ic_action_camera_white.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="18dp"
+    android:viewportWidth="22"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M5.937,2.8454C6.0079,2.7469 6.0865,2.6263 6.1869,2.4637C6.2431,2.3726 6.4483,2.0333 6.4818,1.9784C7.3108,0.6224 7.9134,0 9,0L13,0C14.0866,0 14.6892,0.6224 15.5182,1.9784C15.5517,2.0333 15.7569,2.3726 15.8131,2.4637C15.9135,2.6263 15.9921,2.7469 16.063,2.8454C16.1097,2.9103 16.1505,2.9619 16.1838,3L19,3C20.6569,3 22,4.3431 22,6L22,15C22,16.6569 20.6569,18 19,18L3,18C1.3431,18 0,16.6569 0,15L0,6C0,4.3431 1.3431,3 3,3L5.8162,3C5.8495,2.9619 5.8903,2.9103 5.937,2.8454ZM3,5C2.4477,5 2,5.4477 2,6L2,15C2,15.5523 2.4477,16 3,16L19,16C19.5523,16 20,15.5523 20,15L20,6C20,5.4477 19.5523,5 19,5L16,5C15.3357,5 14.8876,4.6364 14.4394,4.0133C14.3362,3.8699 14.2341,3.7133 14.1111,3.5141C14.049,3.4135 13.8409,3.0691 13.8118,3.0216C13.3595,2.2817 13.0867,2 13,2L9,2C8.9133,2 8.6405,2.2817 8.1882,3.0216C8.1591,3.0691 7.951,3.4135 7.8889,3.5141C7.7659,3.7133 7.6638,3.8699 7.5606,4.0133C7.1124,4.6364 6.6643,5 6,5L3,5ZM18,8C18.5523,8 19,7.5523 19,7C19,6.4477 18.5523,6 18,6C17.4477,6 17,6.4477 17,7C17,7.5523 17.4477,8 18,8ZM11,15C8.2386,15 6,12.7614 6,10C6,7.2386 8.2386,5 11,5C13.7614,5 16,7.2386 16,10C16,12.7614 13.7614,15 11,15ZM11,13C12.6569,13 14,11.6569 14,10C14,8.3431 12.6569,7 11,7C9.3431,7 8,8.3431 8,10C8,11.6569 9.3431,13 11,13Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/imagepicker/src/main/res/drawable/ic_rotate_left_white_24dp.xml b/imagepicker/src/main/res/drawable/ic_rotate_left_white_24dp.xml
new file mode 100644
index 0000000..477969d
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/ic_rotate_left_white_24dp.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
+    <path android:fillColor="#FFFFFB" android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z"/>
+</vector>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/ic_rotate_right_white_24dp.xml b/imagepicker/src/main/res/drawable/ic_rotate_right_white_24dp.xml
new file mode 100644
index 0000000..13ee952
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/ic_rotate_right_white_24dp.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
+    <path android:fillColor="#FFFFFB" android:pathData="M15.55,5.55L11,1v3.07C7.06,4.56 4,7.92 4,12s3.05,7.44 7,7.93v-2.02c-2.84,-0.48 -5,-2.94 -5,-5.91s2.16,-5.43 5,-5.91L11,10l4.55,-4.45zM19.93,11c-0.17,-1.39 -0.72,-2.73 -1.62,-3.89l-1.42,1.42c0.54,0.75 0.88,1.6 1.02,2.47h2.02zM13,17.9v2.02c1.39,-0.17 2.74,-0.71 3.9,-1.61l-1.44,-1.44c-0.75,0.54 -1.59,0.89 -2.46,1.03zM16.89,15.48l1.42,1.41c0.9,-1.16 1.45,-2.5 1.62,-3.89h-2.02c-0.14,0.87 -0.48,1.72 -1.02,2.48z"/>
+</vector>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/image_placeholder.xml b/imagepicker/src/main/res/drawable/image_placeholder.xml
new file mode 100644
index 0000000..975f7fb
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/image_placeholder.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <size android:height="100dp" android:width="100dp"></size>
+            <solid android:color="@color/content_grey"></solid>
+        </shape>
+    </item>
+    <item>
+        <bitmap android:src="@mipmap/ic_placeholder" android:gravity="center" ></bitmap>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/item_divider.xml b/imagepicker/src/main/res/drawable/item_divider.xml
new file mode 100644
index 0000000..6c645bf
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/item_divider.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:height="0.3dp"></size>
+    <solid android:color="@color/divider_color"></solid>
+</shape>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/drawable/radio_button.xml b/imagepicker/src/main/res/drawable/radio_button.xml
new file mode 100644
index 0000000..646fead
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/radio_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@mipmap/ic_radio_button"
+    android:tint="@color/green"/>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/layout/activity_album_pick.xml b/imagepicker/src/main/res/layout/activity_album_pick.xml
new file mode 100644
index 0000000..f58b10e
--- /dev/null
+++ b/imagepicker/src/main/res/layout/activity_album_pick.xml
@@ -0,0 +1,43 @@
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="MergeRootFrame">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/album_toolbar"
+            style="@style/MyToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:background="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlways" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/image_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_done"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:layout_margin="@dimen/fab_margin"
+        android:clickable="true"
+        android:focusable="true"
+        android:onClick="onClickDone"
+        android:tint="#ffffff"
+        app:srcCompat="@drawable/ic_action_done_white" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
diff --git a/imagepicker/src/main/res/layout/activity_photo_pick.xml b/imagepicker/src/main/res/layout/activity_photo_pick.xml
new file mode 100644
index 0000000..3e1d9b5
--- /dev/null
+++ b/imagepicker/src/main/res/layout/activity_photo_pick.xml
@@ -0,0 +1,45 @@
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="MergeRootFrame">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/album_toolbar"
+            style="@style/MyToolbar"
+            android:layout_width="match_parent"
+            app:layout_scrollFlags="scroll|enterAlways"
+            android:layout_height="48dp"
+            android:background="?attr/colorPrimary">
+            <TextView
+                android:id="@+id/done_text"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/btn_height"
+                android:layout_gravity="right"
+                android:layout_marginRight="@dimen/margin_text"
+                android:background="@drawable/btn_round_green_selector"
+                android:enabled="false"
+                android:gravity="center"
+                android:text="@string/done"
+                android:textColor="@color/white_text_selector"
+                android:textSize="@dimen/small_text_size" />
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
+
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
diff --git a/imagepicker/src/main/res/layout/activity_pick.xml b/imagepicker/src/main/res/layout/activity_pick.xml
index bb8282f..9e4888a 100644
--- a/imagepicker/src/main/res/layout/activity_pick.xml
+++ b/imagepicker/src/main/res/layout/activity_pick.xml
@@ -1,24 +1,24 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
     tools:ignore="MergeRootFrame">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="top"
-
-        >
-
-        <!--Gonna add the toolbar in code -->
-
-
-    </android.support.design.widget.AppBarLayout>
+        android:layout_gravity="top">
 
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/album_toolbar"
+            style="@style/MyToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:background="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlways" />
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/fragment_container"
@@ -26,20 +26,20 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-        <com.melnykov.fab.FloatingActionButton
-            android:id="@+id/fab_done"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right|bottom"
-            android:layout_margin="@dimen/fab_margin"
-            android:clickable="true"
-            android:onClick="onClickDone"
-            android:src="@drawable/ic_action_done_white"
-
-            />
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_done"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:layout_margin="@dimen/fab_margin"
+        android:clickable="true"
+        android:focusable="true"
+        android:onClick="onClickDone"
+        android:tint="#ffffff"
+        app:srcCompat="@drawable/ic_action_done_white" />
 
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/imagepicker/src/main/res/layout/activity_preview.xml b/imagepicker/src/main/res/layout/activity_preview.xml
new file mode 100644
index 0000000..7106349
--- /dev/null
+++ b/imagepicker/src/main/res/layout/activity_preview.xml
@@ -0,0 +1,40 @@
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="MergeRootFrame">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top" />
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_images"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_done"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:layout_margin="@dimen/fab_margin"
+        android:clickable="true"
+        android:focusable="true"
+        android:onClick="onClickDone"
+        app:srcCompat="@drawable/ic_action_done_white"
+        android:tint="#ffffff" />
+
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+
+
+
+
+
diff --git a/imagepicker/src/main/res/layout/cwac_cam2_fragment.xml b/imagepicker/src/main/res/layout/cwac_cam2_fragment.xml
new file mode 100644
index 0000000..d8c0208
--- /dev/null
+++ b/imagepicker/src/main/res/layout/cwac_cam2_fragment.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:fab="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <FrameLayout
+    android:id="@+id/cwac_cam2_preview_stack"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.commonsware.cwac.cam2.CameraView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent" />
+
+    <com.commonsware.cwac.cam2.RuleOfThirdsOverlay
+      android:id="@+id/rule_of_thirds"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:visibility="gone" />
+  </FrameLayout>
+
+  <ProgressBar
+    android:id="@+id/cwac_cam2_progress"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_centerInParent="true"
+    android:visibility="visible" />
+
+  <com.github.clans.fab.FloatingActionButton
+    android:id="@+id/cwac_cam2_picture"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="16dp"
+    android:layout_marginRight="16dp"
+    android:src="@drawable/cwac_cam2_ic_action_camera"
+    fab:fab_colorNormal="@color/cwac_cam2_picture_fab"
+    fab:fab_colorPressed="@color/cwac_cam2_picture_fab_pressed" />
+
+  <com.github.clans.fab.FloatingActionMenu
+    android:id="@+id/cwac_cam2_settings"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_above="@id/cwac_cam2_picture"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="4dp"
+    android:layout_marginRight="16dp"
+    fab:menu_colorNormal="@color/cwac_cam2_secondary_fab"
+    fab:menu_colorPressed="@color/cwac_cam2_secondary_fab_pressed"
+    fab:menu_icon="@drawable/cwac_cam2_ic_action_settings">
+
+    <com.github.clans.fab.FloatingActionButton
+      android:id="@+id/cwac_cam2_switch_camera"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:src="@drawable/cwac_cam2_ic_switch_camera"
+      fab:fab_colorNormal="@color/cwac_cam2_secondary_fab"
+      fab:fab_colorPressed="@color/cwac_cam2_secondary_fab_pressed"
+      fab:fab_size="mini" />
+
+  </com.github.clans.fab.FloatingActionMenu>
+
+  <SeekBar
+    android:id="@+id/cwac_cam2_zoom"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    android:layout_marginBottom="8dp"
+    android:layout_toLeftOf="@id/cwac_cam2_picture"
+    android:layout_toStartOf="@id/cwac_cam2_picture"
+    android:max="100"
+    android:visibility="gone" />
+
+  <Chronometer
+    android:id="@+id/chrono"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_alignParentTop="true"
+    android:layout_marginEnd="@dimen/cwac_cam2_fragment_chrono_margin"
+    android:layout_marginRight="@dimen/cwac_cam2_fragment_chrono_margin"
+    android:layout_marginTop="@dimen/cwac_cam2_fragment_chrono_margin"
+    android:background="@color/cwac_cam2_chrono_background"
+    android:padding="4dp"
+    android:visibility="gone" />
+
+  <com.commonsware.cwac.cam2.ReverseChronometer
+    android:id="@+id/rchrono"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentEnd="true"
+    android:layout_alignParentRight="true"
+    android:layout_alignParentTop="true"
+    android:layout_marginEnd="@dimen/cwac_cam2_fragment_chrono_margin"
+    android:layout_marginRight="@dimen/cwac_cam2_fragment_chrono_margin"
+    android:layout_marginTop="@dimen/cwac_cam2_fragment_chrono_margin"
+    android:background="@color/cwac_cam2_chrono_background"
+    android:padding="4dp"
+    android:visibility="gone" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/layout/element_album.xml b/imagepicker/src/main/res/layout/element_album.xml
index 3f47e97..ed2f506 100644
--- a/imagepicker/src/main/res/layout/element_album.xml
+++ b/imagepicker/src/main/res/layout/element_album.xml
@@ -2,6 +2,7 @@
 <net.yazeed44.imagepicker.ui.SquareFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="?attr/selectableItemBackground"
     android:focusable="false"
     android:focusableInTouchMode="false"
@@ -17,6 +18,7 @@
         android:contentDescription="@string/album_thumbnail"
         android:focusable="false"
         android:focusableInTouchMode="false"
+        android:scaleType="centerCrop"
 
         />
 
@@ -47,7 +49,7 @@
             android:focusable="false"
             android:focusableInTouchMode="false"
             android:singleLine="true"
-            android:text="Album name"
+            tools:text="Album name"
             android:textSize="14sp" />
 
         <TextView
@@ -59,7 +61,7 @@
             android:layout_centerVertical="true"
             android:focusable="false"
             android:focusableInTouchMode="false"
-            android:text="100"
+            tools:text="100"
             android:textSize="14sp"
 
 
diff --git a/imagepicker/src/main/res/layout/element_image.xml b/imagepicker/src/main/res/layout/element_image.xml
index 770385b..92366fb 100644
--- a/imagepicker/src/main/res/layout/element_image.xml
+++ b/imagepicker/src/main/res/layout/element_image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<net.yazeed44.imagepicker.ui.SquareFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/image_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -16,6 +16,7 @@
         android:focusable="false"
         android:focusableInTouchMode="false"
 
+        android:scaleType="centerCrop"
 
         />
 
@@ -37,4 +38,4 @@
         android:contentDescription="@string/image_video_icon_desc"
         android:visibility="gone" />
 
-</FrameLayout>
\ No newline at end of file
+</net.yazeed44.imagepicker.ui.SquareFrameLayout>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/layout/element_image_preview.xml b/imagepicker/src/main/res/layout/element_image_preview.xml
new file mode 100644
index 0000000..95646d4
--- /dev/null
+++ b/imagepicker/src/main/res/layout/element_image_preview.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/image_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:focusable="false"
+    android:focusableInTouchMode="false"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/image_thumbnail"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:contentDescription="@string/image_thumbnail"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toTopOf="@+id/edt_des"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <ImageView
+        android:id="@+id/image_video_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|center_vertical"
+        android:contentDescription="@string/image_video_icon_desc"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/image_thumbnail"
+        app:layout_constraintEnd_toEndOf="@+id/image_thumbnail"
+        app:layout_constraintStart_toStartOf="@id/image_thumbnail"
+        app:layout_constraintTop_toTopOf="@+id/image_thumbnail" />
+
+    <EditText
+        android:id="@+id/edt_des"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/add_description"
+        android:inputType="textMultiLine|textCapSentences"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/image_thumbnail" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/layout/fragment_album_browse.xml b/imagepicker/src/main/res/layout/fragment_album_browse.xml
index 082430b..f9f463b 100644
--- a/imagepicker/src/main/res/layout/fragment_album_browse.xml
+++ b/imagepicker/src/main/res/layout/fragment_album_browse.xml
@@ -1,6 +1,4 @@
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/albums_list"
-    style="@style/RecyclerView"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 
diff --git a/imagepicker/src/main/res/layout/fragment_image_browse.xml b/imagepicker/src/main/res/layout/fragment_image_browse.xml
index a778a68..3ce7cb2 100644
--- a/imagepicker/src/main/res/layout/fragment_image_browse.xml
+++ b/imagepicker/src/main/res/layout/fragment_image_browse.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/images_list"
-    style="@style/RecyclerView"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
diff --git a/imagepicker/src/main/res/layout/fragment_image_pager.xml b/imagepicker/src/main/res/layout/fragment_image_pager.xml
index 80f3f65..306cd24 100644
--- a/imagepicker/src/main/res/layout/fragment_image_pager.xml
+++ b/imagepicker/src/main/res/layout/fragment_image_pager.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/images_pager"
-        android:layout_width="match_parent"
+<androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
 
diff --git a/imagepicker/src/main/res/layout/layout_loading.xml b/imagepicker/src/main/res/layout/layout_loading.xml
new file mode 100644
index 0000000..a570e57
--- /dev/null
+++ b/imagepicker/src/main/res/layout/layout_loading.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_margin="12dp"
+        android:padding="15dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="@+id/progress"
+        app:layout_constraintEnd_toEndOf="@id/progress"
+        app:layout_constraintStart_toStartOf="@id/progress"
+        app:layout_constraintTop_toTopOf="@+id/progress"/>
+
+    <ProgressBar
+        android:id="@+id/progress"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:scaleX="1.2"
+        android:scaleY="1.2"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/imagepicker/src/main/res/menu/cwac_cam2_confirm.xml b/imagepicker/src/main/res/menu/cwac_cam2_confirm.xml
new file mode 100644
index 0000000..ff9e26c
--- /dev/null
+++ b/imagepicker/src/main/res/menu/cwac_cam2_confirm.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/cwac_cam2_retry"
+        android:showAsAction="always"
+        android:icon="@drawable/cwac_cam2_ic_refresh_white"
+        android:title="@string/cwac_cam2_retry" />
+  <item android:id="@+id/cwac_cam2_ok"
+        android:showAsAction="always"
+        android:icon="@drawable/cwac_cam2_ic_check_white"
+        android:title="@string/cwac_cam2_ok" />
+</menu>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/mipmap-xhdpi/ic_back.png b/imagepicker/src/main/res/mipmap-xhdpi/ic_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..04d68dc1d3a1769b0612a30fcdac53179272dd28
GIT binary patch
literal 344
zcmV-e0jK_nP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70003WNkl<ZSV!g9
z(GkKR3<lu*6WCE4!BOl6b)!0ob_3nS4e+>Y@AM8R2{Gi(KBwU$&?5!p{DE^H{TDEV
zFaUUIu8LX(LkLGAx)IR@z^sK-0e;|y6*g)in}G>jG+qImHLBPI{5394Pz<!diGfx)
z5zrFH23q4-z#h12U@u%1uqSR8*c(>_dcb9YUT{fZ1{Y)R8fR-ojwgU=i~Bn23b=~A
zY9R}NQwbO=bx<3QpC}KExz;MCkPCk-(HoEK5^w1;$Qi&W8nWS~Y`f(JS?mWrAa@(q
z-pE~G;lnZ6lU2Z;$ZB9OBn#LB$p%^@ML<iW7-)rT0$L!Off=Nq%cDetF=^dw?fx`z
qn-JF*nB2+K#;feX+QB4o?tyQFPO2#d+vRZp0000<MNUMnLSTZW>5EJN

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/mipmap-xhdpi/ic_camera.png b/imagepicker/src/main/res/mipmap-xhdpi/ic_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ec077493ab8ac343fe7d54328c6de78652a97d8
GIT binary patch
literal 799
zcmeAS@N?(olHy`uVBq!ia0vp^Q6S903?%u>HW~n_bpbvhu0Z<EojW&S0Kx{6x4_{3
z{rfj=+<=h(|NjSy0Ttf9eH*6yCQ#)1_3J?H<HwJIBt#8R1PJcky9d+@Q4bV{vw>QG
z1_H%_B3G|o1xj7Jb`7W=Y~d}S;b+dA0m=foaEpK{fdHsx;TeW)Ko?t;1o;Ishy@lm
zSl4;j8A#M{<TFOvD%VR_m8n&5hO@Yq`06Q&u(Q{C$^;1%Ci5`KyC>v^u-cSr6*-6M
zRlWPhwV#23@tLQKV@Sl|w=*(}n+ycn0+aU!^5usF91srpkn#V&{OdOUwNVZnZ+hmQ
z{B8LD)0qix)Mj%qiHnO*SD122^wS!zogoZ6e>pDt5_r~k-9(G4MU!5u#C?r<!sZ#I
z%)axcm&^89D>cgF|MYCNR*9TzrX2NVQuwQ`oELJHYvqKaCIv4@?POfLLZvrEwYu`V
zr`6ZZ)BYrQT*|UIaX{8Hd6H{#rpU>eKBhrCv@UZlSkB@a?2v7d@z(G)*H!BUTW{7Z
zl=iMQoS*5sD12GzcHYiuJGD4;Z@+%t5_`Ky@P+RawS_sK7H{7zu+`pT-SSoQUdw!Y
zcpz`Kc<qu<)j5A2lxuwOPZX8^yl}hX&zee^y>pzunekUSr#tWYXS&WLxlFoji%)pK
z9@j|oQ(-A-TYUfjmU<hzGJW%+aFhAx3-#u{|Jo&(d+E-OBRj=ssjDg9V!GbHy>^4H
z*%mhKt^AMn^DZcJ>E*O#{ybqy96QGh!-e(-OD0|5V>vVP0=L0kl`Y(i+-h6+mQ8Q@
zrr?n7B%PpUmafGj;q&6D_7`y$o%^{?0@Dlorq^_+Hb=bZxGnr_SyzRKf?UFk<9bP(
z8*V;IFiV^9RwYfi=jN{DIE#1dJl!5%Us7M4Ut@0a=&St4i%d^fx^mBt+5rMwm(8zR
X<epglWYY{_x?%8i^>bP0l+XkKXvdzh

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/mipmap-xxhdpi/ic_arrow.png b/imagepicker/src/main/res/mipmap-xxhdpi/ic_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e36af403dab2855b58698b16ccf6f7ecebca1e3
GIT binary patch
literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TF0X`wF|Ns9#4+C}k=9~tKvy=q+
z1v4<z|2H#xqX*>2dAc};Xq>M->CM!jz{4D<@_qkiFVSC~#-}TjBf?L;lj%|y@z<ye
z`LNnnKlkRA$Ntj)rhX1P<t}Nh`etj<g+qbH>b`SKi!L4rwG}Qs^Tpum*_ef*Q7~kF
WrJv1io`*chVGN$GelF{r5}E+ME=Mx}

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/mipmap-xxhdpi/ic_check.png b/imagepicker/src/main/res/mipmap-xxhdpi/ic_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..077c68f4db9c24e9bdc024557b041163c02fbc5e
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^dLYcf3?viMZ?gg^p#Yx{S0Mc#71#x>wE~K=l?3?(
zGsrA^_W!N3+m}3`h?A#_V~EG`x7RibG8k|;1q$4)e;Q-dIA!N!@v!yo4NK#eDjj%P
z>Kr01`lR4t+?pyQ8xZ(YoX5A+^6;}0)%r&mQ>3|EcUAA60W^)l)78&qol`;+0889K
AbN~PV

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/mipmap-xxhdpi/ic_checked.png b/imagepicker/src/main/res/mipmap-xxhdpi/ic_checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..463b24b943578873440eccc80fd32c878d18fe0a
GIT binary patch
literal 366
zcmeAS@N?(olHy`uVBq!ia0vp^dLYcf3?viMZ?gg^?*N|=S0MeLN}zcrH#^Wc$&w(y
zU<R3G&;GxCkoZl()%MG$rayL8;h(>|-(hb!vx-XysA#9Bi(`n#@weAb3msD6VZCsA
z@m8&^Yp)&uU%!$^SysbSmD}8JvmLj`I{}8Jy=%1=i!P9gj_qyQ)^y20C@;Zv>*xOu
z-YyjW@U0^_{On%0S07`S%ZW;*hadLddz5qUqra&dUta8R`zE~Z@U(L~u6NA4rn%pj
zk>&i0Dd)>w&cA$P&|P0(wLj~Nzu$T(N!#Vulf7(~cCXZ%cO{j>Zr(MQw5D_uQN#C^
uzG_8vJO7IQHWk<NdMG8PS9w$X5wG0?rGwuaG~|JvVDNPHb6Mw<&;$SmR>6e;

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/mipmap-xxhdpi/ic_placeholder.png b/imagepicker/src/main/res/mipmap-xxhdpi/ic_placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f7ad00ee5d33b9f5a0ccace2895e74559a8badf
GIT binary patch
literal 1041
zcmeAS@N?(olHy`uVBq!ia0vp^bs)^a1|%OTFYN$QDR~7U$qXzkoIo}VFasIL7+Jg;
z$N?Dw0w6WWe6S#tU_|DC*u5+(KLE94c)B=-RNQ)d+csOoQKsQzy0gGqp<EY_#7w~}
zYAY{gCoY~_$D*AZVlYAGh{J{pZhzQr-Mo>JyL_s?Lel~<sT`jsSC3LLKLbmpdF95t
zjd!1CW*0C1etx5U`g_%xU5&r~+FjeXYSpd(TW{RWDf)iu(W6D~i<#H1SrZU?RsP3a
z<Gt<6?xz2_t1Ue5+3uSy?G6>f_gc1>?Vl_C?dk&2!26>4hh~2`RL#+1{?HdB1*0su
zVp!)f#W%=4Q2$`}=l0ct*|%n0QORs?e0_j7q3S_(dqeQUBE}uecUa#s-d^{k$eMEx
zQy9O4{fd_j|Bdd1|6rQU7{{<#`A)gnopQGypZwnYA8VP-Y23#V?{~dnCr9zKLpl$+
zUq}>aKiV@paoLBN<&rbHEb_I^h}eBTr#hoD?#CbN*$K}iAAWvcp=jLNf5%UgKjg=b
zwdyl|#{T&8dqTpqY@k$S)6DZN=l35!5O$<88f40M=7?^KeBCo5`x@Rc=PRG76i@rP
zYTtxyjot^g8>ZE;>P`B<Z`9&{**!sV&8@(&UrsX~{{F%Ao8=7i_Qtb{dHW^vtodvF
z{yz9Kd-s>+e?uQA7PQ{qUtq~QhvR-cJ22dG`Wt$8$<6ribqk{n$8?=fA@?t~h}-R+
zcIc?p7n%JmI`4n(QV;zd{zu{0Chh%yKQzC1RL<}(|HY&2693|Xq(EIn$;W7x|NDV#
zhPsfFkKAqY;<1029wsmBju)uO0SYwux9Zg$`>^uj(encP^h!P&H?5bB{loKMwv+gN
z#~;fs9?fU46EFFg-Ey8c_K(zqVpnl{#hQ079;r9zv&R1E_^@<gw>;xMpwY)0^kw&c
z{vn(!vtip6k-Ej!t#@>H|F<t%@AhSH_ww*lUHRJof|y_Q&M9nJFK$13uG69G?Gvv0
zDL#Ddcp`84gbyzTH{H=xsflXIDd*yx&!_krsA9R}i8`RvN5QTeK&hCPq%tl}dH#hf
zfKtaDHGsPIFOlSbxZri^-#ha@R6Yn6+PD1IyV`vUHPb(~zJGDK_k*l&1!^+G!fVUE
z!Yewp{Tw)DUh8`PV_*9zFk5YpC_{W`o!H~mRrV8K`-nR1f4_U{xpfu(KksIgPyEmH
X#c|`rZ>yhcg7TiHtDnm{r-UW|9qHIw

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/mipmap-xxhdpi/ic_radio_button.png b/imagepicker/src/main/res/mipmap-xxhdpi/ic_radio_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..c712f2c839bf6e4ade573f89569a870671f6d5be
GIT binary patch
literal 1102
zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|3?#2~eYnNIz-Sua6XFWw{vQP-hCn`JZUr#l
z(o2H;f*C}E>z1Cr|K_K0@1=kLd5f<KG`wR>d?k0p`ehPx-^K^;nYg!Aag?0PPtQ&(
z_*?oX=66K>uU7xAAKv|YzJ7O~66EGQ^Nao5Pd1Adf3R4VYr?X+!jNr!vmX2Aa_#Lo
zT)X!lKFYeG==f^S(-RmNm=Zl*977@wZ=F$Df5|}N_(Jns=hGJtCHTy|eMM6%SY1o5
zIPcZ6&+|U-tNpKk@R{b~R<+Da{y+XQe)0U=s&-z~YboohH7jQ2&6t)dwQHGH>cyX;
zw+k=!#2jDu;r#k4JEc?KSH(0$?QL9<btQXeLz;lnvO^0_s%^QY5&l-Jd&3n+nO8a&
zIb*pCPjYEAJe7MCmOs-Y!jUOT(Xh(H!}gGsf@7(1bz-N|nw_<or4u$-8UMSOvzRGs
z`Ck)<)+t5(Q4u_XYKGzNtfBLtwYQzvVw@hlv3{1l%|iWm>*sl|+rxQCTw#st_x0*>
z5BxtZVMt_7o8!+@Xt(tzr+C7lqf?Hubsy#~Fn{>(Y)M}Eg18-fTD%>0*km91>iSTH
zCn<i9QF@rt>{ISLs(3lFKbM&rWyQ2S6cbpN&bH;ms?P#>8V);V%3f67d~kByw#I^P
zgA|uC<M{@=cw4NO7#d5RNZYgf@y*xO-xYOj75+Og9jc1BCApOMvAe?!*N`KBnjf6K
zEvI(9|GUA${r;66#=GbEFF2ONyX?CELO<KZYbQJ2xYBGlWoqYbc{}z)+^>ROt6aa;
z`qaMb@+I#-Kd)y0%FA?N@6Wy~{bxb`$K~bkC8gI*I{ZdL;<(12hWq|@n`+z^vix3d
zp<ws;`d9rkJORs=&RKt%>Em1L%Z0L8kBa?Ye|yEh?fva9U#vTtcmFb0uhHsJGB|Ru
z@{@M^17q)t8Oy)?_K)MKe$!;}@3(%xfo_M;sZBl49Gtq976(qcu<m4r6!(^O2bH8U
zBy;z)9Bw%=aoO$@%~N|G&+Tzu*0Xrs6z1(ylK0QCmv{LhU&^%2N?2f#EiipEc)I$z
JtaD0e0ssl}sV)Ej

literal 0
HcmV?d00001

diff --git a/imagepicker/src/main/res/values-ar/strings.xml b/imagepicker/src/main/res/values-ar/strings.xml
index 2d6e589..84e3d92 100644
--- a/imagepicker/src/main/res/values-ar/strings.xml
+++ b/imagepicker/src/main/res/values-ar/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">مختار الصور</string>
     <string name="album_thumbnail">لمحة الألبوم</string>
     <string name="albums_title">الألبومات</string>
     <string name="all_photos">جميع الصور</string>
diff --git a/imagepicker/src/main/res/values-en/strings.xml b/imagepicker/src/main/res/values-en/strings.xml
new file mode 100644
index 0000000..01890b8
--- /dev/null
+++ b/imagepicker/src/main/res/values-en/strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="album_thumbnail">Album Thumbnail</string>
+    <string name="image_thumbnail">Image thumbnail</string>
+    <string name="action_take_photo">Chụp ảnh</string>
+    <string name="all_photos">Tất cả ảnh</string>
+    <string name="image_check">Chọn ảnh</string>
+    <string name="albums_title">Album</string>
+    <string name="you_cant_check_more_images">Không thể chọn thêm ảnh</string>
+    <string name="image_position_in_view_pager">% trên $</string>
+    <string name="action_select_all">Chọn tất cả</string>
+    <string name="action_deselect_all">Bỏ chọn tất cả</string>
+    <string name="video_too_long">Video quá dài. Video có chỉ được dài tối đa $ giây</string>
+    <string name="image_video_icon_desc">Indicates this thumbnail as video</string>
+    <string name="dialog_choose_camera_title">Select camera</string>
+    <string name="dialog_choose_camera_item_0">Take image</string>
+    <string name="dialog_choose_camera_item_1">Take video</string>
+    <string name="can_choose_d_image">You can only select %d image</string>
+    <string name="cwac_cam2_ok">OK</string>
+    <string name="cwac_cam2_retry">Try again</string>
+
+
+    <string name="picture">Image</string>
+    <string name="all_image">All images</string>
+    <string name="take_picture">Take image</string>
+    <string name="preview">Preview</string>
+    <string name="preview_num">Preview (%1$d)</string>
+    <string name="choose">Select</string>
+    <string name="done">Done</string>
+    <string name="use">OK</string>
+    <string name="num_postfix">%1$s</string>
+    <string name="done_num">Done (%1$d/%2$d)</string>
+    <string name="message_max_num">Can select up to %1$d iamge</string>
+    <string name="save_ing">Saving image…</string>
+    <string name="video">Video</string>
+    <string name="all_videos">All videos</string>
+    <string name="take_video">Take video</string>
+    <string name="add_description">Add description</string>
+
+</resources>
diff --git a/imagepicker/src/main/res/values-ko/strings.xml b/imagepicker/src/main/res/values-ko/strings.xml
index c729a7d..56f639a 100644
--- a/imagepicker/src/main/res/values-ko/strings.xml
+++ b/imagepicker/src/main/res/values-ko/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">이미지 선택</string>
     <string name="album_thumbnail">앨범 썸네일</string>
     <string name="image_thumbnail">이미지 썸네일</string>
     <string name="action_take_photo">사진 촬영</string>
diff --git a/imagepicker/src/main/res/values-land/dimens.xml b/imagepicker/src/main/res/values-land/dimens.xml
index 271a7ff..78554f9 100644
--- a/imagepicker/src/main/res/values-land/dimens.xml
+++ b/imagepicker/src/main/res/values-land/dimens.xml
@@ -2,8 +2,4 @@
 <resources>
 
 
-
-    <dimen name="album_height">160dp</dimen>
-
-
 </resources>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/values-pt/strings.xml b/imagepicker/src/main/res/values-pt/strings.xml
index 74c53f5..7cfede6 100644
--- a/imagepicker/src/main/res/values-pt/strings.xml
+++ b/imagepicker/src/main/res/values-pt/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">ImagePicker</string>
     <string name="album_thumbnail">álbum Miniatura</string>
     <string name="image_thumbnail">Imagem Miniatura</string>
     <string name="action_take_photo">Tire uma foto</string>
diff --git a/imagepicker/src/main/res/values-vi/strings.xml b/imagepicker/src/main/res/values-vi/strings.xml
new file mode 100644
index 0000000..4af665d
--- /dev/null
+++ b/imagepicker/src/main/res/values-vi/strings.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="album_thumbnail">Album Thumbnail</string>
+    <string name="image_thumbnail">Image thumbnail</string>
+    <string name="action_take_photo">Chụp ảnh</string>
+    <string name="all_photos">Tất cả ảnh</string>
+    <string name="image_check">Chọn ảnh</string>
+    <string name="albums_title">Album</string>
+    <string name="you_cant_check_more_images">Không thể chọn thêm ảnh</string>
+    <string name="image_position_in_view_pager">% trên $</string>
+    <string name="action_select_all">Chọn tất cả</string>
+    <string name="action_deselect_all">Bỏ chọn tất cả</string>
+    <string name="video_too_long">Video quá dài. Video có chỉ được dài tối đa $ giây</string>
+    <string name="image_video_icon_desc">Indicates this thumbnail as video</string>
+    <string name="dialog_choose_camera_title">Chọn máy ảnh</string>
+    <string name="dialog_choose_camera_item_0">Chụp ảnh</string>
+    <string name="dialog_choose_camera_item_1">Quay phim</string>
+    <string name="can_choose_d_image">Chỉ được chọn %d ảnh</string>
+    <string name="cwac_cam2_ok">OK</string>
+    <string name="cwac_cam2_retry">Thử lại</string>
+
+
+    <string name="picture">Ảnh</string>
+    <string name="all_image">Tất cả ảnh</string>
+    <string name="take_picture">Chụp ảnh</string>
+    <string name="preview">Xem trước</string>
+    <string name="preview_num">Xem trước (%1$d)</string>
+    <string name="choose">Chọn</string>
+    <string name="done">Xong</string>
+    <string name="use">OK</string>
+    <string name="num_postfix">%1$s</string>
+    <string name="done_num">Xong (%1$d/%2$d)</string>
+    <string name="message_max_num">Có thể chọn tới %1$d ảnh</string>
+    <string name="save_ing">Đang lưu ảnh…</string>
+    <string name="video">Video</string>
+    <string name="all_videos">Tất cả video</string>
+    <string name="take_video">Quay video</string>
+    <string name="add_description">Thêm mô tả</string>
+
+
+    <string name="ucrop_label_original">Gốc</string>
+    <string name="ucrop_label_edit_photo">Sửa ảnh</string>
+
+    <string name="ucrop_menu_crop">Cắt</string>
+
+    <string name="ucrop_error_input_data_is_absent" translatable="false">Both input and output Uri must be specified</string>
+    <string name="ucrop_mutate_exception_hint" translatable="false">Therefore, override color resource (ucrop_color_toolbar_widget) in your app to make it work on pre-L devices</string>
+    <string name="ucrop_rotate">Xoay</string>
+    <string name="ucrop_scale">Thu phóng</string>
+    <string name="ucrop_crop">Cắt</string>
+</resources>
diff --git a/imagepicker/src/main/res/values-w820dp/dimens.xml b/imagepicker/src/main/res/values-w820dp/dimens.xml
index 63fc816..90bf001 100644
--- a/imagepicker/src/main/res/values-w820dp/dimens.xml
+++ b/imagepicker/src/main/res/values-w820dp/dimens.xml
@@ -2,5 +2,4 @@
     <!-- Example customization of dimensions originally defined in res/values/dimens.xml
          (such as screen margins) for screens with more than 820dp of available width. This
          would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
 </resources>
diff --git a/imagepicker/src/main/res/values/colors.xml b/imagepicker/src/main/res/values/colors.xml
index 78c8a0a..0511dc9 100644
--- a/imagepicker/src/main/res/values/colors.xml
+++ b/imagepicker/src/main/res/values/colors.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <drawable name="transparent">@android:color/transparent</drawable>
-    <color name="alter_primary">#424242</color>
-    <color name="alter_primary_dark">#212121</color>
-
+    <color name="colorPrimary">#0ea1e5</color>
+    <color name="colorPrimaryDark">#0EA1E5</color>
+    <color name="colorAccent">#ef645d</color>
 
     <color name="alter_unchecked_image_background">@android:color/transparent</color>
-    <color name="alter_checked_image_background">#dd2fdfff</color>
 
 
     <color name="alter_image_check_color">#b457585b</color>
@@ -19,9 +17,27 @@
     <color name="alter_album_name_text_color">#fcffff</color>
 
     <color name="alter_album_images_count_text_color">#a5a49f</color>
-    <color name="alter_checked_image_overlay">#a97f7f7f</color>
 
     <color name="alter_video_thumbnail_overlay">#9b9b9b</color>
-
-
+    <color name="cwac_cam2_secondary_fab">#fafafa</color>
+    <color name="cwac_cam2_secondary_fab_pressed">#f1f1f1</color>
+    <color name="cwac_cam2_recording_fab">#da4336</color>
+    <color name="cwac_cam2_recording_fab_pressed">#e75043</color>
+    <color name="cwac_cam2_picture_fab">#00a400</color>
+    <color name="cwac_cam2_picture_fab_pressed">#00da00</color>
+    <color name="cwac_cam2_chrono_background">#80808080</color>
+    <color name="white">#ffffff</color>
+    <color name="white_70">#ADFFFFFF</color>
+    <color name="black">#000000</color>
+    <color name="black_3">#333333</color>
+    <color name="green">#43c117</color>
+    <color name="green_70">#AD43c117</color>
+    <color name="bar_grey">#393a3e</color>
+    <color name="bar_grey_90">#dd393a3e</color>
+    <color name="grey">#999999</color>
+    <color name="divider_color">#30888888</color>
+    <color name="content_grey">#353535</color>
+    <color name="image_overlay">#20000000</color>
+    <color name="image_overlay2">#80000000</color>
+    <color name="black_semi_trans">#B2000000</color>
 </resources>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/values/dimens.xml b/imagepicker/src/main/res/values/dimens.xml
index 1a2b848..8f372cd 100644
--- a/imagepicker/src/main/res/values/dimens.xml
+++ b/imagepicker/src/main/res/values/dimens.xml
@@ -1,18 +1,32 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-
-
-    <dimen name="album_height">180dp</dimen>
 
 
     <dimen name="image_spacing">2dp</dimen>
     <dimen name="image_checked_padding">4dp</dimen>
-    <dimen name="album_spacing">2dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="grid_spacing">2dp</dimen>
     <dimen name="grid_titleframe_height">42dp</dimen>
 
+    <dimen name="cwac_cam2_fragment_drawer_width">128dp</dimen>
+    <dimen name="cwac_cam2_fragment_drawer_shadow_size">4dp</dimen>
+    <dimen name="cwac_cam2_fragment_drawer_offset_distance">16dp</dimen>
+    <dimen name="cwac_cam2_fragment_panel_padding">16dp</dimen>
+    <dimen name="cwac_cam2_fragment_panel_item_width">96dp</dimen>
+    <dimen name="cwac_cam2_fragment_panel_item_height">48dp</dimen>
+    <dimen name="cwac_cam2_fragment_chrono_margin">16dp</dimen>
+    <dimen name="cwac_cam2_gridline_width">1dp</dimen>
+
+    <dimen name="btn_radius">2dp</dimen>
+    <dimen name="bar_height">48dp</dimen>
+    <dimen name="btn_height">32dp</dimen>
+    <dimen name="margin_text">8dp</dimen>
+    <dimen name="margin_layout">16dp</dimen>
+    <dimen name="status_bar_height">25dp</dimen>
+    <dimen name="big_image_size">74dp</dimen>
+    <dimen name="min_button_width">52dp</dimen>
 
+    <dimen name="middle_text_size">17sp</dimen>
+    <dimen name="small_text_size">15sp</dimen>
+    <dimen name="mini_text_size">13sp</dimen>
 </resources>
diff --git a/imagepicker/src/main/res/values/strings.xml b/imagepicker/src/main/res/values/strings.xml
index 9d3a500..64c99ed 100644
--- a/imagepicker/src/main/res/values/strings.xml
+++ b/imagepicker/src/main/res/values/strings.xml
@@ -1,21 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">ImagePicker</string>
+
     <string name="album_thumbnail">Album Thumbnail</string>
     <string name="image_thumbnail">Image thumbnail</string>
-    <string name="action_take_photo">Take a photo</string>
-    <string name="all_photos">All Photos</string>
-    <string name="image_check">Image check</string>
-    <string name="albums_title">Albums</string>
-    <string name="you_cant_check_more_images">You can\'t check more images</string>
-    <string name="image_position_in_view_pager">% of $</string>
-    <string name="action_select_all">Select all</string>
-    <string name="action_deselect_all">Deselect all</string>
-    <string name="video_too_long">Video too long. Videos must be $ seconds or less in length</string>
+    <string name="action_take_photo">Chụp ảnh</string>
+    <string name="all_photos">Tất cả ảnh</string>
+    <string name="image_check">Chọn ảnh</string>
+    <string name="albums_title">Album</string>
+    <string name="you_cant_check_more_images">Không thể chọn thêm ảnh</string>
+    <string name="image_position_in_view_pager">% trên $</string>
+    <string name="action_select_all">Chọn tất cả</string>
+    <string name="action_deselect_all">Bỏ chọn tất cả</string>
+    <string name="video_too_long">Video quá dài. Video có chỉ được dài tối đa $ giây</string>
     <string name="image_video_icon_desc">Indicates this thumbnail as video</string>
-    <string name="dialog_choose_camera_title">Choose camera</string>
-    <string name="dialog_choose_camera_item_0">Photo camera</string>
-    <string name="dialog_choose_camera_item_1">Video camera</string>
+    <string name="dialog_choose_camera_title">Chọn máy ảnh</string>
+    <string name="dialog_choose_camera_item_0">Chụp ảnh</string>
+    <string name="dialog_choose_camera_item_1">Quay phim</string>
+    <string name="can_choose_d_image">Chỉ được chọn %d ảnh</string>
+    <string name="cwac_cam2_ok">OK</string>
+    <string name="cwac_cam2_retry">Thử lại</string>
+
 
+    <string name="picture">Ảnh</string>
+    <string name="all_image">Tất cả ảnh</string>
+    <string name="take_picture">Chụp ảnh</string>
+    <string name="preview">Xem trước</string>
+    <string name="preview_num">Xem trước (%1$d)</string>
+    <string name="choose">Chọn</string>
+    <string name="done">Xong</string>
+    <string name="use">OK</string>
+    <string name="num_postfix">%1$s</string>
+    <string name="done_num">Xong (%1$d/%2$d)</string>
+    <string name="message_max_num">Có thể chọn tới %1$d ảnh</string>
+    <string name="save_ing">Đang lưu ảnh…</string>
+    <string name="video">Video</string>
+    <string name="all_videos">Tất cả video</string>
+    <string name="take_video">Quay video</string>
+    <string name="add_description">Thêm mô tả</string>
 </resources>
diff --git a/imagepicker/src/main/res/values/styles.xml b/imagepicker/src/main/res/values/styles.xml
index 82dbdf8..28f7713 100644
--- a/imagepicker/src/main/res/values/styles.xml
+++ b/imagepicker/src/main/res/values/styles.xml
@@ -1,6 +1,33 @@
 <resources>
 
 
-    <style name="RecyclerView"></style>
+    <style name="PickerTheme" parent="ThemeOverlay.AppCompat.Dark">
+        <!-- Customize your theme here. -->
+        <item name="android:typeface">monospace</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
 
+    <style name="MyToolbar" parent="android:Widget">
+        <item name="titleTextAppearance">@style/ToolBarTitle</item>
+        <!--<item name="subtitleTextAppearance">@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle</item>-->
+        <item name="android:minHeight">48dp</item>
+        <item name="titleMargins">4dp</item>
+        <item name="maxButtonHeight">56dp</item>
+        <item name="collapseIcon">?attr/homeAsUpIndicator</item>
+        <!--<item name="collapseContentDescription">@string/abc_toolbar_collapse_description</item>-->
+        <item name="contentInsetStart">16dp</item>
+        <!--<item name="android:paddingLeft">@dimen/abc_action_bar_default_padding_start_material</item>-->
+        <!--<item name="android:paddingRight">@dimen/abc_action_bar_default_padding_end_material</item>-->
+    </style>
+    <style name="ToolBarTitle" parent="android:Widget">
+        <item name="android:textSize">19sp</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="WindowStyle">
+        <item name="android:windowEnterAnimation">@anim/fade_in</item>
+        <item name="android:windowExitAnimation">@anim/fade_out</item>
+    </style>
 </resources>

From 04053e5050abf826a240289ee447c078550accd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=E1=BA=A7n=20Anh?= <trantuananh1996@gmail.com>
Date: Wed, 2 Oct 2019 15:41:54 +0700
Subject: [PATCH 03/16] Register event bus

---
 .../java/net/yazeed44/imagepicker/ui/PickerActivity.java  | 8 +++++++-
 .../imagepicker/ui/imagePreview/ImagePreviewActivity.java | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
index 44e95e5..97f7d17 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
@@ -59,7 +59,6 @@
 import java.util.Locale;
 
 
-
 public class PickerActivity extends AppCompatActivity {
     public static final int NO_LIMIT = -1;
     public static final String KEY_ACTION_BAR_TITLE = "actionBarKey";
@@ -96,9 +95,16 @@ protected void attachBaseContext(Context newBase) {
         super.attachBaseContext(LocaleHelper.onAttach(newBase));
     }
 
+    @Override
+    protected void onDestroy() {
+        if (EventBus.getDefault().isRegistered(this)) EventBus.getDefault().unregister(this);
+        super.onDestroy();
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().register(this);
         if (mPickOptions == null) {
             finish();
             return;
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java
index a350dea..e952e05 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java
@@ -49,7 +49,11 @@ public void onEvent(Events.OnPublishPickOptionsEvent event) {
     protected void attachBaseContext(Context newBase) {
         super.attachBaseContext(LocaleHelper.onAttach(newBase));
     }
-
+    @Override
+    protected void onDestroy() {
+        if (EventBus.getDefault().isRegistered(this)) EventBus.getDefault().unregister(this);
+        super.onDestroy();
+    }
     @Subscribe(sticky = true)
     public void onEvent(Events.OnImagePreviewEvent event) {
         imageEntries = event.imageEntries;
@@ -58,6 +62,8 @@ public void onEvent(Events.OnImagePreviewEvent event) {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().register(this);
+
 //        getActivityComponent().inject(this);
         setContentView(R.layout.activity_album_pick);
 //        setStatusBarColor(R.color.white);

From 33d3f5b34635adad749948453b1581ceec359d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=E1=BA=A7n=20Anh?= <trantuananh1996@gmail.com>
Date: Sat, 2 Nov 2019 10:21:07 +0700
Subject: [PATCH 04/16] Fix motion event

---
 imagepicker/build.gradle                      |  1 -
 .../util/MotionEventFixedViewPager.java       | 36 +++++++++++++++++++
 .../net/yazeed44/imagepicker/util/Picker.java |  8 ++---
 .../main/res/layout/fragment_image_pager.xml  |  4 +--
 4 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/util/MotionEventFixedViewPager.java

diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index 349d000..e966851 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -25,7 +25,6 @@ ext {
 
 }
 
-
 android {
     compileSdkVersion 28
 
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MotionEventFixedViewPager.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MotionEventFixedViewPager.java
new file mode 100644
index 0000000..6b72d75
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MotionEventFixedViewPager.java
@@ -0,0 +1,36 @@
+package net.yazeed44.imagepicker.util;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+public class MotionEventFixedViewPager extends androidx.viewpager.widget.ViewPager {
+
+    public MotionEventFixedViewPager(Context context) {
+        super(context);
+    }
+
+    public MotionEventFixedViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        try {
+            return super.onTouchEvent(ev);
+        } catch (IllegalArgumentException ex) {
+            ex.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        try {
+            return super.onInterceptTouchEvent(ev);
+        } catch (IllegalArgumentException ex) {
+            ex.printStackTrace();
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
index f563787..3da2745 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
@@ -81,7 +81,7 @@ private Picker(final Builder builder) {
         videoThumbnailOverlayColor = builder.mVideoThumbnailOverlayColor;
         videoIconTintColor = builder.mVideoIconTintColor;
         backBtnInMainActivity = builder.mBackBtnInMainActivity;
-        shouldShowItemAfterPick = builder.shouldShowItemAfterPick;
+        shouldShowItemAfterPick = builder.shouldInputDescription;
         aspectRatioX = builder.aspectRatioX;
         aspectRatioY = builder.aspectRatioY;
     }
@@ -112,7 +112,7 @@ public static final class Builder {
         private final Context mContext;
         private final PickListener mPickListener;
         private final int mThemeResId;
-        private boolean shouldShowItemAfterPick;
+        private boolean shouldInputDescription;
         private int mLimit = PickerActivity.NO_LIMIT;
         private int mFabBackgroundColor;
         @ColorInt
@@ -218,8 +218,8 @@ public Picker.Builder withAspectRatio(float x, float y) {
             return this;
         }
 
-        public Picker.Builder setShowItemAfterPick(final boolean isShow) {
-            shouldShowItemAfterPick = isShow;
+        public Picker.Builder shouldInputDescription(final boolean isShow) {
+            shouldInputDescription = isShow;
             return this;
         }
 
diff --git a/imagepicker/src/main/res/layout/fragment_image_pager.xml b/imagepicker/src/main/res/layout/fragment_image_pager.xml
index 306cd24..e6a053d 100644
--- a/imagepicker/src/main/res/layout/fragment_image_pager.xml
+++ b/imagepicker/src/main/res/layout/fragment_image_pager.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+<net.yazeed44.imagepicker.util.MotionEventFixedViewPager xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+    android:layout_height="match_parent" />
 
 

From cba357b0767838a4419d3693da76ffad8a3274db Mon Sep 17 00:00:00 2001
From: anhtt <anhtt@omt.vn>
Date: Thu, 5 Dec 2019 10:32:16 +0700
Subject: [PATCH 05/16] Separate pickers

---
 .../multiimagepicker/MainActivity.java        |   1 +
 build.gradle                                  |   4 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 imagepicker/build.gradle                      |  12 +-
 imagepicker/src/main/AndroidManifest.xml      |   6 +-
 .../imagepicker/ui/PickerActivity.java        |  48 +++++--
 .../ui/imagePreview/ImagePreviewActivity.java |  13 +-
 .../ui/imagePreview/ImagePreviewAdapter.java  |  13 +-
 .../ui/photoPager/ImagesPagerFragment.java    |   2 +-
 .../util/MotionEventFixedViewPager.java       |   2 -
 .../imagepicker/util/MultiplePicker.java      |  49 +++++++
 .../net/yazeed44/imagepicker/util/Picker.java | 134 ++++++++++++++----
 .../imagepicker/util/SinglePicker.java        |  54 +++++++
 .../imagepicker/util/SquareImageView.java     |  25 ++++
 .../net/yazeed44/imagepicker/util/Util.java   |   1 +
 .../res/drawable/bg_edittext_under_line.xml   |  20 +++
 .../main/res/layout/element_image_preview.xml |   7 +-
 .../src/main/res/values-vi/strings.xml        |   2 +
 imagepicker/src/main/res/values/strings.xml   |   2 +
 19 files changed, 334 insertions(+), 65 deletions(-)
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/util/MultiplePicker.java
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/util/SinglePicker.java
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/util/SquareImageView.java
 create mode 100644 imagepicker/src/main/res/drawable/bg_edittext_under_line.xml

diff --git a/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java b/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java
index 2fb23b7..53fa119 100644
--- a/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java
+++ b/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java
@@ -60,6 +60,7 @@ public void onClickPickImageSingle(View view) {
 
         new Picker.Builder(this, this, R.style.MIP_theme)
                 .setPickMode(Picker.PickMode.SINGLE_IMAGE)
+                .setCropAfterPick(true)
                 .build()
                 .startActivity();
     }
diff --git a/build.gradle b/build.gradle
index c7d34ed..ea707df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,9 +16,10 @@ buildscript {
             name 'Sonatype SNAPSHOTs';
             url 'https://oss.sonatype.org/content/repositories/snapshots/'
         }
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.0.0-alpha01'
         classpath 'com.google.gms:google-services:4.3.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
@@ -38,6 +39,7 @@ allprojects {
         }
         maven { url "https://jitpack.io" }
         google()
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c8f3990..07e32a0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 22 16:23:45 AST 2015
+#Sat Nov 02 10:38:14 ICT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index e966851..421db40 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -55,13 +55,13 @@ repositories {
 dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha10'
+    implementation 'com.google.android.material:material:1.2.0-alpha01'
     implementation 'com.github.bumptech.glide:glide:4.10.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
     implementation('com.octo.android.robospice:robospice:1.4.14') {
         exclude group: 'org.apache.commons', module: 'commons-io'
     }
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
 
     implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
@@ -71,14 +71,16 @@ dependencies {
 
     //Rx Java
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.12'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.14'
     implementation 'com.squareup.retrofit2:adapter-rxjava:2.6.2'
     implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
     //Dagger
-    implementation 'com.google.dagger:dagger:2.24'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
+    implementation 'com.google.dagger:dagger:2.25.2'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.25.2'
     implementation 'net.sourceforge.streamsupport:streamsupport:1.7.1'
     implementation 'com.jaeger.statusbarutil:library:1.5.1'
+    implementation 'com.github.florent37:runtime-permission:1.1.1'
+    implementation 'com.github.trantuananh1996:sweetAlert:-SNAPSHOT'
 
 }
 
diff --git a/imagepicker/src/main/AndroidManifest.xml b/imagepicker/src/main/AndroidManifest.xml
index d16afe9..0251615 100644
--- a/imagepicker/src/main/AndroidManifest.xml
+++ b/imagepicker/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -19,8 +20,9 @@
         android:name="android.hardware.microphone"
         android:required="false" />
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <application android:allowBackup="true">
+    <application
+        android:allowBackup="true"
+        android:requestLegacyExternalStorage="true">
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false" />
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
index 97f7d17..2f68a3c 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
@@ -46,7 +46,10 @@
 import net.yazeed44.imagepicker.ui.photoPager.ImagesPagerFragment;
 import net.yazeed44.imagepicker.util.CameraSupport;
 import net.yazeed44.imagepicker.util.LocaleHelper;
+import net.yazeed44.imagepicker.util.MultiplePicker;
 import net.yazeed44.imagepicker.util.Picker;
+import net.yazeed44.imagepicker.util.SinglePicker;
+import net.yazeed44.imagepicker.util.UIUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -109,6 +112,7 @@ protected void onCreate(Bundle savedInstanceState) {
             finish();
             return;
         }
+        UIUtil.hideKeyboard(this);
         setContentView(R.layout.activity_pick);
         initTheme();
         toolbar = findViewById(R.id.album_toolbar);
@@ -233,26 +237,42 @@ public void onClickDone(View view) {
             super.finish();
             onCancel();
         } else {
-            if (mPickOptions.shouldShowItemAfterPick) {
-                if (mPickOptions.pickMode == Picker.PickMode.SINGLE_IMAGE) {
-                    Uri destinationUri = Uri.fromFile(new File(this.getCacheDir(), "IMG_" + System.currentTimeMillis()));
+            if (mPickOptions instanceof SinglePicker) {
+                SinglePicker singlePicker = (SinglePicker) mPickOptions;
 
+                if (singlePicker.cropAfterPick) {
+                    Uri destinationUri = Uri.fromFile(new File(this.getCacheDir(), "IMG_" + System.currentTimeMillis()));
                     UCrop builder = UCrop.of(mCurrentlyDisplayedImage.getUri(), destinationUri);
-                    if (mPickOptions != null && mPickOptions.aspectRatioY != -1 && mPickOptions.aspectRatioY != -1)
-                        builder.withAspectRatio(mPickOptions.aspectRatioX, mPickOptions.aspectRatioY);
+                    if (singlePicker.aspectRatioY != -1 && singlePicker.aspectRatioY != -1)
+                        builder.withAspectRatio(singlePicker.aspectRatioX, singlePicker.aspectRatioY);
                     builder.start(this);
-//                    super.finish();
                 } else {
-                    EventBus.getDefault().postSticky(new Events.OnPublishPickOptionsEvent(mPickOptions));
-                    EventBus.getDefault().postSticky(new Events.OnImagePreviewEvent(sCheckedImages));
-                    Intent intent = new Intent(this, ImagePreviewActivity.class);
-                    startActivityForResult(intent, ImagePreviewActivity.REQUEST_PREVIEW);
+                    super.finish();
+                    mPickOptions.pickListener.onPickedSuccessfully(new ArrayList<>(sCheckedImages));
+                    sCheckedImages.clear();
+                    EventBus.getDefault().removeAllStickyEvents();
                 }
             } else {
-                super.finish();
-                mPickOptions.pickListener.onPickedSuccessfully(new ArrayList<>(sCheckedImages));
-                sCheckedImages.clear();
-                EventBus.getDefault().removeAllStickyEvents();
+                if (mPickOptions instanceof MultiplePicker) {
+                    MultiplePicker multiplePicker = (MultiplePicker) mPickOptions;
+                    if (multiplePicker.inputDescription) {
+                        EventBus.getDefault().postSticky(new Events.OnPublishPickOptionsEvent(multiplePicker));
+                        EventBus.getDefault().postSticky(new Events.OnImagePreviewEvent(sCheckedImages));
+                        Intent intent = new Intent(this, ImagePreviewActivity.class);
+                        intent.putExtra("descriptionHint", multiplePicker.descriptionHint);
+                        startActivityForResult(intent, ImagePreviewActivity.REQUEST_PREVIEW);
+                    } else {
+                        super.finish();
+                        mPickOptions.pickListener.onPickedSuccessfully(new ArrayList<>(sCheckedImages));
+                        sCheckedImages.clear();
+                        EventBus.getDefault().removeAllStickyEvents();
+                    }
+                } else {
+                    super.finish();
+                    mPickOptions.pickListener.onPickedSuccessfully(new ArrayList<>(sCheckedImages));
+                    sCheckedImages.clear();
+                    EventBus.getDefault().removeAllStickyEvents();
+                }
             }
         }
     }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java
index e952e05..f6c9e48 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewActivity.java
@@ -38,6 +38,7 @@ public class ImagePreviewActivity extends AppCompatActivity {
     FloatingActionButton mDoneFab;
     private ArrayList<ImageEntry> imageEntries = new ArrayList<>();
     ImagePreviewAdapter imagePreviewAdapter;
+    private String descriptionHint;
 
     @Subscribe(sticky = true)
     public void onEvent(Events.OnPublishPickOptionsEvent event) {
@@ -49,11 +50,13 @@ public void onEvent(Events.OnPublishPickOptionsEvent event) {
     protected void attachBaseContext(Context newBase) {
         super.attachBaseContext(LocaleHelper.onAttach(newBase));
     }
+
     @Override
     protected void onDestroy() {
         if (EventBus.getDefault().isRegistered(this)) EventBus.getDefault().unregister(this);
         super.onDestroy();
     }
+
     @Subscribe(sticky = true)
     public void onEvent(Events.OnImagePreviewEvent event) {
         imageEntries = event.imageEntries;
@@ -93,11 +96,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         final GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 2);
 
         gridLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
-
+        if (getIntent().getExtras() != null) {
+            descriptionHint = getIntent().getExtras().getString("descriptionHint");
+        }
         rvImages.setLayoutManager(gridLayoutManager);
-        if (rvImages.getItemDecorationCount() <= 0)
-            rvImages.addItemDecoration(new SpacesItemDecoration(getResources().getDimensionPixelSize(R.dimen.image_spacing)));
-        imagePreviewAdapter = new ImagePreviewAdapter(imageEntries, rvImages, mPickOptions);
+//        if (rvImages.getItemDecorationCount() <= 0)
+//            rvImages.addItemDecoration(new SpacesItemDecoration(getResources().getDimensionPixelSize(R.dimen.image_spacing)));
+        imagePreviewAdapter = new ImagePreviewAdapter(imageEntries, rvImages, mPickOptions, descriptionHint);
         rvImages.setAdapter(imagePreviewAdapter);
 
 
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
index 34bb685..a1f547f 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
@@ -4,6 +4,7 @@
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,10 +20,13 @@
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 
 import net.yazeed44.imagepicker.data.model.ImageEntry;
 import net.yazeed44.imagepicker.library.R;
 import net.yazeed44.imagepicker.util.Picker;
+import net.yazeed44.imagepicker.util.UIUtil;
 
 import java.util.ArrayList;
 
@@ -39,15 +43,16 @@ public class ImagePreviewAdapter extends RecyclerView.Adapter<ImagePreviewAdapte
 
     protected final Drawable mCheckIcon;
     protected final Drawable mVideoIcon;
+    private String descriptionHint;
 
-
-    public ImagePreviewAdapter(final ArrayList<ImageEntry> imageEntries, final RecyclerView recyclerView, Picker pickOptions) {
+    public ImagePreviewAdapter(final ArrayList<ImageEntry> imageEntries, final RecyclerView recyclerView, Picker pickOptions, String descriptionHint) {
         this.imageEntries = imageEntries;
         this.mRecyclerView = recyclerView;
         mPickOptions = pickOptions;
 
         mCheckIcon = createCheckIcon();
         mVideoIcon = createVideoIcon();
+        this.descriptionHint = descriptionHint;
     }
 
     private Drawable createCheckIcon() {
@@ -85,7 +90,7 @@ public int getItemCount() {
     public void onBindViewHolder(@NonNull ImageViewHolder imageViewHolder, int position) {
         imageViewHolder.description.setTag(position);
         final ImageEntry imageEntry = imageEntries.get(position);
-        setHeight(imageViewHolder.itemView);
+//        setHeight(imageViewHolder.itemView);
         displayThumbnail(imageViewHolder, imageEntry);
         drawGrid(imageViewHolder, imageEntry);
         imageViewHolder.description.setText(imageEntry.getDescription());
@@ -101,6 +106,7 @@ public void setHeight(final View convertView) {
     public void displayThumbnail(final ImageViewHolder holder, final ImageEntry photo) {
         Glide.with(holder.itemView.getContext())
                 .asBitmap()
+                .transform(new CenterCrop(), new RoundedCorners((int) UIUtil.dpToPx(holder.itemView.getContext(), 8)))
                 .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
                 .load(photo.path)
                 .into(holder.thumbnail);
@@ -136,6 +142,7 @@ class ImageViewHolder extends RecyclerView.ViewHolder {
         public ImageViewHolder(final View itemView) {
             super(itemView);
             description = itemView.findViewById(R.id.edt_des);
+            if (!TextUtils.isEmpty(descriptionHint)) description.setHint(descriptionHint);
 
             thumbnail = itemView.findViewById(R.id.image_thumbnail);
             videoIcon = itemView.findViewById(R.id.image_video_icon);
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
index 22bc66f..c9374d6 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
@@ -84,7 +84,7 @@ public void onPause() {
         super.onPause();
         EventBus.getDefault().unregister(this);
 
-        mDoneFab.hide();
+        if (mDoneFab != null) mDoneFab.hide();
     }
 
     @Override
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MotionEventFixedViewPager.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MotionEventFixedViewPager.java
index 6b72d75..7dd1192 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MotionEventFixedViewPager.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MotionEventFixedViewPager.java
@@ -19,7 +19,6 @@ public boolean onTouchEvent(MotionEvent ev) {
         try {
             return super.onTouchEvent(ev);
         } catch (IllegalArgumentException ex) {
-            ex.printStackTrace();
         }
         return false;
     }
@@ -29,7 +28,6 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
         try {
             return super.onInterceptTouchEvent(ev);
         } catch (IllegalArgumentException ex) {
-            ex.printStackTrace();
         }
         return false;
     }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MultiplePicker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MultiplePicker.java
new file mode 100644
index 0000000..b05215c
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MultiplePicker.java
@@ -0,0 +1,49 @@
+package net.yazeed44.imagepicker.util;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+public class MultiplePicker extends Picker {
+
+    public final boolean inputDescription;
+    public final String descriptionHint;
+
+    protected MultiplePicker(MultipleBuilder builder) {
+        super(builder);
+        inputDescription = builder.inputDescription;
+        descriptionHint = builder.descriptionHint;
+    }
+
+    public static final class MultipleBuilder extends Picker.Builder {
+        private boolean inputDescription;
+        private String descriptionHint;
+
+        public MultipleBuilder(Context context, Picker.PickListener listener) {
+            super(context, listener);
+        }
+
+        public MultipleBuilder(@NonNull Context context, @NonNull Picker.PickListener listener, int themeResId) {
+            super(context, listener, themeResId);
+        }
+
+        public MultipleBuilder(Builder other) {
+            super(other);
+        }
+
+        public MultiplePicker.MultipleBuilder setInputDescription(final boolean isShow) {
+            inputDescription = isShow;
+            return this;
+        }
+
+        public MultiplePicker.MultipleBuilder setDescriptionHint(final String descriptionHint) {
+            this.descriptionHint = descriptionHint;
+            return this;
+        }
+
+        @Override
+        public Picker build() {
+            return new MultiplePicker(this);
+        }
+    }
+}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
index 3da2745..6c3a805 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
@@ -1,8 +1,11 @@
 package net.yazeed44.imagepicker.util;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Color;
+import android.util.Log;
 import android.util.TypedValue;
 
 import androidx.annotation.ColorInt;
@@ -11,6 +14,11 @@
 import androidx.annotation.StyleRes;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
+import androidx.fragment.app.FragmentActivity;
+
+import com.github.florent37.runtimepermission.PermissionResult;
+import com.github.florent37.runtimepermission.RuntimePermission;
+import com.pr.swalert.toast.ToastUtils;
 
 import net.yazeed44.imagepicker.data.Events;
 import net.yazeed44.imagepicker.data.model.ImageEntry;
@@ -21,12 +29,13 @@
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by yazeed44
  * on 6/14/15.
  */
-public final class Picker {
+public class Picker {
 
     public final int limit;
     public final WeakReference<Context> context;
@@ -52,11 +61,8 @@ public final class Picker {
     public final int videoThumbnailOverlayColor;
     public final int videoIconTintColor;
     public final boolean backBtnInMainActivity;
-    public final boolean shouldShowItemAfterPick;
-    public float aspectRatioX = -1;
-    public float aspectRatioY = -1;
 
-    private Picker(final Builder builder) {
+    protected Picker(final Builder builder) {
         context = new WeakReference<>(builder.mContext);
         limit = builder.mLimit;
         fabBackgroundColor = builder.mFabBackgroundColor;
@@ -81,20 +87,55 @@ private Picker(final Builder builder) {
         videoThumbnailOverlayColor = builder.mVideoThumbnailOverlayColor;
         videoIconTintColor = builder.mVideoIconTintColor;
         backBtnInMainActivity = builder.mBackBtnInMainActivity;
-        shouldShowItemAfterPick = builder.shouldInputDescription;
-        aspectRatioX = builder.aspectRatioX;
-        aspectRatioY = builder.aspectRatioY;
+
     }
 
     public void startActivity() {
-        if (context.get() != null) {
-            EventBus.getDefault().postSticky(new Events.OnPublishPickOptionsEvent(this));
-            final Intent intent = new Intent(context.get(), PickerActivity.class);
-            PickerActivity.mPickOptions = this;
-            context.get().startActivity(intent);
+        if (context.get() instanceof FragmentActivity) {
+            Log.d(getClass().getSimpleName(), "startActivity() called");
+            FragmentActivity fragmentActivity = (FragmentActivity) context.get();
+            String[] permissions = new String[2];
+            permissions[0] = Manifest.permission.READ_EXTERNAL_STORAGE;
+            permissions[1] = Manifest.permission.WRITE_EXTERNAL_STORAGE;
+            RuntimePermission.askPermission(fragmentActivity, permissions)
+                    .onDenied(result -> {
+                        StringBuilder denied = getPermissionsString(fragmentActivity, result, result.getDenied());
+                        ToastUtils.alertYesNo(fragmentActivity, String.format(fragmentActivity.getString(R.string.ask_perrmission), denied.toString()), yesButtonConfirmed -> {
+                            if (yesButtonConfirmed) {
+                                result.askAgain();
+                            }
+                        });
+                    })
+                    .onForeverDenied(result -> {
+                        StringBuilder denied = getPermissionsString(fragmentActivity, result, result.getForeverDenied());
+                        ToastUtils.alertYesNo(fragmentActivity, String.format(fragmentActivity.getString(R.string.ask_perrmission), denied.toString()), yesButtonConfirmed -> {
+                            if (yesButtonConfirmed) {
+                                result.goToSettings();
+                            }
+                        });
+                    })
+                    .onAccepted(result -> {
+                        EventBus.getDefault().postSticky(new Events.OnPublishPickOptionsEvent(Picker.this));
+                        final Intent intent = new Intent(fragmentActivity, PickerActivity.class);
+                        PickerActivity.mPickOptions = Picker.this;
+                        fragmentActivity.startActivity(intent);
+                    })
+                    .ask();
         }
     }
 
+    private StringBuilder getPermissionsString(Context context, PermissionResult result, List<String> foreverDenied) {
+        StringBuilder denied = new StringBuilder();
+        for (String permission : foreverDenied) {
+            try {
+                denied.append("- ").append(context.getPackageManager().getPermissionInfo(permission, 0).loadLabel(context.getPackageManager()));
+                if (result.getDenied().indexOf(permission) != result.getDenied().size() - 1)
+                    denied.append("\n");
+            } catch (PackageManager.NameNotFoundException e) {
+            }
+        }
+        return denied;
+    }
 
     public enum PickMode {
         SINGLE_IMAGE, MULTIPLE_IMAGES, SINGLE_VIDEO, MULTIPLE_VIDEOS, MIX
@@ -107,12 +148,11 @@ public interface PickListener {
 
     }
 
-    public static final class Builder {
+    public static class Builder {
 
         private final Context mContext;
         private final PickListener mPickListener;
         private final int mThemeResId;
-        private boolean shouldInputDescription;
         private int mLimit = PickerActivity.NO_LIMIT;
         private int mFabBackgroundColor;
         @ColorInt
@@ -146,9 +186,11 @@ public static final class Builder {
         private int mVideoThumbnailOverlayColor;
         @ColorInt
         private int mVideoIconTintColor;
-        private boolean mBackBtnInMainActivity=true;
-        private float aspectRatioX = -1;
-        private float aspectRatioY = -1;
+        private boolean mBackBtnInMainActivity = true;
+
+
+        private SinglePicker.SingleBuilder singleBuilder;
+        private MultiplePicker.MultipleBuilder multipleBuilder;
 
         public Builder(final Context context, final PickListener listener) {
             mThemeResId = R.style.PickerTheme;
@@ -160,6 +202,35 @@ public Builder(final Context context, final PickListener listener) {
 
         }
 
+        public Builder(Builder other) {
+            this.mContext = other.mContext;
+            this.mPickListener = other.mPickListener;
+            this.mThemeResId = other.mThemeResId;
+            this.mLimit = other.mLimit;
+            this.mFabBackgroundColor = other.mFabBackgroundColor;
+            this.mFabBackgroundColorWhenPressed = other.mFabBackgroundColorWhenPressed;
+            this.mImageBackgroundColorWhenChecked = other.mImageBackgroundColorWhenChecked;
+            this.mImageBackgroundColor = other.mImageBackgroundColor;
+            this.mImageCheckColor = other.mImageCheckColor;
+            this.mCheckedImageOverlayColor = other.mCheckedImageOverlayColor;
+            this.mAlbumImagesCountTextColor = other.mAlbumImagesCountTextColor;
+            this.mAlbumBackgroundColor = other.mAlbumBackgroundColor;
+            this.mAlbumNameTextColor = other.mAlbumNameTextColor;
+            this.mPickMode = other.mPickMode;
+            this.mPopupThemeResId = other.mPopupThemeResId;
+            this.mDoneFabIconTintColor = other.mDoneFabIconTintColor;
+            this.mCaptureItemIconTintColor = other.mCaptureItemIconTintColor;
+            this.mShouldShowCaptureMenuItem = other.mShouldShowCaptureMenuItem;
+            this.mCheckIconTintColor = other.mCheckIconTintColor;
+            this.mVideosEnabled = other.mVideosEnabled;
+            this.mVideoLengthLimit = other.mVideoLengthLimit;
+            this.mVideoThumbnailOverlayColor = other.mVideoThumbnailOverlayColor;
+            this.mVideoIconTintColor = other.mVideoIconTintColor;
+            this.mBackBtnInMainActivity = other.mBackBtnInMainActivity;
+            this.singleBuilder = other.singleBuilder;
+            this.multipleBuilder = other.multipleBuilder;
+        }
+
         public Builder(@NonNull final Context context, @NonNull final PickListener listener, @StyleRes final int themeResId) {
             mContext = context;
             mContext.setTheme(themeResId);
@@ -169,6 +240,7 @@ public Builder(@NonNull final Context context, @NonNull final PickListener liste
 
         }
 
+
         private void init() {
             final TypedValue typedValue = new TypedValue();
             initUsingColorAccent(typedValue);
@@ -212,17 +284,6 @@ public Picker.Builder setLimit(final int limit) {
             return this;
         }
 
-        public Picker.Builder withAspectRatio(float x, float y) {
-            aspectRatioX = x;
-            aspectRatioY = y;
-            return this;
-        }
-
-        public Picker.Builder shouldInputDescription(final boolean isShow) {
-            shouldInputDescription = isShow;
-            return this;
-        }
-
         public Picker.Builder setFabBackgroundColor(@ColorInt final int color) {
             mFabBackgroundColor = color;
             return this;
@@ -269,7 +330,19 @@ public Picker.Builder setAlbumImagesCountTextColor(@ColorInt final int color) {
             return this;
         }
 
-        public Picker.Builder setPickMode(final PickMode pickMode) {
+        public SinglePicker.SingleBuilder singleImage() {
+            setPickMode(PickMode.SINGLE_IMAGE);
+            if (singleBuilder == null) singleBuilder = new SinglePicker.SingleBuilder(this);
+            return singleBuilder;
+        }
+
+        public MultiplePicker.MultipleBuilder multipleImage() {
+            setPickMode(PickMode.MULTIPLE_IMAGES);
+            if (multipleBuilder == null) multipleBuilder = new MultiplePicker.MultipleBuilder(this);
+            return multipleBuilder;
+        }
+
+        private Picker.Builder setPickMode(final PickMode pickMode) {
             mPickMode = pickMode;
             return this;
         }
@@ -324,6 +397,7 @@ public Picker.Builder setVideoIconTintColor(@ColorInt final int color) {
             return this;
         }
 
+
         public Picker build() {
             return new Picker(this);
         }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/SinglePicker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/SinglePicker.java
new file mode 100644
index 0000000..93f4e1f
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/SinglePicker.java
@@ -0,0 +1,54 @@
+package net.yazeed44.imagepicker.util;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+public class SinglePicker extends Picker {
+
+    public final boolean cropAfterPick;
+    public float aspectRatioX = -1;
+    public float aspectRatioY = -1;
+
+    protected SinglePicker(SinglePicker.SingleBuilder builder) {
+        super(builder);
+        cropAfterPick = builder.cropAfterPick;
+        aspectRatioX = builder.aspectRatioX;
+        aspectRatioY = builder.aspectRatioY;
+    }
+
+
+    public static final class SingleBuilder extends Builder {
+        private boolean cropAfterPick;
+        private float aspectRatioX = -1;
+        private float aspectRatioY = -1;
+
+        public SingleBuilder(Builder other) {
+            super(other);
+        }
+
+        public SingleBuilder(Context context, PickListener listener) {
+            super(context, listener);
+        }
+
+        public SingleBuilder(@NonNull Context context, @NonNull PickListener listener, int themeResId) {
+            super(context, listener, themeResId);
+        }
+
+        public SinglePicker.SingleBuilder setCropAfterPick(boolean cropAfterPick) {
+            this.cropAfterPick = cropAfterPick;
+            return this;
+        }
+
+        public SinglePicker.SingleBuilder withAspectRatio(float x, float y) {
+            aspectRatioX = x;
+            aspectRatioY = y;
+            return this;
+        }
+
+        @Override
+        public Picker build() {
+            return new SinglePicker(this);
+        }
+    }
+}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/SquareImageView.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/SquareImageView.java
new file mode 100644
index 0000000..eaa4aba
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/SquareImageView.java
@@ -0,0 +1,25 @@
+package net.yazeed44.imagepicker.util;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.appcompat.widget.AppCompatImageView;
+
+public class SquareImageView extends AppCompatImageView {
+    public SquareImageView(Context context) {
+        super(context);
+    }
+
+    public SquareImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SquareImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, widthMeasureSpec);
+    }
+}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java
index 08efe04..78e8aa4 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java
@@ -96,6 +96,7 @@ public static ArrayList<AlbumEntry> getAlbums(final Context context, final Picke
         }
 
         Collections.sort(albumsSorted, (o1, o2) -> {
+            if (o1.name == null || o2.name == null) return 0;
             int o1Id = o1.name.contains("IMG") ? Integer.MAX_VALUE : o1.id;
             int o2Id = o2.name.contains("IMG") ? Integer.MAX_VALUE : o2.id;
             return Integer.compare(o1Id, o2Id);
diff --git a/imagepicker/src/main/res/drawable/bg_edittext_under_line.xml b/imagepicker/src/main/res/drawable/bg_edittext_under_line.xml
new file mode 100644
index 0000000..8a07311
--- /dev/null
+++ b/imagepicker/src/main/res/drawable/bg_edittext_under_line.xml
@@ -0,0 +1,20 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+    <item
+        android:left="-2dp"
+        android:right="-2dp"
+        android:top="-2dp">
+        <shape>
+            <solid android:color="@android:color/transparent" />
+            <stroke
+                android:width="0.5dp"
+                android:color="#ababb2"
+                android:dashGap="0px"
+                android:dashWidth="10px" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/layout/element_image_preview.xml b/imagepicker/src/main/res/layout/element_image_preview.xml
index 95646d4..a1087c7 100644
--- a/imagepicker/src/main/res/layout/element_image_preview.xml
+++ b/imagepicker/src/main/res/layout/element_image_preview.xml
@@ -12,11 +12,11 @@
         android:id="@+id/image_thumbnail"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:layout_margin="5dp"
         android:contentDescription="@string/image_thumbnail"
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:scaleType="centerCrop"
-        app:layout_constraintBottom_toTopOf="@+id/edt_des"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -39,8 +39,13 @@
         android:id="@+id/edt_des"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+        android:background="@drawable/bg_edittext_under_line"
         android:hint="@string/add_description"
         android:inputType="textMultiLine|textCapSentences"
+        android:padding="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/image_thumbnail" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/values-vi/strings.xml b/imagepicker/src/main/res/values-vi/strings.xml
index 4af665d..51a16a6 100644
--- a/imagepicker/src/main/res/values-vi/strings.xml
+++ b/imagepicker/src/main/res/values-vi/strings.xml
@@ -49,4 +49,6 @@
     <string name="ucrop_rotate">Xoay</string>
     <string name="ucrop_scale">Thu phóng</string>
     <string name="ucrop_crop">Cắt</string>
+    <string name="ask_perrmission">Ứng dụng cần các quyền sau để hoạt động bình thường:\n%s.\nĐồng ý cấp quyền cho Ứng dụng?</string>
+
 </resources>
diff --git a/imagepicker/src/main/res/values/strings.xml b/imagepicker/src/main/res/values/strings.xml
index 64c99ed..2d34d6d 100644
--- a/imagepicker/src/main/res/values/strings.xml
+++ b/imagepicker/src/main/res/values/strings.xml
@@ -38,4 +38,6 @@
     <string name="all_videos">Tất cả video</string>
     <string name="take_video">Quay video</string>
     <string name="add_description">Thêm mô tả</string>
+    <string name="ask_perrmission">Application needs following permissions to work normally: %s. Allow application to use those permissions?</string>
+
 </resources>

From 8058dabc49c3163cd466cf318605b0cb941dbce7 Mon Sep 17 00:00:00 2001
From: anhtt <anhtt@omt.vn>
Date: Sat, 18 Jan 2020 00:41:30 +0700
Subject: [PATCH 06/16] Update

---
 imagepicker/build.gradle                         | 16 ++++++++--------
 .../src/main/res/layout/cwac_cam2_fragment.xml   | 11 ++++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index 421db40..a2e5c1d 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -55,13 +55,13 @@ repositories {
 dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.2.0-alpha01'
-    implementation 'com.github.bumptech.glide:glide:4.10.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
+    implementation 'com.google.android.material:material:1.2.0-alpha03'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
     implementation('com.octo.android.robospice:robospice:1.4.14') {
         exclude group: 'org.apache.commons', module: 'commons-io'
     }
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
 
     implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
@@ -71,12 +71,12 @@ dependencies {
 
     //Rx Java
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.14'
-    implementation 'com.squareup.retrofit2:adapter-rxjava:2.6.2'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
+    implementation 'com.squareup.retrofit2:adapter-rxjava:2.7.1'
     implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
     //Dagger
-    implementation 'com.google.dagger:dagger:2.25.2'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.25.2'
+    implementation 'com.google.dagger:dagger:2.25.4'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.25.4'
     implementation 'net.sourceforge.streamsupport:streamsupport:1.7.1'
     implementation 'com.jaeger.statusbarutil:library:1.5.1'
     implementation 'com.github.florent37:runtime-permission:1.1.1'
diff --git a/imagepicker/src/main/res/layout/cwac_cam2_fragment.xml b/imagepicker/src/main/res/layout/cwac_cam2_fragment.xml
index d8c0208..d3029e0 100644
--- a/imagepicker/src/main/res/layout/cwac_cam2_fragment.xml
+++ b/imagepicker/src/main/res/layout/cwac_cam2_fragment.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:fab="http://schemas.android.com/apk/res-auto"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/tools">
 
   <FrameLayout
     android:id="@+id/cwac_cam2_preview_stack"
@@ -35,7 +36,7 @@
     android:layout_alignParentRight="true"
     android:layout_marginBottom="16dp"
     android:layout_marginRight="16dp"
-    android:src="@drawable/cwac_cam2_ic_action_camera"
+    app:srcCompat="@drawable/cwac_cam2_ic_action_camera"
     fab:fab_colorNormal="@color/cwac_cam2_picture_fab"
     fab:fab_colorPressed="@color/cwac_cam2_picture_fab_pressed" />
 
@@ -55,7 +56,7 @@
       android:id="@+id/cwac_cam2_switch_camera"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:src="@drawable/cwac_cam2_ic_switch_camera"
+      app:srcCompat="@drawable/cwac_cam2_ic_switch_camera"
       fab:fab_colorNormal="@color/cwac_cam2_secondary_fab"
       fab:fab_colorPressed="@color/cwac_cam2_secondary_fab_pressed"
       fab:fab_size="mini" />

From 10145f90da74707ddec2443bfd24801b84457d95 Mon Sep 17 00:00:00 2001
From: trantuananh1996 <trantuananh1996@gmail.com>
Date: Tue, 18 Aug 2020 00:40:11 +0700
Subject: [PATCH 07/16] Fix crash

---
 imagepicker/build.gradle                       | 18 +++++++++---------
 .../ui/photoPager/ImagesPagerFragment.java     |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index a2e5c1d..ee62d83 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -54,16 +54,16 @@ repositories {
 
 dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.2.0-alpha03'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.3.0-alpha02'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
     implementation('com.octo.android.robospice:robospice:1.4.14') {
         exclude group: 'org.apache.commons', module: 'commons-io'
     }
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-rc1'
 
-    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
     implementation 'com.github.clans:fab:1.6.4'
 
@@ -71,13 +71,13 @@ dependencies {
 
     //Rx Java
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
-    implementation 'com.squareup.retrofit2:adapter-rxjava:2.7.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
+    implementation 'com.squareup.retrofit2:adapter-rxjava:2.9.0'
     implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
     //Dagger
-    implementation 'com.google.dagger:dagger:2.25.4'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.25.4'
-    implementation 'net.sourceforge.streamsupport:streamsupport:1.7.1'
+    implementation 'com.google.dagger:dagger:2.28.3'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.28.3'
+    implementation 'net.sourceforge.streamsupport:streamsupport:1.7.2'
     implementation 'com.jaeger.statusbarutil:library:1.5.1'
     implementation 'com.github.florent37:runtime-permission:1.1.1'
     implementation 'com.github.trantuananh1996:sweetAlert:-SNAPSHOT'
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
index c9374d6..d2ad93d 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
@@ -59,6 +59,7 @@ private void removeBehaviorAttr(final ViewGroup container) {
     }
 
     private void addBehaviorAttr(final ViewGroup container) {
+        if(container==null) return;
         final CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams) container.getLayoutParams();
         layoutParams.setBehavior(new AppBarLayout.ScrollingViewBehavior());
         container.setLayoutParams(layoutParams);

From b83d860e5707df07c6b375a191505583a45ed5ff Mon Sep 17 00:00:00 2001
From: anhtt <anhtt@omt.vn>
Date: Tue, 18 Aug 2020 00:42:49 +0700
Subject: [PATCH 08/16] Update

---
 imagepicker/build.gradle                      |  27 +-
 .../mms/exif/CountedDataInputStream.java      |   9 +-
 .../java/com/android/mms/exif/ExifData.java   |   5 +-
 .../com/android/mms/exif/ExifInterface.java   | 326 +++++++++---------
 .../com/android/mms/exif/ExifModifier.java    |   2 +-
 .../android/mms/exif/ExifOutputStream.java    |   2 +-
 .../java/com/android/mms/exif/ExifParser.java |  15 +-
 .../java/com/android/mms/exif/ExifReader.java |   2 +-
 .../java/com/android/mms/exif/ExifTag.java    |  10 +-
 .../main/java/com/android/mms/exif/IfdId.java |  12 +-
 .../cwac/cam2/AbstractCameraActivity.java     |   4 +-
 .../commonsware/cwac/cam2/CameraEngine.java   |   2 +-
 .../commonsware/cwac/cam2/CameraFragment.java |  18 +-
 .../commonsware/cwac/cam2/CameraSession.java  |   2 +-
 .../cwac/cam2/CameraTwoEngine.java            |   4 +-
 .../cwac/cam2/ClassicCameraEngine.java        |   2 +-
 .../commonsware/cwac/cam2/ImageContext.java   |   2 +-
 .../cwac/cam2/PictureTransaction.java         |   6 +-
 .../cwac/cam2/ReverseChronometer.java         |   2 +-
 .../imagepicker/data/model/AlbumEntry.java    |  21 ++
 .../imagepicker/data/model/ImageEntry.java    |  67 +++-
 .../ui/imagePreview/ImagePreviewAdapter.java  |   2 +-
 .../ui/photoPager/ImagesPagerFragment.java    |   1 +
 .../imagepicker/util/MultiplePicker.java      |   1 +
 .../net/yazeed44/imagepicker/util/Picker.java |  10 +-
 .../imagepicker/util/SinglePicker.java        |   1 +
 .../net/yazeed44/imagepicker/util/Util.java   |  33 +-
 .../main/res/layout/activity_photo_pick.xml   |   2 +-
 .../src/main/res/layout/element_album.xml     |   6 +-
 .../src/main/res/layout/element_image.xml     |   6 +-
 .../main/res/layout/element_image_preview.xml |   6 +-
 .../src/main/res/values-en/strings.xml        |  16 +-
 imagepicker/src/main/res/values/strings.xml   |   1 +
 33 files changed, 373 insertions(+), 252 deletions(-)

diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index a2e5c1d..0c6b34f 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -54,34 +54,37 @@ repositories {
 
 dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.2.0-alpha03'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.3.0-alpha02'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
     implementation('com.octo.android.robospice:robospice:1.4.14') {
         exclude group: 'org.apache.commons', module: 'commons-io'
     }
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-rc1'
 
-    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
     implementation 'com.github.clans:fab:1.6.4'
 
-    implementation 'com.github.yalantis:ucrop:2.2.3'
+    api 'com.github.yalantis:ucrop:2.2.3'
 
     //Rx Java
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
-    implementation 'com.squareup.retrofit2:adapter-rxjava:2.7.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
+    implementation 'com.squareup.retrofit2:adapter-rxjava:2.9.0'
     implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
     //Dagger
-    implementation 'com.google.dagger:dagger:2.25.4'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.25.4'
-    implementation 'net.sourceforge.streamsupport:streamsupport:1.7.1'
+    implementation 'com.google.dagger:dagger:2.28.3'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.28.3'
+    implementation 'net.sourceforge.streamsupport:streamsupport:1.7.2'
     implementation 'com.jaeger.statusbarutil:library:1.5.1'
     implementation 'com.github.florent37:runtime-permission:1.1.1'
-    implementation 'com.github.trantuananh1996:sweetAlert:-SNAPSHOT'
-
+    implementation 'com.github.trantuananh1996:sweetAlert:1.0.2'
+    // architecture comp. navigation
+    implementation 'androidx.navigation:navigation-fragment:2.3.0'
+    implementation 'androidx.navigation:navigation-ui:2.3.0'
+    implementation 'androidx.navigation:navigation-runtime:2.3.0'
 }
 
 //apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
diff --git a/imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java b/imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java
index cbff12e..f847860 100644
--- a/imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java
+++ b/imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java
@@ -23,13 +23,14 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 class CountedDataInputStream extends FilterInputStream {
 
     private int mCount = 0;
 
     // allocate a byte buffer for a long value;
-    private final byte mByteArray[] = new byte[8];
+    private final byte[] mByteArray = new byte[8];
     private final ByteBuffer mByteBuffer = ByteBuffer.wrap(mByteArray);
 
     protected CountedDataInputStream(InputStream in) {
@@ -123,13 +124,13 @@ public long readLong() throws IOException {
     }
 
     public String readString(int n) throws IOException {
-        byte buf[] = new byte[n];
+        byte[] buf = new byte[n];
         readOrThrow(buf);
-        return new String(buf, "UTF8");
+        return new String(buf, Charset.forName("utf-8"));
     }
 
     public String readString(int n, Charset charset) throws IOException {
-        byte buf[] = new byte[n];
+        byte[] buf = new byte[n];
         readOrThrow(buf);
         return new String(buf, charset);
     }
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifData.java b/imagepicker/src/main/java/com/android/mms/exif/ExifData.java
index d8c5ef4..793a69f 100644
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifData.java
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifData.java
@@ -22,6 +22,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -236,11 +237,11 @@ protected String getUserComment() {
 
         try {
             if (Arrays.equals(code, USER_COMMENT_ASCII)) {
-                return new String(buf, 8, buf.length - 8, "US-ASCII");
+                return new String(buf, 8, buf.length - 8, StandardCharsets.US_ASCII);
             } else if (Arrays.equals(code, USER_COMMENT_JIS)) {
                 return new String(buf, 8, buf.length - 8, "EUC-JP");
             } else if (Arrays.equals(code, USER_COMMENT_UNICODE)) {
-                return new String(buf, 8, buf.length - 8, "UTF-16");
+                return new String(buf, 8, buf.length - 8, StandardCharsets.UTF_16);
             } else {
                 return null;
             }
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java b/imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java
index aa615d0..4f27143 100644
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java
@@ -322,7 +322,7 @@ public class ExifInterface {
      * Tags that contain offset markers. These are included in the banned
      * defines.
      */
-    private static HashSet<Short> sOffsetTags = new HashSet<Short>();
+    private static final HashSet<Short> sOffsetTags = new HashSet<Short>();
     static {
         sOffsetTags.add(getTrueTagKey(TAG_GPS_IFD));
         sOffsetTags.add(getTrueTagKey(TAG_EXIF_IFD));
@@ -377,84 +377,84 @@ public static int getTrueIfd(int tag) {
      * <li>RIGHT_BOTTOM is a 270 degree clockwise rotation.</li>
      * </ul>
      */
-    public static interface Orientation {
-        public static final short TOP_LEFT = 1;
-        public static final short TOP_RIGHT = 2;
-        public static final short BOTTOM_LEFT = 3;
-        public static final short BOTTOM_RIGHT = 4;
-        public static final short LEFT_TOP = 5;
-        public static final short RIGHT_TOP = 6;
-        public static final short LEFT_BOTTOM = 7;
-        public static final short RIGHT_BOTTOM = 8;
+    public interface Orientation {
+        short TOP_LEFT = 1;
+        short TOP_RIGHT = 2;
+        short BOTTOM_LEFT = 3;
+        short BOTTOM_RIGHT = 4;
+        short LEFT_TOP = 5;
+        short RIGHT_TOP = 6;
+        short LEFT_BOTTOM = 7;
+        short RIGHT_BOTTOM = 8;
     }
 
     /**
      * Constants for {@link TAG_Y_CB_CR_POSITIONING}
      */
-    public static interface YCbCrPositioning {
-        public static final short CENTERED = 1;
-        public static final short CO_SITED = 2;
+    public interface YCbCrPositioning {
+        short CENTERED = 1;
+        short CO_SITED = 2;
     }
 
     /**
      * Constants for {@link TAG_COMPRESSION}
      */
-    public static interface Compression {
-        public static final short UNCOMPRESSION = 1;
-        public static final short JPEG = 6;
+    public interface Compression {
+        short UNCOMPRESSION = 1;
+        short JPEG = 6;
     }
 
     /**
      * Constants for {@link TAG_RESOLUTION_UNIT}
      */
-    public static interface ResolutionUnit {
-        public static final short INCHES = 2;
-        public static final short CENTIMETERS = 3;
+    public interface ResolutionUnit {
+        short INCHES = 2;
+        short CENTIMETERS = 3;
     }
 
     /**
      * Constants for {@link TAG_PHOTOMETRIC_INTERPRETATION}
      */
-    public static interface PhotometricInterpretation {
-        public static final short RGB = 2;
-        public static final short YCBCR = 6;
+    public interface PhotometricInterpretation {
+        short RGB = 2;
+        short YCBCR = 6;
     }
 
     /**
      * Constants for {@link TAG_PLANAR_CONFIGURATION}
      */
-    public static interface PlanarConfiguration {
-        public static final short CHUNKY = 1;
-        public static final short PLANAR = 2;
+    public interface PlanarConfiguration {
+        short CHUNKY = 1;
+        short PLANAR = 2;
     }
 
     /**
      * Constants for {@link TAG_EXPOSURE_PROGRAM}
      */
-    public static interface ExposureProgram {
-        public static final short NOT_DEFINED = 0;
-        public static final short MANUAL = 1;
-        public static final short NORMAL_PROGRAM = 2;
-        public static final short APERTURE_PRIORITY = 3;
-        public static final short SHUTTER_PRIORITY = 4;
-        public static final short CREATIVE_PROGRAM = 5;
-        public static final short ACTION_PROGRAM = 6;
-        public static final short PROTRAIT_MODE = 7;
-        public static final short LANDSCAPE_MODE = 8;
+    public interface ExposureProgram {
+        short NOT_DEFINED = 0;
+        short MANUAL = 1;
+        short NORMAL_PROGRAM = 2;
+        short APERTURE_PRIORITY = 3;
+        short SHUTTER_PRIORITY = 4;
+        short CREATIVE_PROGRAM = 5;
+        short ACTION_PROGRAM = 6;
+        short PROTRAIT_MODE = 7;
+        short LANDSCAPE_MODE = 8;
     }
 
     /**
      * Constants for {@link TAG_METERING_MODE}
      */
-    public static interface MeteringMode {
-        public static final short UNKNOWN = 0;
-        public static final short AVERAGE = 1;
-        public static final short CENTER_WEIGHTED_AVERAGE = 2;
-        public static final short SPOT = 3;
-        public static final short MULTISPOT = 4;
-        public static final short PATTERN = 5;
-        public static final short PARTAIL = 6;
-        public static final short OTHER = 255;
+    public interface MeteringMode {
+        short UNKNOWN = 0;
+        short AVERAGE = 1;
+        short CENTER_WEIGHTED_AVERAGE = 2;
+        short SPOT = 3;
+        short MULTISPOT = 4;
+        short PATTERN = 5;
+        short PARTAIL = 6;
+        short OTHER = 255;
     }
 
     /**
@@ -466,244 +466,244 @@ public static interface MeteringMode {
      * short flash = FIRED | RETURN_STROBE_RETURN_LIGHT_DETECTED |
      * MODE_AUTO_MODE
      */
-    public static interface Flash {
+    public interface Flash {
         // LSB
-        public static final short DID_NOT_FIRED = 0;
-        public static final short FIRED = 1;
+        short DID_NOT_FIRED = 0;
+        short FIRED = 1;
         // 1st~2nd bits
-        public static final short RETURN_NO_STROBE_RETURN_DETECTION_FUNCTION = 0 << 1;
-        public static final short RETURN_STROBE_RETURN_LIGHT_NOT_DETECTED = 2 << 1;
-        public static final short RETURN_STROBE_RETURN_LIGHT_DETECTED = 3 << 1;
+        short RETURN_NO_STROBE_RETURN_DETECTION_FUNCTION = 0 << 1;
+        short RETURN_STROBE_RETURN_LIGHT_NOT_DETECTED = 2 << 1;
+        short RETURN_STROBE_RETURN_LIGHT_DETECTED = 3 << 1;
         // 3rd~4th bits
-        public static final short MODE_UNKNOWN = 0 << 3;
-        public static final short MODE_COMPULSORY_FLASH_FIRING = 1 << 3;
-        public static final short MODE_COMPULSORY_FLASH_SUPPRESSION = 2 << 3;
-        public static final short MODE_AUTO_MODE = 3 << 3;
+        short MODE_UNKNOWN = 0 << 3;
+        short MODE_COMPULSORY_FLASH_FIRING = 1 << 3;
+        short MODE_COMPULSORY_FLASH_SUPPRESSION = 2 << 3;
+        short MODE_AUTO_MODE = 3 << 3;
         // 5th bit
-        public static final short FUNCTION_PRESENT = 0 << 5;
-        public static final short FUNCTION_NO_FUNCTION = 1 << 5;
+        short FUNCTION_PRESENT = 0 << 5;
+        short FUNCTION_NO_FUNCTION = 1 << 5;
         // 6th bit
-        public static final short RED_EYE_REDUCTION_NO_OR_UNKNOWN = 0 << 6;
-        public static final short RED_EYE_REDUCTION_SUPPORT = 1 << 6;
+        short RED_EYE_REDUCTION_NO_OR_UNKNOWN = 0 << 6;
+        short RED_EYE_REDUCTION_SUPPORT = 1 << 6;
     }
 
     /**
      * Constants for {@link TAG_COLOR_SPACE}
      */
-    public static interface ColorSpace {
-        public static final short SRGB = 1;
-        public static final short UNCALIBRATED = (short) 0xFFFF;
+    public interface ColorSpace {
+        short SRGB = 1;
+        short UNCALIBRATED = (short) 0xFFFF;
     }
 
     /**
      * Constants for {@link TAG_EXPOSURE_MODE}
      */
-    public static interface ExposureMode {
-        public static final short AUTO_EXPOSURE = 0;
-        public static final short MANUAL_EXPOSURE = 1;
-        public static final short AUTO_BRACKET = 2;
+    public interface ExposureMode {
+        short AUTO_EXPOSURE = 0;
+        short MANUAL_EXPOSURE = 1;
+        short AUTO_BRACKET = 2;
     }
 
     /**
      * Constants for {@link TAG_WHITE_BALANCE}
      */
-    public static interface WhiteBalance {
-        public static final short AUTO = 0;
-        public static final short MANUAL = 1;
+    public interface WhiteBalance {
+        short AUTO = 0;
+        short MANUAL = 1;
     }
 
     /**
      * Constants for {@link TAG_SCENE_CAPTURE_TYPE}
      */
-    public static interface SceneCapture {
-        public static final short STANDARD = 0;
-        public static final short LANDSCAPE = 1;
-        public static final short PROTRAIT = 2;
-        public static final short NIGHT_SCENE = 3;
+    public interface SceneCapture {
+        short STANDARD = 0;
+        short LANDSCAPE = 1;
+        short PROTRAIT = 2;
+        short NIGHT_SCENE = 3;
     }
 
     /**
      * Constants for {@link TAG_COMPONENTS_CONFIGURATION}
      */
-    public static interface ComponentsConfiguration {
-        public static final short NOT_EXIST = 0;
-        public static final short Y = 1;
-        public static final short CB = 2;
-        public static final short CR = 3;
-        public static final short R = 4;
-        public static final short G = 5;
-        public static final short B = 6;
+    public interface ComponentsConfiguration {
+        short NOT_EXIST = 0;
+        short Y = 1;
+        short CB = 2;
+        short CR = 3;
+        short R = 4;
+        short G = 5;
+        short B = 6;
     }
 
     /**
      * Constants for {@link TAG_LIGHT_SOURCE}
      */
-    public static interface LightSource {
-        public static final short UNKNOWN = 0;
-        public static final short DAYLIGHT = 1;
-        public static final short FLUORESCENT = 2;
-        public static final short TUNGSTEN = 3;
-        public static final short FLASH = 4;
-        public static final short FINE_WEATHER = 9;
-        public static final short CLOUDY_WEATHER = 10;
-        public static final short SHADE = 11;
-        public static final short DAYLIGHT_FLUORESCENT = 12;
-        public static final short DAY_WHITE_FLUORESCENT = 13;
-        public static final short COOL_WHITE_FLUORESCENT = 14;
-        public static final short WHITE_FLUORESCENT = 15;
-        public static final short STANDARD_LIGHT_A = 17;
-        public static final short STANDARD_LIGHT_B = 18;
-        public static final short STANDARD_LIGHT_C = 19;
-        public static final short D55 = 20;
-        public static final short D65 = 21;
-        public static final short D75 = 22;
-        public static final short D50 = 23;
-        public static final short ISO_STUDIO_TUNGSTEN = 24;
-        public static final short OTHER = 255;
+    public interface LightSource {
+        short UNKNOWN = 0;
+        short DAYLIGHT = 1;
+        short FLUORESCENT = 2;
+        short TUNGSTEN = 3;
+        short FLASH = 4;
+        short FINE_WEATHER = 9;
+        short CLOUDY_WEATHER = 10;
+        short SHADE = 11;
+        short DAYLIGHT_FLUORESCENT = 12;
+        short DAY_WHITE_FLUORESCENT = 13;
+        short COOL_WHITE_FLUORESCENT = 14;
+        short WHITE_FLUORESCENT = 15;
+        short STANDARD_LIGHT_A = 17;
+        short STANDARD_LIGHT_B = 18;
+        short STANDARD_LIGHT_C = 19;
+        short D55 = 20;
+        short D65 = 21;
+        short D75 = 22;
+        short D50 = 23;
+        short ISO_STUDIO_TUNGSTEN = 24;
+        short OTHER = 255;
     }
 
     /**
      * Constants for {@link TAG_SENSING_METHOD}
      */
-    public static interface SensingMethod {
-        public static final short NOT_DEFINED = 1;
-        public static final short ONE_CHIP_COLOR = 2;
-        public static final short TWO_CHIP_COLOR = 3;
-        public static final short THREE_CHIP_COLOR = 4;
-        public static final short COLOR_SEQUENTIAL_AREA = 5;
-        public static final short TRILINEAR = 7;
-        public static final short COLOR_SEQUENTIAL_LINEAR = 8;
+    public interface SensingMethod {
+        short NOT_DEFINED = 1;
+        short ONE_CHIP_COLOR = 2;
+        short TWO_CHIP_COLOR = 3;
+        short THREE_CHIP_COLOR = 4;
+        short COLOR_SEQUENTIAL_AREA = 5;
+        short TRILINEAR = 7;
+        short COLOR_SEQUENTIAL_LINEAR = 8;
     }
 
     /**
      * Constants for {@link TAG_FILE_SOURCE}
      */
-    public static interface FileSource {
-        public static final short DSC = 3;
+    public interface FileSource {
+        short DSC = 3;
     }
 
     /**
      * Constants for {@link TAG_SCENE_TYPE}
      */
-    public static interface SceneType {
-        public static final short DIRECT_PHOTOGRAPHED = 1;
+    public interface SceneType {
+        short DIRECT_PHOTOGRAPHED = 1;
     }
 
     /**
      * Constants for {@link TAG_GAIN_CONTROL}
      */
-    public static interface GainControl {
-        public static final short NONE = 0;
-        public static final short LOW_UP = 1;
-        public static final short HIGH_UP = 2;
-        public static final short LOW_DOWN = 3;
-        public static final short HIGH_DOWN = 4;
+    public interface GainControl {
+        short NONE = 0;
+        short LOW_UP = 1;
+        short HIGH_UP = 2;
+        short LOW_DOWN = 3;
+        short HIGH_DOWN = 4;
     }
 
     /**
      * Constants for {@link TAG_CONTRAST}
      */
-    public static interface Contrast {
-        public static final short NORMAL = 0;
-        public static final short SOFT = 1;
-        public static final short HARD = 2;
+    public interface Contrast {
+        short NORMAL = 0;
+        short SOFT = 1;
+        short HARD = 2;
     }
 
     /**
      * Constants for {@link TAG_SATURATION}
      */
-    public static interface Saturation {
-        public static final short NORMAL = 0;
-        public static final short LOW = 1;
-        public static final short HIGH = 2;
+    public interface Saturation {
+        short NORMAL = 0;
+        short LOW = 1;
+        short HIGH = 2;
     }
 
     /**
      * Constants for {@link TAG_SHARPNESS}
      */
-    public static interface Sharpness {
-        public static final short NORMAL = 0;
-        public static final short SOFT = 1;
-        public static final short HARD = 2;
+    public interface Sharpness {
+        short NORMAL = 0;
+        short SOFT = 1;
+        short HARD = 2;
     }
 
     /**
      * Constants for {@link TAG_SUBJECT_DISTANCE}
      */
-    public static interface SubjectDistance {
-        public static final short UNKNOWN = 0;
-        public static final short MACRO = 1;
-        public static final short CLOSE_VIEW = 2;
-        public static final short DISTANT_VIEW = 3;
+    public interface SubjectDistance {
+        short UNKNOWN = 0;
+        short MACRO = 1;
+        short CLOSE_VIEW = 2;
+        short DISTANT_VIEW = 3;
     }
 
     /**
      * Constants for {@link TAG_GPS_LATITUDE_REF},
      * {@link TAG_GPS_DEST_LATITUDE_REF}
      */
-    public static interface GpsLatitudeRef {
-        public static final String NORTH = "N";
-        public static final String SOUTH = "S";
+    public interface GpsLatitudeRef {
+        String NORTH = "N";
+        String SOUTH = "S";
     }
 
     /**
      * Constants for {@link TAG_GPS_LONGITUDE_REF},
      * {@link TAG_GPS_DEST_LONGITUDE_REF}
      */
-    public static interface GpsLongitudeRef {
-        public static final String EAST = "E";
-        public static final String WEST = "W";
+    public interface GpsLongitudeRef {
+        String EAST = "E";
+        String WEST = "W";
     }
 
     /**
      * Constants for {@link TAG_GPS_ALTITUDE_REF}
      */
-    public static interface GpsAltitudeRef {
-        public static final short SEA_LEVEL = 0;
-        public static final short SEA_LEVEL_NEGATIVE = 1;
+    public interface GpsAltitudeRef {
+        short SEA_LEVEL = 0;
+        short SEA_LEVEL_NEGATIVE = 1;
     }
 
     /**
      * Constants for {@link TAG_GPS_STATUS}
      */
-    public static interface GpsStatus {
-        public static final String IN_PROGRESS = "A";
-        public static final String INTEROPERABILITY = "V";
+    public interface GpsStatus {
+        String IN_PROGRESS = "A";
+        String INTEROPERABILITY = "V";
     }
 
     /**
      * Constants for {@link TAG_GPS_MEASURE_MODE}
      */
-    public static interface GpsMeasureMode {
-        public static final String MODE_2_DIMENSIONAL = "2";
-        public static final String MODE_3_DIMENSIONAL = "3";
+    public interface GpsMeasureMode {
+        String MODE_2_DIMENSIONAL = "2";
+        String MODE_3_DIMENSIONAL = "3";
     }
 
     /**
      * Constants for {@link TAG_GPS_SPEED_REF},
      * {@link TAG_GPS_DEST_DISTANCE_REF}
      */
-    public static interface GpsSpeedRef {
-        public static final String KILOMETERS = "K";
-        public static final String MILES = "M";
-        public static final String KNOTS = "N";
+    public interface GpsSpeedRef {
+        String KILOMETERS = "K";
+        String MILES = "M";
+        String KNOTS = "N";
     }
 
     /**
      * Constants for {@link TAG_GPS_TRACK_REF},
      * {@link TAG_GPS_IMG_DIRECTION_REF}, {@link TAG_GPS_DEST_BEARING_REF}
      */
-    public static interface GpsTrackRef {
-        public static final String TRUE_DIRECTION = "T";
-        public static final String MAGNETIC_DIRECTION = "M";
+    public interface GpsTrackRef {
+        String TRUE_DIRECTION = "T";
+        String MAGNETIC_DIRECTION = "M";
     }
 
     /**
      * Constants for {@link TAG_GPS_DIFFERENTIAL}
      */
-    public static interface GpsDifferential {
-        public static final short WITHOUT_DIFFERENTIAL_CORRECTION = 0;
-        public static final short DIFFERENTIAL_CORRECTION_APPLIED = 1;
+    public interface GpsDifferential {
+        short WITHOUT_DIFFERENTIAL_CORRECTION = 0;
+        short DIFFERENTIAL_CORRECTION_APPLIED = 1;
     }
 
     private static final String NULL_ARGUMENT_STRING = "Argument is null";
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java b/imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java
index 7204805..ae8e97e 100644
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java
@@ -154,7 +154,7 @@ private void writeTagValue(ExifTag tag, int offset) {
         mByteBuffer.position(offset + mOffsetBase);
         switch (tag.getDataType()) {
             case ExifTag.TYPE_ASCII:
-                byte buf[] = tag.getStringByte();
+                byte[] buf = tag.getStringByte();
                 if (buf.length == tag.getComponentCount()) {
                     buf[buf.length - 1] = 0;
                     mByteBuffer.put(buf);
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java b/imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java
index 669c02b..e4a0683 100644
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java
@@ -483,7 +483,7 @@ static void writeTagValue(ExifTag tag, OrderedDataOutputStream dataOutputStream)
             throws IOException {
         switch (tag.getDataType()) {
             case ExifTag.TYPE_ASCII:
-                byte buf[] = tag.getStringByte();
+                byte[] buf = tag.getStringByte();
                 if (buf.length == tag.getComponentCount()) {
                     buf[buf.length - 1] = 0;
                     dataOutputStream.write(buf);
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifParser.java b/imagepicker/src/main/java/com/android/mms/exif/ExifParser.java
index 7779a29..44cddce 100644
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifParser.java
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifParser.java
@@ -24,6 +24,7 @@
 import java.io.InputStream;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
@@ -141,7 +142,7 @@ public class ExifParser {
     protected static final int TAG_SIZE = 12;
     protected static final int OFFSET_SIZE = 2;
 
-    private static final Charset US_ASCII = Charset.forName("US-ASCII");
+    private static final Charset US_ASCII = StandardCharsets.US_ASCII;
 
     protected static final int DEFAULT_IFD0_OFFSET = 8;
 
@@ -681,7 +682,7 @@ protected void readFullTagValue(ExifTag tag) throws IOException {
         switch (tag.getDataType()) {
             case ExifTag.TYPE_UNSIGNED_BYTE:
             case ExifTag.TYPE_UNDEFINED: {
-                byte buf[] = new byte[tag.getComponentCount()];
+                byte[] buf = new byte[tag.getComponentCount()];
                 read(buf);
                 tag.setValue(buf);
             }
@@ -690,7 +691,7 @@ protected void readFullTagValue(ExifTag tag) throws IOException {
                 tag.setValue(readString(tag.getComponentCount()));
                 break;
             case ExifTag.TYPE_UNSIGNED_LONG: {
-                long value[] = new long[tag.getComponentCount()];
+                long[] value = new long[tag.getComponentCount()];
                 for (int i = 0, n = value.length; i < n; i++) {
                     value[i] = readUnsignedLong();
                 }
@@ -698,7 +699,7 @@ protected void readFullTagValue(ExifTag tag) throws IOException {
             }
                 break;
             case ExifTag.TYPE_UNSIGNED_RATIONAL: {
-                Rational value[] = new Rational[tag.getComponentCount()];
+                Rational[] value = new Rational[tag.getComponentCount()];
                 for (int i = 0, n = value.length; i < n; i++) {
                     value[i] = readUnsignedRational();
                 }
@@ -706,7 +707,7 @@ protected void readFullTagValue(ExifTag tag) throws IOException {
             }
                 break;
             case ExifTag.TYPE_UNSIGNED_SHORT: {
-                int value[] = new int[tag.getComponentCount()];
+                int[] value = new int[tag.getComponentCount()];
                 for (int i = 0, n = value.length; i < n; i++) {
                     value[i] = readUnsignedShort();
                 }
@@ -714,7 +715,7 @@ protected void readFullTagValue(ExifTag tag) throws IOException {
             }
                 break;
             case ExifTag.TYPE_LONG: {
-                int value[] = new int[tag.getComponentCount()];
+                int[] value = new int[tag.getComponentCount()];
                 for (int i = 0, n = value.length; i < n; i++) {
                     value[i] = readLong();
                 }
@@ -722,7 +723,7 @@ protected void readFullTagValue(ExifTag tag) throws IOException {
             }
                 break;
             case ExifTag.TYPE_RATIONAL: {
-                Rational value[] = new Rational[tag.getComponentCount()];
+                Rational[] value = new Rational[tag.getComponentCount()];
                 for (int i = 0, n = value.length; i < n; i++) {
                     value[i] = readRational();
                 }
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifReader.java b/imagepicker/src/main/java/com/android/mms/exif/ExifReader.java
index f204594..b9ec878 100644
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifReader.java
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifReader.java
@@ -71,7 +71,7 @@ protected ExifData read(InputStream inputStream) throws ExifInvalidFormatExcepti
                     exifData.getIfdData(tag.getIfd()).setTag(tag);
                     break;
                 case ExifParser.EVENT_COMPRESSED_IMAGE:
-                    byte buf[] = new byte[parser.getCompressedImageSize()];
+                    byte[] buf = new byte[parser.getCompressedImageSize()];
                     if (buf.length == parser.read(buf)) {
                         exifData.setCompressedThumbnail(buf);
                     } else {
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifTag.java b/imagepicker/src/main/java/com/android/mms/exif/ExifTag.java
index 88028a1..660c64f 100644
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifTag.java
+++ b/imagepicker/src/main/java/com/android/mms/exif/ExifTag.java
@@ -19,6 +19,7 @@
 import androidx.annotation.NonNull;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
@@ -69,8 +70,8 @@ public class ExifTag {
      */
     public static final short TYPE_RATIONAL = 10;
 
-    private static Charset US_ASCII = Charset.forName("US-ASCII");
-    private static final int TYPE_TO_SIZE_MAP[] = new int[11];
+    private static final Charset US_ASCII = StandardCharsets.US_ASCII;
+    private static final int[] TYPE_TO_SIZE_MAP = new int[11];
     private static final int UNSIGNED_SHORT_MAX = 65535;
     private static final long UNSIGNED_LONG_MAX = 4294967295L;
     private static final long LONG_MAX = Integer.MAX_VALUE;
@@ -882,10 +883,7 @@ protected boolean hasDefinedCount() {
     }
 
     private boolean checkBadComponentCount(int count) {
-        if (mHasDefinedDefaultComponentCount && (mComponentCountActual != count)) {
-            return true;
-        }
-        return false;
+        return mHasDefinedDefaultComponentCount && (mComponentCountActual != count);
     }
 
     private static String convertTypeToString(short type) {
diff --git a/imagepicker/src/main/java/com/android/mms/exif/IfdId.java b/imagepicker/src/main/java/com/android/mms/exif/IfdId.java
index e9180a5..ed020eb 100644
--- a/imagepicker/src/main/java/com/android/mms/exif/IfdId.java
+++ b/imagepicker/src/main/java/com/android/mms/exif/IfdId.java
@@ -20,12 +20,12 @@
  * The constants of the IFD ID defined in EXIF spec.
  */
 public interface IfdId {
-    public static final int TYPE_IFD_0 = 0;
-    public static final int TYPE_IFD_1 = 1;
-    public static final int TYPE_IFD_EXIF = 2;
-    public static final int TYPE_IFD_INTEROPERABILITY = 3;
-    public static final int TYPE_IFD_GPS = 4;
+    int TYPE_IFD_0 = 0;
+    int TYPE_IFD_1 = 1;
+    int TYPE_IFD_EXIF = 2;
+    int TYPE_IFD_INTEROPERABILITY = 3;
+    int TYPE_IFD_GPS = 4;
     /* This is used in ExifData to allocate enough IfdData */
-    static final int TYPE_IFD_COUNT = 5;
+    int TYPE_IFD_COUNT = 5;
 
 }
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java
index 919402a..f95a504 100644
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java
@@ -494,7 +494,7 @@ public enum Quality {
 
         private final int value;
 
-        private Quality(int value) {
+        Quality(int value) {
             this.value = value;
         }
 
@@ -606,7 +606,7 @@ public T debug() {
          * @return the builder, for further configuration
          */
         public T to(File f) {
-            return ((T) to(Uri.fromFile(f)));
+            return to(Uri.fromFile(f));
         }
 
         /**
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java
index e440316..f141c3a 100644
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java
@@ -39,7 +39,7 @@ abstract public class CameraEngine {
   private static volatile CameraEngine singletonTwo=null;
   private EventBus bus=AbstractCameraActivity.BUS;
   private boolean isDebug=false;
-  private LinkedBlockingQueue<Runnable> queue=new LinkedBlockingQueue<Runnable>();
+  private final LinkedBlockingQueue<Runnable> queue=new LinkedBlockingQueue<Runnable>();
   private ThreadPoolExecutor pool;
   private File savePreviewFile=null;
   protected List<FlashMode> preferredFlashModes;
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java
index fce021b..e5e396f 100644
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java
@@ -256,22 +256,22 @@ public View onCreateView(LayoutInflater inflater,
                 inflater.inflate(R.layout.cwac_cam2_fragment, container, false);
 
         previewStack =
-                (ViewGroup) v.findViewById(R.id.cwac_cam2_preview_stack);
+                v.findViewById(R.id.cwac_cam2_preview_stack);
 
         progress = v.findViewById(R.id.cwac_cam2_progress);
         fabPicture =
-                (FloatingActionButton) v.findViewById(R.id.cwac_cam2_picture);
+                v.findViewById(R.id.cwac_cam2_picture);
         reverseChronometer =
-                (ReverseChronometer) v.findViewById(R.id.rchrono);
+                v.findViewById(R.id.rchrono);
 
         if (isVideo()) {
             fabPicture.setImageResource(R.drawable.cwac_cam2_ic_videocam);
-            chronometer = (Chronometer) v.findViewById(R.id.chrono);
+            chronometer = v.findViewById(R.id.chrono);
         }
 
         fabPicture.setOnClickListener(view -> performCameraAction());
 
-        fabSwitch = (FloatingActionButton) v.findViewById(
+        fabSwitch = v.findViewById(
                 R.id.cwac_cam2_switch_camera);
         fabSwitch.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -290,7 +290,7 @@ public void onClick(View view) {
         });
 
         changeMenuIconAnimation(
-                (FloatingActionMenu) v.findViewById(R.id.cwac_cam2_settings));
+                v.findViewById(R.id.cwac_cam2_settings));
 
         onHiddenChanged(false); // hack, since this does not get
         // called on initial display
@@ -386,7 +386,7 @@ public void onEventMainThread(CameraEngine.OpenedEvent event) {
             progress.setVisibility(View.GONE);
             fabSwitch.setEnabled(canSwitchSources());
             fabPicture.setEnabled(true);
-            zoomSlider = (SeekBar) getView().findViewById(R.id.cwac_cam2_zoom);
+            zoomSlider = getView().findViewById(R.id.cwac_cam2_zoom);
 
             int timerDuration = getArguments().getInt(ARG_TIMER_DURATION);
 
@@ -674,7 +674,7 @@ private ZoomStyle getZoomStyle() {
         return (result);
     }
 
-    private ScaleGestureDetector.OnScaleGestureListener scaleListener =
+    private final ScaleGestureDetector.OnScaleGestureListener scaleListener =
             new ScaleGestureDetector.SimpleOnScaleGestureListener() {
                 @Override
                 public void onScaleEnd(ScaleGestureDetector detector) {
@@ -697,7 +697,7 @@ public void onScaleEnd(ScaleGestureDetector detector) {
                 }
             };
 
-    private SeekBar.OnSeekBarChangeListener seekListener =
+    private final SeekBar.OnSeekBarChangeListener seekListener =
             new SeekBar.OnSeekBarChangeListener() {
                 @Override
                 public void onProgressChanged(SeekBar seekBar,
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java
index 1e3bd84..aa159c6 100644
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java
@@ -33,7 +33,7 @@
  */
 public class CameraSession {
   private final CameraDescriptor descriptor;
-  private Context ctxt;
+  private final Context ctxt;
   private final ArrayList<CameraPlugin> plugins=new ArrayList<CameraPlugin>();
   private Size previewSize;
   private FlashMode currentFlashMode;
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java
index 197b3b4..1f7b8f7 100644
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java
@@ -60,13 +60,13 @@
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class CameraTwoEngine extends CameraEngine {
   private final Context ctxt;
-  private CameraManager mgr;
+  private final CameraManager mgr;
   final private HandlerThread handlerThread=new HandlerThread(getClass().getSimpleName(),
       android.os.Process.THREAD_PRIORITY_BACKGROUND);
   final private Handler handler;
   final private Semaphore lock=new Semaphore(1);
 //  private CountDownLatch closeLatch=null;
-  private MediaActionSound shutter=new MediaActionSound();
+  private final MediaActionSound shutter=new MediaActionSound();
   private List<Descriptor> descriptors=null;
 
   /**
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java
index 98db183..ad1a00f 100644
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java
@@ -522,7 +522,7 @@ public void onPictureTaken(final byte[] bytes, final Camera camera) {
   }
 
   static class Descriptor implements CameraDescriptor {
-    private int cameraId;
+    private final int cameraId;
     private Camera camera;
     private List<Size> pictureSizes;
     private List<Size> previewSizes;
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java
index 899f097..722f86e 100644
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java
@@ -37,7 +37,7 @@
  */
 public class ImageContext {
   private static final double LOG_2=Math.log(2.0d);
-  private Context ctxt;
+  private final Context ctxt;
   private byte[] jpegOriginal;
   private Bitmap bmp;
   private Bitmap thumbnail;
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java
index d3faa0f..0b03cd7 100644
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java
@@ -26,8 +26,8 @@
  * an instance. Beyond that, this is an opaque blob to you.
  */
 public class PictureTransaction {
-  private ArrayList<ImageProcessor> processors=new ArrayList<ImageProcessor>();
-  private Bundle props=new Bundle();
+  private final ArrayList<ImageProcessor> processors=new ArrayList<ImageProcessor>();
+  private final Bundle props=new Bundle();
 
   private PictureTransaction() {
     // use the builder, please
@@ -67,7 +67,7 @@ public Bundle getProperties() {
    * Builder class to create an instance of a PictureTransaction.
    */
   public static class Builder {
-    private PictureTransaction result=new PictureTransaction();
+    private final PictureTransaction result=new PictureTransaction();
 
     /**
      * @return the PictureTransaction built up by the Builder API
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java
index 04155fc..3e7f51f 100644
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java
+++ b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java
@@ -27,7 +27,7 @@ interface Listener {
 
   private long startTime=0L;
   private long overallDuration=0L;
-  private StringBuilder sb=new StringBuilder(8);
+  private final StringBuilder sb=new StringBuilder(8);
   private Listener listener;
 
   public ReverseChronometer(Context context, AttributeSet attrs) {
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/AlbumEntry.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/AlbumEntry.java
index 1722c51..0b77715 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/AlbumEntry.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/AlbumEntry.java
@@ -1,9 +1,13 @@
 package net.yazeed44.imagepicker.data.model;
 
+import net.yazeed44.imagepicker.util.Util;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 
+import java8.util.Objects;
+
 /**
  * Created by yazeed44
  * on 6/14/15.
@@ -23,9 +27,26 @@ public AlbumEntry(int albumId, String albumName) {
     public void addPhoto(ImageEntry imageEntry) {
         imageList.add(imageEntry);
     }
+
     public void sortImagesByTimeDesc() {
         Collections.sort(imageList, (lhs, rhs) -> (int) (rhs.dateAdded - lhs.dateAdded));
 
         coverImage = imageList.get(0);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof AlbumEntry)) return false;
+        AlbumEntry that = (AlbumEntry) o;
+        return id == that.id &&
+                Objects.equals(Util.unAccent(name), Util.unAccent(that.name)) &&
+                Objects.equals(imageList, that.imageList) &&
+                Objects.equals(coverImage, that.coverImage);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, Util.unAccent(name), imageList, coverImage);
+    }
 }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
index 627287c..a0dbbaa 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
@@ -17,6 +17,7 @@
 import android.util.Base64;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.bumptech.glide.Glide;
 
@@ -48,6 +49,7 @@ public class ImageEntry implements Parcelable {
     private boolean uploaded;
     private int progress;
 
+
     private void logException(Throwable e) {
 //        e.printStackTrace();
     }
@@ -108,6 +110,62 @@ public String getBase64() {
         return rt;
     }
 
+    /**
+     * Rotate a bitmap based on orientation metadata.
+     * src - image path
+     */
+    public static Bitmap rotateBitmap(String src) {
+        Bitmap bitmap = BitmapFactory.decodeFile(src);
+        try {
+            ExifInterface exif = new ExifInterface(src);
+            int orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+
+            Matrix matrix = new Matrix();
+            switch (orientation) {
+                case ExifInterface.ORIENTATION_FLIP_HORIZONTAL:
+                    matrix.setScale(-1, 1);
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_180:
+                    matrix.setRotate(180);
+                    break;
+                case ExifInterface.ORIENTATION_FLIP_VERTICAL:
+                    matrix.setRotate(180);
+                    matrix.postScale(-1, 1);
+                    break;
+                case ExifInterface.ORIENTATION_TRANSPOSE:
+                    matrix.setRotate(90);
+                    matrix.postScale(-1, 1);
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_90:
+                    matrix.setRotate(90);
+                    break;
+                case ExifInterface.ORIENTATION_TRANSVERSE:
+                    matrix.setRotate(-90);
+                    matrix.postScale(-1, 1);
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_270:
+                    matrix.setRotate(-90);
+                    break;
+                case ExifInterface.ORIENTATION_NORMAL:
+                case ExifInterface.ORIENTATION_UNDEFINED:
+                default:
+                    return bitmap;
+            }
+
+            try {
+                Bitmap oriented = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+                bitmap.recycle();
+                return oriented;
+            } catch (OutOfMemoryError e) {
+                e.printStackTrace();
+                return bitmap;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return bitmap;
+    }
+
     public Bitmap getBitmapRotated() {
         Bitmap bmp = getScaledBitmap();
         ExifInterface exif;
@@ -185,6 +243,7 @@ private static Bitmap rotateImageIfRequired(Context context, Bitmap img, Uri sel
                 return img;
         }
     }
+
     public Bitmap getBitmapResignedAndRotated(Uri photoUri, Context context) throws IOException {
         // First decode with inJustDecodeBounds=true to check dimensions
         final BitmapFactory.Options options = new BitmapFactory.Options();
@@ -335,6 +394,7 @@ public Bitmap decodeFile(File f) {
         return BitmapFactory.decodeFile(f.getAbsolutePath(), options);
     }
 
+    @Nullable
     public Bitmap getBitmap() {
         if (TextUtils.isEmpty(path)) {
             return bitmap;
@@ -395,6 +455,7 @@ public Uri getUri() {
         return null;
     }
 
+    @Nullable
     public Bitmap getScaledBitmap() {
         Bitmap origin_bm = getBitmap();
         if (origin_bm == null) return null;
@@ -435,11 +496,11 @@ private Bitmap BITMAP_RESIZER(Bitmap bitmap, int newWidth, int newHeight) {
     }
 
     private static Bitmap rotateImage(Bitmap img, int degree) {
+        if (img == null) return null;
         Matrix matrix = new Matrix();
         matrix.postRotate(degree);
-        Bitmap rotatedImg = Bitmap.createBitmap(img, 0, 0, img.getWidth(), img.getHeight(), matrix, true);
-//        img.recycle();
-        return rotatedImg;
+        //        img.recycle();
+        return Bitmap.createBitmap(img, 0, 0, img.getWidth(), img.getHeight(), matrix, true);
     }
 
     public ImageEntry(final Builder builder) {
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
index a1f547f..80b77d8 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
@@ -43,7 +43,7 @@ public class ImagePreviewAdapter extends RecyclerView.Adapter<ImagePreviewAdapte
 
     protected final Drawable mCheckIcon;
     protected final Drawable mVideoIcon;
-    private String descriptionHint;
+    private final String descriptionHint;
 
     public ImagePreviewAdapter(final ArrayList<ImageEntry> imageEntries, final RecyclerView recyclerView, Picker pickOptions, String descriptionHint) {
         this.imageEntries = imageEntries;
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
index c9374d6..86c3b3f 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photoPager/ImagesPagerFragment.java
@@ -59,6 +59,7 @@ private void removeBehaviorAttr(final ViewGroup container) {
     }
 
     private void addBehaviorAttr(final ViewGroup container) {
+        if (container == null) return;
         final CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams) container.getLayoutParams();
         layoutParams.setBehavior(new AppBarLayout.ScrollingViewBehavior());
         container.setLayoutParams(layoutParams);
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MultiplePicker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MultiplePicker.java
index b05215c..1a8bd7c 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MultiplePicker.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/MultiplePicker.java
@@ -43,6 +43,7 @@ public MultiplePicker.MultipleBuilder setDescriptionHint(final String descriptio
 
         @Override
         public Picker build() {
+            multipleImage();
             return new MultiplePicker(this);
         }
     }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
index 6c3a805..72ede86 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
@@ -91,6 +91,10 @@ protected Picker(final Builder builder) {
     }
 
     public void startActivity() {
+        if (limit <= 0 && pickMode == PickMode.MULTIPLE_IMAGES) {
+            ToastUtils.showToastWarning(context.get(), R.string.you_picked_max_photo);
+            return;
+        }
         if (context.get() instanceof FragmentActivity) {
             Log.d(getClass().getSimpleName(), "startActivity() called");
             FragmentActivity fragmentActivity = (FragmentActivity) context.get();
@@ -138,7 +142,11 @@ private StringBuilder getPermissionsString(Context context, PermissionResult res
     }
 
     public enum PickMode {
-        SINGLE_IMAGE, MULTIPLE_IMAGES, SINGLE_VIDEO, MULTIPLE_VIDEOS, MIX
+        SINGLE_IMAGE,
+        MULTIPLE_IMAGES,
+        SINGLE_VIDEO,
+        MULTIPLE_VIDEOS,
+        MIX
     }
 
     public interface PickListener {
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/SinglePicker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/SinglePicker.java
index 93f4e1f..52324e2 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/SinglePicker.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/SinglePicker.java
@@ -48,6 +48,7 @@ public SinglePicker.SingleBuilder withAspectRatio(float x, float y) {
 
         @Override
         public Picker build() {
+            singleImage();
             return new SinglePicker(this);
         }
     }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java
index 78e8aa4..bce3d65 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Util.java
@@ -10,6 +10,7 @@
 import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
+import android.text.TextUtils;
 import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.View;
@@ -25,8 +26,11 @@
 import net.yazeed44.imagepicker.data.model.ImageEntry;
 import net.yazeed44.imagepicker.ui.PickerActivity;
 
+import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
+import java.util.regex.Pattern;
 
 /**
  * Created by yazeed44
@@ -56,6 +60,7 @@ public static boolean isStoragePermissionGranted(@Nullable Activity activity) {
                     activity,
                     PERMISSIONS_STORAGE, REQUEST_EXTERNAL_STORAGE
             );
+
             return false;
         } else return true;
     }
@@ -94,18 +99,36 @@ public static ArrayList<AlbumEntry> getAlbums(final Context context, final Picke
         for (final AlbumEntry album : albumsSorted) {
             album.sortImagesByTimeDesc();
         }
+//
+
+        Collections.sort(albumsSorted, new Comparator<AlbumEntry>() {
+            @Override
+            public int compare(AlbumEntry o1, AlbumEntry o2) {
+                if (o1 == null || o2 == null) return 1;
+                String a1Name = o1.name == null ? "" : unAccent(o1.name);
+                String a2Name = o2.name == null ? "" : unAccent(o2.name);
+                if (TextUtils.isEmpty(a1Name) || TextUtils.isEmpty(a2Name)) return 1;
+                int o1Id = a1Name.contains("IMG") ? Integer.MAX_VALUE : o1.id;
+                int o2Id = a2Name.contains("IMG") ? Integer.MAX_VALUE : o2.id;
+                return Integer.compare(o1Id, o2Id);
+            }
 
-        Collections.sort(albumsSorted, (o1, o2) -> {
-            if (o1.name == null || o2.name == null) return 0;
-            int o1Id = o1.name.contains("IMG") ? Integer.MAX_VALUE : o1.id;
-            int o2Id = o2.name.contains("IMG") ? Integer.MAX_VALUE : o2.id;
-            return Integer.compare(o1Id, o2Id);
+            @Override
+            public boolean equals(Object o) {
+                return false;
+            }
         });
 
         return albumsSorted;
 
     }
 
+    public static String unAccent(String s) {
+        String temp = Normalizer.normalize(s, Normalizer.Form.NFD);
+        Pattern pattern = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
+        return pattern.matcher(temp).replaceAll("").replaceAll("Đ", "D").replaceAll("đ", "d").toLowerCase();
+    }
+
     private static void closeCursors(final Cursor imagesCursor, final Cursor videosCursor) {
 
         if (imagesCursor != null) {
diff --git a/imagepicker/src/main/res/layout/activity_photo_pick.xml b/imagepicker/src/main/res/layout/activity_photo_pick.xml
index 3e1d9b5..b70f74b 100644
--- a/imagepicker/src/main/res/layout/activity_photo_pick.xml
+++ b/imagepicker/src/main/res/layout/activity_photo_pick.xml
@@ -18,7 +18,7 @@
             app:layout_scrollFlags="scroll|enterAlways"
             android:layout_height="48dp"
             android:background="?attr/colorPrimary">
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/done_text"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/btn_height"
diff --git a/imagepicker/src/main/res/layout/element_album.xml b/imagepicker/src/main/res/layout/element_album.xml
index ed2f506..2dc1430 100644
--- a/imagepicker/src/main/res/layout/element_album.xml
+++ b/imagepicker/src/main/res/layout/element_album.xml
@@ -11,7 +11,7 @@
     android:paddingRight="@dimen/grid_spacing"
     android:paddingTop="@dimen/grid_spacing">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/album_thumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -35,7 +35,7 @@
         android:paddingRight="16dp"
         android:paddingTop="10dp">
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/album_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
             tools:text="Album name"
             android:textSize="14sp" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/album_count"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/imagepicker/src/main/res/layout/element_image.xml b/imagepicker/src/main/res/layout/element_image.xml
index 92366fb..d8f1521 100644
--- a/imagepicker/src/main/res/layout/element_image.xml
+++ b/imagepicker/src/main/res/layout/element_image.xml
@@ -7,7 +7,7 @@
     android:focusableInTouchMode="false"
     android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
 
         android:id="@+id/image_thumbnail"
         android:layout_width="match_parent"
@@ -20,7 +20,7 @@
 
         />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image_check"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
         android:focusable="false"
         android:focusableInTouchMode="false" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image_video_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/imagepicker/src/main/res/layout/element_image_preview.xml b/imagepicker/src/main/res/layout/element_image_preview.xml
index a1087c7..2df016b 100644
--- a/imagepicker/src/main/res/layout/element_image_preview.xml
+++ b/imagepicker/src/main/res/layout/element_image_preview.xml
@@ -8,7 +8,7 @@
     android:focusableInTouchMode="false"
     android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image_thumbnail"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -23,7 +23,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image_video_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
         app:layout_constraintStart_toStartOf="@id/image_thumbnail"
         app:layout_constraintTop_toTopOf="@+id/image_thumbnail" />
 
-    <EditText
+    <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/edt_des"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/imagepicker/src/main/res/values-en/strings.xml b/imagepicker/src/main/res/values-en/strings.xml
index 01890b8..6b5171f 100644
--- a/imagepicker/src/main/res/values-en/strings.xml
+++ b/imagepicker/src/main/res/values-en/strings.xml
@@ -3,15 +3,15 @@
 
     <string name="album_thumbnail">Album Thumbnail</string>
     <string name="image_thumbnail">Image thumbnail</string>
-    <string name="action_take_photo">Chụp ảnh</string>
-    <string name="all_photos">Tất cả ảnh</string>
-    <string name="image_check">Chọn ảnh</string>
+    <string name="action_take_photo">Take image</string>
+    <string name="all_photos">All image</string>
+    <string name="image_check">Pick image</string>
     <string name="albums_title">Album</string>
-    <string name="you_cant_check_more_images">Không thể chọn thêm ảnh</string>
-    <string name="image_position_in_view_pager">% trên $</string>
-    <string name="action_select_all">Chọn tất cả</string>
-    <string name="action_deselect_all">Bỏ chọn tất cả</string>
-    <string name="video_too_long">Video quá dài. Video có chỉ được dài tối đa $ giây</string>
+    <string name="you_cant_check_more_images">Can\'t pick more image</string>
+    <string name="image_position_in_view_pager">% of $</string>
+    <string name="action_select_all">Select all</string>
+    <string name="action_deselect_all">Deselect all</string>
+    <string name="video_too_long">Video too long. Maximum $ seconds</string>
     <string name="image_video_icon_desc">Indicates this thumbnail as video</string>
     <string name="dialog_choose_camera_title">Select camera</string>
     <string name="dialog_choose_camera_item_0">Take image</string>
diff --git a/imagepicker/src/main/res/values/strings.xml b/imagepicker/src/main/res/values/strings.xml
index 2d34d6d..c65ff8e 100644
--- a/imagepicker/src/main/res/values/strings.xml
+++ b/imagepicker/src/main/res/values/strings.xml
@@ -39,5 +39,6 @@
     <string name="take_video">Quay video</string>
     <string name="add_description">Thêm mô tả</string>
     <string name="ask_perrmission">Application needs following permissions to work normally: %s. Allow application to use those permissions?</string>
+    <string name="you_picked_max_photo">Bạn đã chọn tối đa số ảnh cho phép</string>
 
 </resources>

From d4e34d2f0adeee2a8076cd70f7c264a083ea3bd9 Mon Sep 17 00:00:00 2001
From: anhtt <anhtt@omt.vn>
Date: Mon, 7 Sep 2020 09:26:13 +0700
Subject: [PATCH 09/16] Fix crash

---
 imagepicker/build.gradle                                    | 6 +++---
 .../net/yazeed44/imagepicker/ui/album/AlbumsFragment.java   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index 0c6b34f..8e3beb8 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -26,11 +26,11 @@ ext {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 17
-        targetSdkVersion 28
+        targetSdkVersion 29
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -61,7 +61,7 @@ dependencies {
     implementation('com.octo.android.robospice:robospice:1.4.14') {
         exclude group: 'org.apache.commons', module: 'commons-io'
     }
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-rc1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
 
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsFragment.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsFragment.java
index 8ed26af..fcd96d5 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsFragment.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsFragment.java
@@ -159,7 +159,7 @@ public void onEvent(final Events.OnReloadAlbumsEvent reloadAlbums) {
 
     private void pickLatestCapturedImage() {
         for (final AlbumEntry albumEntry : mAlbumList) {
-            if (albumEntry.name.equals(PickerActivity.CAPTURED_IMAGES_ALBUM_NAME)) {
+            if (PickerActivity.CAPTURED_IMAGES_ALBUM_NAME.equals(albumEntry.name)) {
                 AlbumEntry image = Util.getAllPhotosAlbum(mAlbumList);
                 if (image != null) {
                     ImageEntry imageEntry = image.imageList.get(0);

From 31549ef4b6ac52c14e639e9fb0459e4ece35d438 Mon Sep 17 00:00:00 2001
From: anhtt <anhtt@omt.vn>
Date: Sat, 6 Feb 2021 10:08:41 +0700
Subject: [PATCH 10/16] Update recyclerview

---
 .../java/net/yazeed44/imagepicker/ui/album/AlbumsAdapter.java   | 2 +-
 .../imagepicker/ui/imagePreview/ImagePreviewAdapter.java        | 2 +-
 .../yazeed44/imagepicker/ui/photo/ImagesThumbnailAdapter.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsAdapter.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsAdapter.java
index 443f993..15a8dd7 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsAdapter.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/album/AlbumsAdapter.java
@@ -124,7 +124,7 @@ public AlbumViewHolder(final View itemView, final Util.OnClickAlbum listener) {
             detailsLayout = itemView.findViewById(R.id.album_detail_layout);
 
             itemView.setOnClickListener(v -> {
-                if (getAdapterPosition() < 0) return;
+                if (getAbsoluteAdapterPosition() < 0) return;
                 listener.onClickAlbum(itemView);
             });
 
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
index 80b77d8..23ea8de 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/imagePreview/ImagePreviewAdapter.java
@@ -148,7 +148,7 @@ public ImageViewHolder(final View itemView) {
             videoIcon = itemView.findViewById(R.id.image_video_icon);
 
             itemView.setOnClickListener(v -> {
-                if (getAdapterPosition() < 0) return;
+                if (getAbsoluteAdapterPosition() < 0) return;
             });
             description.addTextChangedListener(new TextWatcher() {
                 @Override
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photo/ImagesThumbnailAdapter.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photo/ImagesThumbnailAdapter.java
index b739c17..ef06869 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photo/ImagesThumbnailAdapter.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/photo/ImagesThumbnailAdapter.java
@@ -188,7 +188,7 @@ public ImageViewHolder(final View itemView, final Util.OnClickImage listener) {
             videoIcon = itemView.findViewById(R.id.image_video_icon);
 
             itemView.setOnClickListener(v -> {
-                if (getAdapterPosition() < 0) return;
+                if (getAbsoluteAdapterPosition() < 0) return;
                 listener.onClickImage(itemView, thumbnail, check);
             });
 

From 828921dff4b0f1f077bed641f7de693055f01c61 Mon Sep 17 00:00:00 2001
From: TrungNK <trungnk@omt.com.vn>
Date: Sat, 6 Feb 2021 12:21:31 +0700
Subject: [PATCH 11/16] fix quay video

---
 .../multiimagepicker/MainActivity.java        |   16 +-
 build.gradle                                  |    2 +-
 gradle/wrapper/gradle-wrapper.properties      |    2 +-
 imagepicker/build.gradle                      |   21 +-
 imagepicker/src/main/AndroidManifest.xml      |   14 +-
 .../src/main/java/com/android/mms/LogTag.java |  135 -
 .../mms/exif/ByteBufferInputStream.java       |   48 -
 .../mms/exif/CountedDataInputStream.java      |  137 -
 .../java/com/android/mms/exif/ExifData.java   |  351 ---
 .../com/android/mms/exif/ExifInterface.java   | 2416 -----------------
 .../mms/exif/ExifInvalidFormatException.java  |   23 -
 .../com/android/mms/exif/ExifModifier.java    |  197 --
 .../android/mms/exif/ExifOutputStream.java    |  520 ----
 .../java/com/android/mms/exif/ExifParser.java |  919 -------
 .../java/com/android/mms/exif/ExifReader.java |   94 -
 .../java/com/android/mms/exif/ExifTag.java    | 1009 -------
 .../java/com/android/mms/exif/IfdData.java    |  152 --
 .../main/java/com/android/mms/exif/IfdId.java |   31 -
 .../java/com/android/mms/exif/JpegHeader.java |   39 -
 .../mms/exif/OrderedDataOutputStream.java     |   56 -
 .../java/com/android/mms/exif/Rational.java   |   91 -
 .../cwac/cam2/AbstractCameraActivity.java     |  813 ------
 .../cwac/cam2/AbstractImageProcessor.java     |   40 -
 .../commonsware/cwac/cam2/CameraActivity.java |  341 ---
 .../cwac/cam2/CameraConfigurator.java         |   22 -
 .../cwac/cam2/CameraConstraints.java          |  511 ----
 .../cwac/cam2/CameraController.java           |  510 ----
 .../cwac/cam2/CameraDescriptor.java           |   49 -
 .../commonsware/cwac/cam2/CameraEngine.java   |  439 ---
 .../commonsware/cwac/cam2/CameraFragment.java |  723 -----
 .../commonsware/cwac/cam2/CameraPlugin.java   |   55 -
 .../cwac/cam2/CameraSelectionCriteria.java    |  109 -
 .../commonsware/cwac/cam2/CameraSession.java  |  128 -
 .../cwac/cam2/CameraTwoConfigurator.java      |   57 -
 .../cwac/cam2/CameraTwoEngine.java            |  924 -------
 .../com/commonsware/cwac/cam2/CameraView.java |  231 --
 .../com/commonsware/cwac/cam2/ChronoType.java |   27 -
 .../cwac/cam2/ClassicCameraConfigurator.java  |   46 -
 .../cwac/cam2/ClassicCameraEngine.java        |  643 -----
 .../cwac/cam2/ConfirmationFragment.java       |  152 --
 .../commonsware/cwac/cam2/ErrorConstants.java |   85 -
 .../com/commonsware/cwac/cam2/Facing.java     |   26 -
 .../com/commonsware/cwac/cam2/FlashMode.java  |   85 -
 .../com/commonsware/cwac/cam2/FocusMode.java  |   19 -
 .../commonsware/cwac/cam2/ImageContext.java   |  270 --
 .../commonsware/cwac/cam2/ImageProcessor.java |   39 -
 .../com/commonsware/cwac/cam2/JPEGWriter.java |  115 -
 .../cwac/cam2/OrientationLockMode.java        |   40 -
 .../cwac/cam2/PictureTransaction.java         |  127 -
 .../cwac/cam2/ReverseChronometer.java         |   75 -
 .../cwac/cam2/RuleOfThirdsOverlay.java        |   59 -
 .../cam2/SimpleCameraTwoConfigurator.java     |   33 -
 .../cam2/SimpleClassicCameraConfigurator.java |   27 -
 .../cwac/cam2/VideoRecorderActivity.java      |  182 --
 .../cwac/cam2/VideoTransaction.java           |   76 -
 .../com/commonsware/cwac/cam2/ZoomStyle.java  |   21 -
 .../cwac/cam2/plugin/FlashModePlugin.java     |  119 -
 .../cwac/cam2/plugin/FocusModePlugin.java     |  215 --
 .../cwac/cam2/plugin/OrientationPlugin.java   |  273 --
 .../cwac/cam2/plugin/SizeAndFormatPlugin.java |  164 --
 .../com/commonsware/cwac/cam2/util/Size.java  |  152 --
 .../com/commonsware/cwac/cam2/util/Utils.java |  195 --
 .../imagepicker/data/model/ImageEntry.java    |   15 +
 .../imagepicker/ui/PickerActivity.java        |  147 +-
 .../imagepicker/ui/camera/CameraActivity.java |   78 +
 .../imagepicker/util/CameraSupport.java       |   15 +-
 .../net/yazeed44/imagepicker/util/Picker.java |   26 +-
 .../src/main/res/drawable-hdpi/ic_video.png   |  Bin 368 -> 0 bytes
 .../src/main/res/drawable-mdpi/ic_video.png   |  Bin 270 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_video.png  |  Bin 457 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_video.png |  Bin 708 -> 0 bytes
 .../src/main/res/layout/activity_camera.xml   |   21 +
 .../src/main/res/values-en/strings.xml        |    2 +
 .../src/main/res/values-vi/strings.xml        |    1 +
 imagepicker/src/main/res/values/strings.xml   |    2 +
 75 files changed, 272 insertions(+), 14525 deletions(-)
 delete mode 100644 imagepicker/src/main/java/com/android/mms/LogTag.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/ByteBufferInputStream.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifData.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifInvalidFormatException.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifParser.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifReader.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/ExifTag.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/IfdData.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/IfdId.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/JpegHeader.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/OrderedDataOutputStream.java
 delete mode 100644 imagepicker/src/main/java/com/android/mms/exif/Rational.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractImageProcessor.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraActivity.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConfigurator.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConstraints.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraController.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraDescriptor.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraPlugin.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSelectionCriteria.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoConfigurator.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraView.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ChronoType.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraConfigurator.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ConfirmationFragment.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ErrorConstants.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/Facing.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/FlashMode.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/FocusMode.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageProcessor.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/JPEGWriter.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/OrientationLockMode.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/RuleOfThirdsOverlay.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleCameraTwoConfigurator.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleClassicCameraConfigurator.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoRecorderActivity.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoTransaction.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/ZoomStyle.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FlashModePlugin.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FocusModePlugin.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/OrientationPlugin.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/SizeAndFormatPlugin.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Size.java
 delete mode 100644 imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Utils.java
 create mode 100644 imagepicker/src/main/java/net/yazeed44/imagepicker/ui/camera/CameraActivity.java
 delete mode 100644 imagepicker/src/main/res/drawable-hdpi/ic_video.png
 delete mode 100644 imagepicker/src/main/res/drawable-mdpi/ic_video.png
 delete mode 100644 imagepicker/src/main/res/drawable-xhdpi/ic_video.png
 delete mode 100644 imagepicker/src/main/res/drawable-xxhdpi/ic_video.png
 create mode 100644 imagepicker/src/main/res/layout/activity_camera.xml

diff --git a/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java b/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java
index 53fa119..72cb122 100644
--- a/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java
+++ b/app/src/main/java/net/yazeed44/multiimagepicker/MainActivity.java
@@ -2,6 +2,7 @@
 
 
 import android.os.Bundle;
+
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -57,12 +58,12 @@ private void setupRecycler() {
 
 
     public void onClickPickImageSingle(View view) {
-
-        new Picker.Builder(this, this, R.style.MIP_theme)
-                .setPickMode(Picker.PickMode.SINGLE_IMAGE)
-                .setCropAfterPick(true)
-                .build()
-                .startActivity();
+        Picker picker = new Picker.Builder(this, this)
+                .setLimitVideo(5)
+                .setLimitPhoto(5)
+                .setVideosEnabled(true)
+                .build();
+        picker.startActivity();
     }
 
     public void onClickPickImageMultipleWithLimit(View view) {
@@ -129,9 +130,6 @@ private void showAbout() {
     }
 
 
-
-
-
     @Override
     public void onPickedSuccessfully(ArrayList<ImageEntry> images) {
         mSelectedImages = images;
diff --git a/build.gradle b/build.gradle
index ea707df..8412f5d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0-alpha01'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath 'com.google.gms:google-services:4.3.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 07e32a0..1574413 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index 8e3beb8..2076b6c 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -55,13 +55,13 @@ repositories {
 dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0-alpha02'
+    implementation 'com.google.android.material:material:1.3.0-rc01'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
     implementation('com.octo.android.robospice:robospice:1.4.14') {
         exclude group: 'org.apache.commons', module: 'commons-io'
     }
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
@@ -69,23 +69,30 @@ dependencies {
 
     api 'com.github.yalantis:ucrop:2.2.3'
 
+    //camera
+    implementation 'com.camerakit:camerakit:1.0.0-beta3.11'
+    implementation 'com.camerakit:jpegkit:0.1.0'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0'
+
     //Rx Java
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
     implementation 'com.squareup.retrofit2:adapter-rxjava:2.9.0'
     implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
     //Dagger
-    implementation 'com.google.dagger:dagger:2.28.3'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.28.3'
+    implementation 'com.google.dagger:dagger:2.29.1'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.29.1'
     implementation 'net.sourceforge.streamsupport:streamsupport:1.7.2'
     implementation 'com.jaeger.statusbarutil:library:1.5.1'
     implementation 'com.github.florent37:runtime-permission:1.1.1'
     implementation 'com.github.trantuananh1996:sweetAlert:1.0.2'
     // architecture comp. navigation
-    implementation 'androidx.navigation:navigation-fragment:2.3.0'
-    implementation 'androidx.navigation:navigation-ui:2.3.0'
-    implementation 'androidx.navigation:navigation-runtime:2.3.0'
+    implementation 'androidx.navigation:navigation-fragment:2.3.3'
+    implementation 'androidx.navigation:navigation-ui:2.3.3'
+    implementation 'androidx.navigation:navigation-runtime:2.3.3'
 }
 
+
 //apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
 //apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
\ No newline at end of file
diff --git a/imagepicker/src/main/AndroidManifest.xml b/imagepicker/src/main/AndroidManifest.xml
index 0251615..cb8bd72 100644
--- a/imagepicker/src/main/AndroidManifest.xml
+++ b/imagepicker/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.yazeed44.imagepicker.library">
 
@@ -20,9 +21,11 @@
         android:name="android.hardware.microphone"
         android:required="false" />
 
-    <application
-        android:allowBackup="true"
-        android:requestLegacyExternalStorage="true">
+    <application android:allowBackup="true">
+        <activity
+            android:name="net.yazeed44.imagepicker.ui.camera.CameraActivity"
+            android:screenOrientation="portrait" />
+
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false" />
@@ -31,8 +34,6 @@
             android:name="net.yazeed44.imagepicker.ui.PickerActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/Theme.AppCompat.NoActionBar" />
-        <activity android:name="com.commonsware.cwac.cam2.CameraActivity" />
-        <activity android:name="com.commonsware.cwac.cam2.VideoRecorderActivity" />
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait"
@@ -43,4 +44,5 @@
             android:name="net.yazeed44.imagepicker.util.OfflineSpiceService"
             android:exported="false" />
     </application>
-</manifest>
+
+</manifest>
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/android/mms/LogTag.java b/imagepicker/src/main/java/com/android/mms/LogTag.java
deleted file mode 100644
index 4461362..0000000
--- a/imagepicker/src/main/java/com/android/mms/LogTag.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.util.Log;
-
-/*
-import com.android.mms.data.Contact;
-import com.android.mms.data.Conversation;
-import com.android.mms.data.RecipientIdCache;
-*/
-
-public class LogTag {
-    public static final String TAG = "Mms";
-
-    public static final String TRANSACTION = TAG;
-    public static final String APP = TAG;
-    public static final String THREAD_CACHE = TAG;
-    public static final String THUMBNAIL_CACHE = TAG;
-    public static final String PDU_CACHE = TAG;
-    public static final String WIDGET = TAG;
-    public static final String CONTACT = TAG;
-
-    /**
-     * Log tag for enabling/disabling StrictMode violation log.
-     * To enable: adb shell setprop log.tag.Mms:strictmode DEBUG
-     */
-    public static final String STRICT_MODE_TAG = TAG;
-    public static final boolean VERBOSE = false;
-    public static final boolean SEVERE_WARNING = true;                  // Leave this true
-    private static final boolean SHOW_SEVERE_WARNING_DIALOG = false;    // Set to false before ship
-    public static final boolean DEBUG_SEND = false;    // Set to false before ship
-    public static final boolean DEBUG_DUMP = false;    // Set to false before ship
-    public static final boolean ALLOW_DUMP_IN_LOGS = false;  // Set to false before ship
-
-    private static String prettyArray(String[] array) {
-        if (array.length == 0) {
-            return "[]";
-        }
-
-        StringBuilder sb = new StringBuilder("[");
-        int len = array.length-1;
-        for (int i = 0; i < len; i++) {
-            sb.append(array[i]);
-            sb.append(", ");
-        }
-        sb.append(array[len]);
-        sb.append("]");
-
-        return sb.toString();
-    }
-
-    private static String logFormat(String format, Object... args) {
-        for (int i = 0; i < args.length; i++) {
-            if (args[i] instanceof String[]) {
-                args[i] = prettyArray((String[])args[i]);
-            }
-        }
-        String s = String.format(format, args);
-        s = "[" + Thread.currentThread().getId() + "] " + s;
-        return s;
-    }
-
-    public static void debug(String format, Object... args) {
-        // Log.d(TAG, logFormat(format, args));
-    }
-
-    public static void warn(String format, Object... args) {
-        Log.w(TAG, logFormat(format, args));
-    }
-
-    public static void error(String format, Object... args) {
-        Log.e(TAG, logFormat(format, args));
-    }
-
-/*
-    public static void dumpInternalTables(final Context context) {
-        if (!ALLOW_DUMP_IN_LOGS) {
-            return;
-        }
-        new Thread(new Runnable() {
-            public void run() {
-                RecipientIdCache.canonicalTableDump();
-                RecipientIdCache.dump();
-                Conversation.dumpThreadsTable(context);
-                Conversation.dump();
-                Conversation.dumpSmsTable(context);
-                Contact.dump();
-            }
-        }).start();
-    }
-
-    public static void warnPossibleRecipientMismatch(final String msg, final Activity activity) {
-        Log.e(TAG, "WARNING!!!! " + msg, new RuntimeException());
-
-        if (SHOW_SEVERE_WARNING_DIALOG) {
-            dumpInternalTables(activity);
-            activity.runOnUiThread(new Runnable() {
-                public void run() {
-                    new AlertDialog.Builder(activity)
-                        .setIconAttribute(android.R.attr.alertDialogIcon)
-                        .setTitle(R.string.error_state)
-                        .setMessage(msg + "\n\n" + activity.getString(R.string.error_state_text))
-                        .setPositiveButton(R.string.yes, new OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                dialog.dismiss();
-                            }
-                        })
-                        .show();
-                }
-            });
-        }
-    }
-*/
-
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ByteBufferInputStream.java b/imagepicker/src/main/java/com/android/mms/exif/ByteBufferInputStream.java
deleted file mode 100644
index 8e764af..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/ByteBufferInputStream.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-class ByteBufferInputStream extends InputStream {
-
-    private final ByteBuffer mBuf;
-
-    public ByteBufferInputStream(ByteBuffer buf) {
-        mBuf = buf;
-    }
-
-    @Override
-    public int read() {
-        if (!mBuf.hasRemaining()) {
-            return -1;
-        }
-        return mBuf.get() & 0xFF;
-    }
-
-    @Override
-    public int read(byte[] bytes, int off, int len) {
-        if (!mBuf.hasRemaining()) {
-            return -1;
-        }
-
-        len = Math.min(len, mBuf.remaining());
-        mBuf.get(bytes, off, len);
-        return len;
-    }
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java b/imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java
deleted file mode 100644
index f847860..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/CountedDataInputStream.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import java.io.EOFException;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
-class CountedDataInputStream extends FilterInputStream {
-
-    private int mCount = 0;
-
-    // allocate a byte buffer for a long value;
-    private final byte[] mByteArray = new byte[8];
-    private final ByteBuffer mByteBuffer = ByteBuffer.wrap(mByteArray);
-
-    protected CountedDataInputStream(InputStream in) {
-        super(in);
-    }
-
-    public int getReadByteCount() {
-        return mCount;
-    }
-
-    @Override
-    public int read(byte[] b) throws IOException {
-        int r = in.read(b);
-        mCount += (r >= 0) ? r : 0;
-        return r;
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        int r = in.read(b, off, len);
-        mCount += (r >= 0) ? r : 0;
-        return r;
-    }
-
-    @Override
-    public int read() throws IOException {
-        int r = in.read();
-        mCount += (r >= 0) ? 1 : 0;
-        return r;
-    }
-
-    @Override
-    public long skip(long length) throws IOException {
-        long skip = in.skip(length);
-        mCount += skip;
-        return skip;
-    }
-
-    public void skipOrThrow(long length) throws IOException {
-        if (skip(length) != length) throw new EOFException();
-    }
-
-    public void skipTo(long target) throws IOException {
-        long cur = mCount;
-        long diff = target - cur;
-        assert(diff >= 0);
-        skipOrThrow(diff);
-    }
-
-    public void readOrThrow(byte[] b, int off, int len) throws IOException {
-        int r = read(b, off, len);
-        if (r != len) throw new EOFException();
-    }
-
-    public void readOrThrow(byte[] b) throws IOException {
-        readOrThrow(b, 0, b.length);
-    }
-
-    public void setByteOrder(ByteOrder order) {
-        mByteBuffer.order(order);
-    }
-
-    public ByteOrder getByteOrder() {
-        return mByteBuffer.order();
-    }
-
-    public short readShort() throws IOException {
-        readOrThrow(mByteArray, 0 ,2);
-        mByteBuffer.rewind();
-        return mByteBuffer.getShort();
-    }
-
-    public int readUnsignedShort() throws IOException {
-        return readShort() & 0xffff;
-    }
-
-    public int readInt() throws IOException {
-        readOrThrow(mByteArray, 0 , 4);
-        mByteBuffer.rewind();
-        return mByteBuffer.getInt();
-    }
-
-    public long readUnsignedInt() throws IOException {
-        return readInt() & 0xffffffffL;
-    }
-
-    public long readLong() throws IOException {
-        readOrThrow(mByteArray, 0 , 8);
-        mByteBuffer.rewind();
-        return mByteBuffer.getLong();
-    }
-
-    public String readString(int n) throws IOException {
-        byte[] buf = new byte[n];
-        readOrThrow(buf);
-        return new String(buf, Charset.forName("utf-8"));
-    }
-
-    public String readString(int n, Charset charset) throws IOException {
-        byte[] buf = new byte[n];
-        readOrThrow(buf);
-        return new String(buf, charset);
-    }
-}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifData.java b/imagepicker/src/main/java/com/android/mms/exif/ExifData.java
deleted file mode 100644
index 793a69f..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifData.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import com.android.mms.LogTag;
-
-import android.util.Log;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * This class stores the EXIF header in IFDs according to the JPEG
- * specification. It is the result produced by {@link ExifReader}.
- *
- * @see ExifReader
- * @see IfdData
- */
-class ExifData {
-    private static final String TAG = LogTag.TAG;
-    private static final byte[] USER_COMMENT_ASCII = {
-            0x41, 0x53, 0x43, 0x49, 0x49, 0x00, 0x00, 0x00
-    };
-    private static final byte[] USER_COMMENT_JIS = {
-            0x4A, 0x49, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00
-    };
-    private static final byte[] USER_COMMENT_UNICODE = {
-            0x55, 0x4E, 0x49, 0x43, 0x4F, 0x44, 0x45, 0x00
-    };
-
-    private final IfdData[] mIfdDatas = new IfdData[IfdId.TYPE_IFD_COUNT];
-    private byte[] mThumbnail;
-    private final ArrayList<byte[]> mStripBytes = new ArrayList<byte[]>();
-    private final ByteOrder mByteOrder;
-
-    ExifData(ByteOrder order) {
-        mByteOrder = order;
-    }
-
-    /**
-     * Gets the compressed thumbnail. Returns null if there is no compressed
-     * thumbnail.
-     *
-     * @see #hasCompressedThumbnail()
-     */
-    protected byte[] getCompressedThumbnail() {
-        return mThumbnail;
-    }
-
-    /**
-     * Sets the compressed thumbnail.
-     */
-    protected void setCompressedThumbnail(byte[] thumbnail) {
-        mThumbnail = thumbnail;
-    }
-
-    /**
-     * Returns true it this header contains a compressed thumbnail.
-     */
-    protected boolean hasCompressedThumbnail() {
-        return mThumbnail != null;
-    }
-
-    /**
-     * Adds an uncompressed strip.
-     */
-    protected void setStripBytes(int index, byte[] strip) {
-        if (index < mStripBytes.size()) {
-            mStripBytes.set(index, strip);
-        } else {
-            for (int i = mStripBytes.size(); i < index; i++) {
-                mStripBytes.add(null);
-            }
-            mStripBytes.add(strip);
-        }
-    }
-
-    /**
-     * Gets the strip count.
-     */
-    protected int getStripCount() {
-        return mStripBytes.size();
-    }
-
-    /**
-     * Gets the strip at the specified index.
-     *
-     * @exceptions #IndexOutOfBoundException
-     */
-    protected byte[] getStrip(int index) {
-        return mStripBytes.get(index);
-    }
-
-    /**
-     * Returns true if this header contains uncompressed strip.
-     */
-    protected boolean hasUncompressedStrip() {
-        return mStripBytes.size() != 0;
-    }
-
-    /**
-     * Gets the byte order.
-     */
-    protected ByteOrder getByteOrder() {
-        return mByteOrder;
-    }
-
-    /**
-     * Returns the {@link IfdData} object corresponding to a given IFD if it
-     * exists or null.
-     */
-    protected IfdData getIfdData(int ifdId) {
-        if (ExifTag.isValidIfd(ifdId)) {
-            return mIfdDatas[ifdId];
-        }
-        return null;
-    }
-
-    /**
-     * Adds IFD data. If IFD data of the same type already exists, it will be
-     * replaced by the new data.
-     */
-    protected void addIfdData(IfdData data) {
-        mIfdDatas[data.getId()] = data;
-    }
-
-    /**
-     * Returns the {@link IfdData} object corresponding to a given IFD or
-     * generates one if none exist.
-     */
-    protected IfdData getOrCreateIfdData(int ifdId) {
-        IfdData ifdData = mIfdDatas[ifdId];
-        if (ifdData == null) {
-            ifdData = new IfdData(ifdId);
-            mIfdDatas[ifdId] = ifdData;
-        }
-        return ifdData;
-    }
-
-    /**
-     * Returns the tag with a given TID in the given IFD if the tag exists.
-     * Otherwise returns null.
-     */
-    protected ExifTag getTag(short tag, int ifd) {
-        IfdData ifdData = mIfdDatas[ifd];
-        return (ifdData == null) ? null : ifdData.getTag(tag);
-    }
-
-    /**
-     * Adds the given ExifTag to its default IFD and returns an existing ExifTag
-     * with the same TID or null if none exist.
-     */
-    protected ExifTag addTag(ExifTag tag) {
-        if (tag != null) {
-            int ifd = tag.getIfd();
-            return addTag(tag, ifd);
-        }
-        return null;
-    }
-
-    /**
-     * Adds the given ExifTag to the given IFD and returns an existing ExifTag
-     * with the same TID or null if none exist.
-     */
-    protected ExifTag addTag(ExifTag tag, int ifdId) {
-        if (tag != null && ExifTag.isValidIfd(ifdId)) {
-            IfdData ifdData = getOrCreateIfdData(ifdId);
-            return ifdData.setTag(tag);
-        }
-        return null;
-    }
-
-    protected void clearThumbnailAndStrips() {
-        mThumbnail = null;
-        mStripBytes.clear();
-    }
-
-    /**
-     * Removes the thumbnail and its related tags. IFD1 will be removed.
-     */
-    protected void removeThumbnailData() {
-        clearThumbnailAndStrips();
-        mIfdDatas[IfdId.TYPE_IFD_1] = null;
-    }
-
-    /**
-     * Removes the tag with a given TID and IFD.
-     */
-    protected void removeTag(short tagId, int ifdId) {
-        IfdData ifdData = mIfdDatas[ifdId];
-        if (ifdData == null) {
-            return;
-        }
-        ifdData.removeTag(tagId);
-    }
-
-    /**
-     * Decodes the user comment tag into string as specified in the EXIF
-     * standard. Returns null if decoding failed.
-     */
-    protected String getUserComment() {
-        IfdData ifdData = mIfdDatas[IfdId.TYPE_IFD_0];
-        if (ifdData == null) {
-            return null;
-        }
-        ExifTag tag = ifdData.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_USER_COMMENT));
-        if (tag == null) {
-            return null;
-        }
-        if (tag.getComponentCount() < 8) {
-            return null;
-        }
-
-        byte[] buf = new byte[tag.getComponentCount()];
-        tag.getBytes(buf);
-
-        byte[] code = new byte[8];
-        System.arraycopy(buf, 0, code, 0, 8);
-
-        try {
-            if (Arrays.equals(code, USER_COMMENT_ASCII)) {
-                return new String(buf, 8, buf.length - 8, StandardCharsets.US_ASCII);
-            } else if (Arrays.equals(code, USER_COMMENT_JIS)) {
-                return new String(buf, 8, buf.length - 8, "EUC-JP");
-            } else if (Arrays.equals(code, USER_COMMENT_UNICODE)) {
-                return new String(buf, 8, buf.length - 8, StandardCharsets.UTF_16);
-            } else {
-                return null;
-            }
-        } catch (UnsupportedEncodingException e) {
-            Log.w(TAG, "Failed to decode the user comment");
-            return null;
-        }
-    }
-
-    /**
-     * Returns a list of all {@link ExifTag}s in the ExifData or null if there
-     * are none.
-     */
-    protected List<ExifTag> getAllTags() {
-        ArrayList<ExifTag> ret = new ArrayList<ExifTag>();
-        for (IfdData d : mIfdDatas) {
-            if (d != null) {
-                ExifTag[] tags = d.getAllTags();
-                if (tags != null) {
-                    for (ExifTag t : tags) {
-                        ret.add(t);
-                    }
-                }
-            }
-        }
-        if (ret.size() == 0) {
-            return null;
-        }
-        return ret;
-    }
-
-    /**
-     * Returns a list of all {@link ExifTag}s in a given IFD or null if there
-     * are none.
-     */
-    protected List<ExifTag> getAllTagsForIfd(int ifd) {
-        IfdData d = mIfdDatas[ifd];
-        if (d == null) {
-            return null;
-        }
-        ExifTag[] tags = d.getAllTags();
-        if (tags == null) {
-            return null;
-        }
-        ArrayList<ExifTag> ret = new ArrayList<ExifTag>(tags.length);
-        for (ExifTag t : tags) {
-            ret.add(t);
-        }
-        if (ret.size() == 0) {
-            return null;
-        }
-        return ret;
-    }
-
-    /**
-     * Returns a list of all {@link ExifTag}s with a given TID or null if there
-     * are none.
-     */
-    protected List<ExifTag> getAllTagsForTagId(short tag) {
-        ArrayList<ExifTag> ret = new ArrayList<ExifTag>();
-        for (IfdData d : mIfdDatas) {
-            if (d != null) {
-                ExifTag t = d.getTag(tag);
-                if (t != null) {
-                    ret.add(t);
-                }
-            }
-        }
-        if (ret.size() == 0) {
-            return null;
-        }
-        return ret;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (obj instanceof ExifData) {
-            ExifData data = (ExifData) obj;
-            if (data.mByteOrder != mByteOrder ||
-                    data.mStripBytes.size() != mStripBytes.size() ||
-                    !Arrays.equals(data.mThumbnail, mThumbnail)) {
-                return false;
-            }
-            for (int i = 0; i < mStripBytes.size(); i++) {
-                if (!Arrays.equals(data.mStripBytes.get(i), mStripBytes.get(i))) {
-                    return false;
-                }
-            }
-            for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) {
-                IfdData ifd1 = data.getIfdData(i);
-                IfdData ifd2 = getIfdData(i);
-                if (ifd1 != ifd2 && ifd1 != null && !ifd1.equals(ifd2)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java b/imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java
deleted file mode 100644
index 4f27143..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifInterface.java
+++ /dev/null
@@ -1,2416 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.util.SparseIntArray;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.FileChannel.MapMode;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.TimeZone;
-
-/**
- * This class provides methods and constants for reading and writing jpeg file
- * metadata. It contains a collection of ExifTags, and a collection of
- * definitions for creating valid ExifTags. The collection of ExifTags can be
- * updated by: reading new ones from a file, deleting or adding existing ones,
- * or building new ExifTags from a tag definition. These ExifTags can be written
- * to a valid jpeg image as exif metadata.
- * <p>
- * Each ExifTag has a tag ID (TID) and is stored in a specific image file
- * directory (IFD) as specified by the exif standard. A tag definition can be
- * looked up with a constant that is a combination of TID and IFD. This
- * definition has information about the type, number of components, and valid
- * IFDs for a tag.
- *
- * @see ExifTag
- */
-public class ExifInterface {
-    public static final int TAG_NULL = -1;
-    public static final int IFD_NULL = -1;
-    public static final int DEFINITION_NULL = 0;
-
-    /**
-     * Tag constants for Jeita EXIF 2.2
-     */
-
-    // IFD 0
-    public static final int TAG_IMAGE_WIDTH =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0100);
-    public static final int TAG_IMAGE_LENGTH =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0101); // Image height
-    public static final int TAG_BITS_PER_SAMPLE =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0102);
-    public static final int TAG_COMPRESSION =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0103);
-    public static final int TAG_PHOTOMETRIC_INTERPRETATION =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0106);
-    public static final int TAG_IMAGE_DESCRIPTION =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x010E);
-    public static final int TAG_MAKE =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x010F);
-    public static final int TAG_MODEL =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0110);
-    public static final int TAG_STRIP_OFFSETS =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0111);
-    public static final int TAG_ORIENTATION =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0112);
-    public static final int TAG_SAMPLES_PER_PIXEL =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0115);
-    public static final int TAG_ROWS_PER_STRIP =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0116);
-    public static final int TAG_STRIP_BYTE_COUNTS =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0117);
-    public static final int TAG_X_RESOLUTION =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x011A);
-    public static final int TAG_Y_RESOLUTION =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x011B);
-    public static final int TAG_PLANAR_CONFIGURATION =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x011C);
-    public static final int TAG_RESOLUTION_UNIT =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0128);
-    public static final int TAG_TRANSFER_FUNCTION =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x012D);
-    public static final int TAG_SOFTWARE =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0131);
-    public static final int TAG_DATE_TIME =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0132);
-    public static final int TAG_ARTIST =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x013B);
-    public static final int TAG_WHITE_POINT =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x013E);
-    public static final int TAG_PRIMARY_CHROMATICITIES =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x013F);
-    public static final int TAG_Y_CB_CR_COEFFICIENTS =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0211);
-    public static final int TAG_Y_CB_CR_SUB_SAMPLING =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0212);
-    public static final int TAG_Y_CB_CR_POSITIONING =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0213);
-    public static final int TAG_REFERENCE_BLACK_WHITE =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x0214);
-    public static final int TAG_COPYRIGHT =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x8298);
-    public static final int TAG_EXIF_IFD =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x8769);
-    public static final int TAG_GPS_IFD =
-        defineTag(IfdId.TYPE_IFD_0, (short) 0x8825);
-    // IFD 1
-    public static final int TAG_JPEG_INTERCHANGE_FORMAT =
-        defineTag(IfdId.TYPE_IFD_1, (short) 0x0201);
-    public static final int TAG_JPEG_INTERCHANGE_FORMAT_LENGTH =
-        defineTag(IfdId.TYPE_IFD_1, (short) 0x0202);
-    // IFD Exif Tags
-    public static final int TAG_EXPOSURE_TIME =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x829A);
-    public static final int TAG_F_NUMBER =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x829D);
-    public static final int TAG_EXPOSURE_PROGRAM =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x8822);
-    public static final int TAG_SPECTRAL_SENSITIVITY =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x8824);
-    public static final int TAG_ISO_SPEED_RATINGS =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x8827);
-    public static final int TAG_OECF =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x8828);
-    public static final int TAG_EXIF_VERSION =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9000);
-    public static final int TAG_DATE_TIME_ORIGINAL =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9003);
-    public static final int TAG_DATE_TIME_DIGITIZED =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9004);
-    public static final int TAG_COMPONENTS_CONFIGURATION =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9101);
-    public static final int TAG_COMPRESSED_BITS_PER_PIXEL =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9102);
-    public static final int TAG_SHUTTER_SPEED_VALUE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9201);
-    public static final int TAG_APERTURE_VALUE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9202);
-    public static final int TAG_BRIGHTNESS_VALUE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9203);
-    public static final int TAG_EXPOSURE_BIAS_VALUE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9204);
-    public static final int TAG_MAX_APERTURE_VALUE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9205);
-    public static final int TAG_SUBJECT_DISTANCE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9206);
-    public static final int TAG_METERING_MODE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9207);
-    public static final int TAG_LIGHT_SOURCE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9208);
-    public static final int TAG_FLASH =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9209);
-    public static final int TAG_FOCAL_LENGTH =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x920A);
-    public static final int TAG_SUBJECT_AREA =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9214);
-    public static final int TAG_MAKER_NOTE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x927C);
-    public static final int TAG_USER_COMMENT =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9286);
-    public static final int TAG_SUB_SEC_TIME =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9290);
-    public static final int TAG_SUB_SEC_TIME_ORIGINAL =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9291);
-    public static final int TAG_SUB_SEC_TIME_DIGITIZED =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0x9292);
-    public static final int TAG_FLASHPIX_VERSION =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA000);
-    public static final int TAG_COLOR_SPACE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA001);
-    public static final int TAG_PIXEL_X_DIMENSION =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA002);
-    public static final int TAG_PIXEL_Y_DIMENSION =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA003);
-    public static final int TAG_RELATED_SOUND_FILE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA004);
-    public static final int TAG_INTEROPERABILITY_IFD =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA005);
-    public static final int TAG_FLASH_ENERGY =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA20B);
-    public static final int TAG_SPATIAL_FREQUENCY_RESPONSE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA20C);
-    public static final int TAG_FOCAL_PLANE_X_RESOLUTION =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA20E);
-    public static final int TAG_FOCAL_PLANE_Y_RESOLUTION =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA20F);
-    public static final int TAG_FOCAL_PLANE_RESOLUTION_UNIT =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA210);
-    public static final int TAG_SUBJECT_LOCATION =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA214);
-    public static final int TAG_EXPOSURE_INDEX =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA215);
-    public static final int TAG_SENSING_METHOD =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA217);
-    public static final int TAG_FILE_SOURCE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA300);
-    public static final int TAG_SCENE_TYPE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA301);
-    public static final int TAG_CFA_PATTERN =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA302);
-    public static final int TAG_CUSTOM_RENDERED =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA401);
-    public static final int TAG_EXPOSURE_MODE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA402);
-    public static final int TAG_WHITE_BALANCE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA403);
-    public static final int TAG_DIGITAL_ZOOM_RATIO =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA404);
-    public static final int TAG_FOCAL_LENGTH_IN_35_MM_FILE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA405);
-    public static final int TAG_SCENE_CAPTURE_TYPE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA406);
-    public static final int TAG_GAIN_CONTROL =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA407);
-    public static final int TAG_CONTRAST =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA408);
-    public static final int TAG_SATURATION =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA409);
-    public static final int TAG_SHARPNESS =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA40A);
-    public static final int TAG_DEVICE_SETTING_DESCRIPTION =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA40B);
-    public static final int TAG_SUBJECT_DISTANCE_RANGE =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA40C);
-    public static final int TAG_IMAGE_UNIQUE_ID =
-        defineTag(IfdId.TYPE_IFD_EXIF, (short) 0xA420);
-    // IFD GPS tags
-    public static final int TAG_GPS_VERSION_ID =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 0);
-    public static final int TAG_GPS_LATITUDE_REF =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 1);
-    public static final int TAG_GPS_LATITUDE =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 2);
-    public static final int TAG_GPS_LONGITUDE_REF =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 3);
-    public static final int TAG_GPS_LONGITUDE =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 4);
-    public static final int TAG_GPS_ALTITUDE_REF =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 5);
-    public static final int TAG_GPS_ALTITUDE =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 6);
-    public static final int TAG_GPS_TIME_STAMP =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 7);
-    public static final int TAG_GPS_SATTELLITES =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 8);
-    public static final int TAG_GPS_STATUS =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 9);
-    public static final int TAG_GPS_MEASURE_MODE =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 10);
-    public static final int TAG_GPS_DOP =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 11);
-    public static final int TAG_GPS_SPEED_REF =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 12);
-    public static final int TAG_GPS_SPEED =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 13);
-    public static final int TAG_GPS_TRACK_REF =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 14);
-    public static final int TAG_GPS_TRACK =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 15);
-    public static final int TAG_GPS_IMG_DIRECTION_REF =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 16);
-    public static final int TAG_GPS_IMG_DIRECTION =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 17);
-    public static final int TAG_GPS_MAP_DATUM =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 18);
-    public static final int TAG_GPS_DEST_LATITUDE_REF =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 19);
-    public static final int TAG_GPS_DEST_LATITUDE =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 20);
-    public static final int TAG_GPS_DEST_LONGITUDE_REF =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 21);
-    public static final int TAG_GPS_DEST_LONGITUDE =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 22);
-    public static final int TAG_GPS_DEST_BEARING_REF =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 23);
-    public static final int TAG_GPS_DEST_BEARING =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 24);
-    public static final int TAG_GPS_DEST_DISTANCE_REF =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 25);
-    public static final int TAG_GPS_DEST_DISTANCE =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 26);
-    public static final int TAG_GPS_PROCESSING_METHOD =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 27);
-    public static final int TAG_GPS_AREA_INFORMATION =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 28);
-    public static final int TAG_GPS_DATE_STAMP =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 29);
-    public static final int TAG_GPS_DIFFERENTIAL =
-        defineTag(IfdId.TYPE_IFD_GPS, (short) 30);
-    // IFD Interoperability tags
-    public static final int TAG_INTEROPERABILITY_INDEX =
-        defineTag(IfdId.TYPE_IFD_INTEROPERABILITY, (short) 1);
-
-    /**
-     * Tags that contain offset markers. These are included in the banned
-     * defines.
-     */
-    private static final HashSet<Short> sOffsetTags = new HashSet<Short>();
-    static {
-        sOffsetTags.add(getTrueTagKey(TAG_GPS_IFD));
-        sOffsetTags.add(getTrueTagKey(TAG_EXIF_IFD));
-        sOffsetTags.add(getTrueTagKey(TAG_JPEG_INTERCHANGE_FORMAT));
-        sOffsetTags.add(getTrueTagKey(TAG_INTEROPERABILITY_IFD));
-        sOffsetTags.add(getTrueTagKey(TAG_STRIP_OFFSETS));
-    }
-
-    /**
-     * Tags with definitions that cannot be overridden (banned defines).
-     */
-    protected static HashSet<Short> sBannedDefines = new HashSet<Short>(sOffsetTags);
-    static {
-        sBannedDefines.add(getTrueTagKey(TAG_NULL));
-        sBannedDefines.add(getTrueTagKey(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH));
-        sBannedDefines.add(getTrueTagKey(TAG_STRIP_BYTE_COUNTS));
-    }
-
-    /**
-     * Returns the constant representing a tag with a given TID and default IFD.
-     */
-    public static int defineTag(int ifdId, short tagId) {
-        return (tagId & 0x0000ffff) | (ifdId << 16);
-    }
-
-    /**
-     * Returns the TID for a tag constant.
-     */
-    public static short getTrueTagKey(int tag) {
-        // Truncate
-        return (short) tag;
-    }
-
-    /**
-     * Returns the default IFD for a tag constant.
-     */
-    public static int getTrueIfd(int tag) {
-        return tag >>> 16;
-    }
-
-    /**
-     * Constants for {@link TAG_ORIENTATION}. They can be interpreted as
-     * follows:
-     * <ul>
-     * <li>TOP_LEFT is the normal orientation.</li>
-     * <li>TOP_RIGHT is a left-right mirror.</li>
-     * <li>BOTTOM_LEFT is a 180 degree rotation.</li>
-     * <li>BOTTOM_RIGHT is a top-bottom mirror.</li>
-     * <li>LEFT_TOP is mirrored about the top-left<->bottom-right axis.</li>
-     * <li>RIGHT_TOP is a 90 degree clockwise rotation.</li>
-     * <li>LEFT_BOTTOM is mirrored about the top-right<->bottom-left axis.</li>
-     * <li>RIGHT_BOTTOM is a 270 degree clockwise rotation.</li>
-     * </ul>
-     */
-    public interface Orientation {
-        short TOP_LEFT = 1;
-        short TOP_RIGHT = 2;
-        short BOTTOM_LEFT = 3;
-        short BOTTOM_RIGHT = 4;
-        short LEFT_TOP = 5;
-        short RIGHT_TOP = 6;
-        short LEFT_BOTTOM = 7;
-        short RIGHT_BOTTOM = 8;
-    }
-
-    /**
-     * Constants for {@link TAG_Y_CB_CR_POSITIONING}
-     */
-    public interface YCbCrPositioning {
-        short CENTERED = 1;
-        short CO_SITED = 2;
-    }
-
-    /**
-     * Constants for {@link TAG_COMPRESSION}
-     */
-    public interface Compression {
-        short UNCOMPRESSION = 1;
-        short JPEG = 6;
-    }
-
-    /**
-     * Constants for {@link TAG_RESOLUTION_UNIT}
-     */
-    public interface ResolutionUnit {
-        short INCHES = 2;
-        short CENTIMETERS = 3;
-    }
-
-    /**
-     * Constants for {@link TAG_PHOTOMETRIC_INTERPRETATION}
-     */
-    public interface PhotometricInterpretation {
-        short RGB = 2;
-        short YCBCR = 6;
-    }
-
-    /**
-     * Constants for {@link TAG_PLANAR_CONFIGURATION}
-     */
-    public interface PlanarConfiguration {
-        short CHUNKY = 1;
-        short PLANAR = 2;
-    }
-
-    /**
-     * Constants for {@link TAG_EXPOSURE_PROGRAM}
-     */
-    public interface ExposureProgram {
-        short NOT_DEFINED = 0;
-        short MANUAL = 1;
-        short NORMAL_PROGRAM = 2;
-        short APERTURE_PRIORITY = 3;
-        short SHUTTER_PRIORITY = 4;
-        short CREATIVE_PROGRAM = 5;
-        short ACTION_PROGRAM = 6;
-        short PROTRAIT_MODE = 7;
-        short LANDSCAPE_MODE = 8;
-    }
-
-    /**
-     * Constants for {@link TAG_METERING_MODE}
-     */
-    public interface MeteringMode {
-        short UNKNOWN = 0;
-        short AVERAGE = 1;
-        short CENTER_WEIGHTED_AVERAGE = 2;
-        short SPOT = 3;
-        short MULTISPOT = 4;
-        short PATTERN = 5;
-        short PARTAIL = 6;
-        short OTHER = 255;
-    }
-
-    /**
-     * Constants for {@link TAG_FLASH} As the definition in Jeita EXIF 2.2
-     * standard, we can treat this constant as bitwise flag.
-     * <p>
-     * e.g.
-     * <p>
-     * short flash = FIRED | RETURN_STROBE_RETURN_LIGHT_DETECTED |
-     * MODE_AUTO_MODE
-     */
-    public interface Flash {
-        // LSB
-        short DID_NOT_FIRED = 0;
-        short FIRED = 1;
-        // 1st~2nd bits
-        short RETURN_NO_STROBE_RETURN_DETECTION_FUNCTION = 0 << 1;
-        short RETURN_STROBE_RETURN_LIGHT_NOT_DETECTED = 2 << 1;
-        short RETURN_STROBE_RETURN_LIGHT_DETECTED = 3 << 1;
-        // 3rd~4th bits
-        short MODE_UNKNOWN = 0 << 3;
-        short MODE_COMPULSORY_FLASH_FIRING = 1 << 3;
-        short MODE_COMPULSORY_FLASH_SUPPRESSION = 2 << 3;
-        short MODE_AUTO_MODE = 3 << 3;
-        // 5th bit
-        short FUNCTION_PRESENT = 0 << 5;
-        short FUNCTION_NO_FUNCTION = 1 << 5;
-        // 6th bit
-        short RED_EYE_REDUCTION_NO_OR_UNKNOWN = 0 << 6;
-        short RED_EYE_REDUCTION_SUPPORT = 1 << 6;
-    }
-
-    /**
-     * Constants for {@link TAG_COLOR_SPACE}
-     */
-    public interface ColorSpace {
-        short SRGB = 1;
-        short UNCALIBRATED = (short) 0xFFFF;
-    }
-
-    /**
-     * Constants for {@link TAG_EXPOSURE_MODE}
-     */
-    public interface ExposureMode {
-        short AUTO_EXPOSURE = 0;
-        short MANUAL_EXPOSURE = 1;
-        short AUTO_BRACKET = 2;
-    }
-
-    /**
-     * Constants for {@link TAG_WHITE_BALANCE}
-     */
-    public interface WhiteBalance {
-        short AUTO = 0;
-        short MANUAL = 1;
-    }
-
-    /**
-     * Constants for {@link TAG_SCENE_CAPTURE_TYPE}
-     */
-    public interface SceneCapture {
-        short STANDARD = 0;
-        short LANDSCAPE = 1;
-        short PROTRAIT = 2;
-        short NIGHT_SCENE = 3;
-    }
-
-    /**
-     * Constants for {@link TAG_COMPONENTS_CONFIGURATION}
-     */
-    public interface ComponentsConfiguration {
-        short NOT_EXIST = 0;
-        short Y = 1;
-        short CB = 2;
-        short CR = 3;
-        short R = 4;
-        short G = 5;
-        short B = 6;
-    }
-
-    /**
-     * Constants for {@link TAG_LIGHT_SOURCE}
-     */
-    public interface LightSource {
-        short UNKNOWN = 0;
-        short DAYLIGHT = 1;
-        short FLUORESCENT = 2;
-        short TUNGSTEN = 3;
-        short FLASH = 4;
-        short FINE_WEATHER = 9;
-        short CLOUDY_WEATHER = 10;
-        short SHADE = 11;
-        short DAYLIGHT_FLUORESCENT = 12;
-        short DAY_WHITE_FLUORESCENT = 13;
-        short COOL_WHITE_FLUORESCENT = 14;
-        short WHITE_FLUORESCENT = 15;
-        short STANDARD_LIGHT_A = 17;
-        short STANDARD_LIGHT_B = 18;
-        short STANDARD_LIGHT_C = 19;
-        short D55 = 20;
-        short D65 = 21;
-        short D75 = 22;
-        short D50 = 23;
-        short ISO_STUDIO_TUNGSTEN = 24;
-        short OTHER = 255;
-    }
-
-    /**
-     * Constants for {@link TAG_SENSING_METHOD}
-     */
-    public interface SensingMethod {
-        short NOT_DEFINED = 1;
-        short ONE_CHIP_COLOR = 2;
-        short TWO_CHIP_COLOR = 3;
-        short THREE_CHIP_COLOR = 4;
-        short COLOR_SEQUENTIAL_AREA = 5;
-        short TRILINEAR = 7;
-        short COLOR_SEQUENTIAL_LINEAR = 8;
-    }
-
-    /**
-     * Constants for {@link TAG_FILE_SOURCE}
-     */
-    public interface FileSource {
-        short DSC = 3;
-    }
-
-    /**
-     * Constants for {@link TAG_SCENE_TYPE}
-     */
-    public interface SceneType {
-        short DIRECT_PHOTOGRAPHED = 1;
-    }
-
-    /**
-     * Constants for {@link TAG_GAIN_CONTROL}
-     */
-    public interface GainControl {
-        short NONE = 0;
-        short LOW_UP = 1;
-        short HIGH_UP = 2;
-        short LOW_DOWN = 3;
-        short HIGH_DOWN = 4;
-    }
-
-    /**
-     * Constants for {@link TAG_CONTRAST}
-     */
-    public interface Contrast {
-        short NORMAL = 0;
-        short SOFT = 1;
-        short HARD = 2;
-    }
-
-    /**
-     * Constants for {@link TAG_SATURATION}
-     */
-    public interface Saturation {
-        short NORMAL = 0;
-        short LOW = 1;
-        short HIGH = 2;
-    }
-
-    /**
-     * Constants for {@link TAG_SHARPNESS}
-     */
-    public interface Sharpness {
-        short NORMAL = 0;
-        short SOFT = 1;
-        short HARD = 2;
-    }
-
-    /**
-     * Constants for {@link TAG_SUBJECT_DISTANCE}
-     */
-    public interface SubjectDistance {
-        short UNKNOWN = 0;
-        short MACRO = 1;
-        short CLOSE_VIEW = 2;
-        short DISTANT_VIEW = 3;
-    }
-
-    /**
-     * Constants for {@link TAG_GPS_LATITUDE_REF},
-     * {@link TAG_GPS_DEST_LATITUDE_REF}
-     */
-    public interface GpsLatitudeRef {
-        String NORTH = "N";
-        String SOUTH = "S";
-    }
-
-    /**
-     * Constants for {@link TAG_GPS_LONGITUDE_REF},
-     * {@link TAG_GPS_DEST_LONGITUDE_REF}
-     */
-    public interface GpsLongitudeRef {
-        String EAST = "E";
-        String WEST = "W";
-    }
-
-    /**
-     * Constants for {@link TAG_GPS_ALTITUDE_REF}
-     */
-    public interface GpsAltitudeRef {
-        short SEA_LEVEL = 0;
-        short SEA_LEVEL_NEGATIVE = 1;
-    }
-
-    /**
-     * Constants for {@link TAG_GPS_STATUS}
-     */
-    public interface GpsStatus {
-        String IN_PROGRESS = "A";
-        String INTEROPERABILITY = "V";
-    }
-
-    /**
-     * Constants for {@link TAG_GPS_MEASURE_MODE}
-     */
-    public interface GpsMeasureMode {
-        String MODE_2_DIMENSIONAL = "2";
-        String MODE_3_DIMENSIONAL = "3";
-    }
-
-    /**
-     * Constants for {@link TAG_GPS_SPEED_REF},
-     * {@link TAG_GPS_DEST_DISTANCE_REF}
-     */
-    public interface GpsSpeedRef {
-        String KILOMETERS = "K";
-        String MILES = "M";
-        String KNOTS = "N";
-    }
-
-    /**
-     * Constants for {@link TAG_GPS_TRACK_REF},
-     * {@link TAG_GPS_IMG_DIRECTION_REF}, {@link TAG_GPS_DEST_BEARING_REF}
-     */
-    public interface GpsTrackRef {
-        String TRUE_DIRECTION = "T";
-        String MAGNETIC_DIRECTION = "M";
-    }
-
-    /**
-     * Constants for {@link TAG_GPS_DIFFERENTIAL}
-     */
-    public interface GpsDifferential {
-        short WITHOUT_DIFFERENTIAL_CORRECTION = 0;
-        short DIFFERENTIAL_CORRECTION_APPLIED = 1;
-    }
-
-    private static final String NULL_ARGUMENT_STRING = "Argument is null";
-    private ExifData mData = new ExifData(DEFAULT_BYTE_ORDER);
-    public static final ByteOrder DEFAULT_BYTE_ORDER = ByteOrder.BIG_ENDIAN;
-
-    public ExifInterface() {
-        mGPSDateStampFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
-
-    /**
-     * Reads the exif tags from a byte array, clearing this ExifInterface
-     * object's existing exif tags.
-     *
-     * @param jpeg a byte array containing a jpeg compressed image.
-     * @throws IOException
-     */
-    public void readExif(byte[] jpeg) throws IOException {
-        readExif(new ByteArrayInputStream(jpeg));
-    }
-
-    /**
-     * Reads the exif tags from an InputStream, clearing this ExifInterface
-     * object's existing exif tags.
-     *
-     * @param inStream an InputStream containing a jpeg compressed image.
-     * @throws IOException
-     */
-    public void readExif(InputStream inStream) throws IOException {
-        if (inStream == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        ExifData d = null;
-        try {
-            d = new ExifReader(this).read(inStream);
-        } catch (ExifInvalidFormatException e) {
-            throw new IOException("Invalid exif format : " + e);
-        }
-        mData = d;
-    }
-
-    /**
-     * Reads the exif tags from a file, clearing this ExifInterface object's
-     * existing exif tags.
-     *
-     * @param inFileName a string representing the filepath to jpeg file.
-     * @throws FileNotFoundException
-     * @throws IOException
-     */
-    public void readExif(String inFileName) throws FileNotFoundException, IOException {
-        if (inFileName == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        InputStream is = null;
-        try {
-            is = new BufferedInputStream(new FileInputStream(inFileName));
-            readExif(is);
-        } catch (IOException e) {
-            closeSilently(is);
-            throw e;
-        }
-        is.close();
-    }
-
-    /**
-     * Sets the exif tags, clearing this ExifInterface object's existing exif
-     * tags.
-     *
-     * @param tags a collection of exif tags to set.
-     */
-    public void setExif(Collection<ExifTag> tags) {
-        clearExif();
-        setTags(tags);
-    }
-
-    /**
-     * Clears this ExifInterface object's existing exif tags.
-     */
-    public void clearExif() {
-        mData = new ExifData(DEFAULT_BYTE_ORDER);
-    }
-
-    /**
-     * Writes the tags from this ExifInterface object into a jpeg image,
-     * removing prior exif tags.
-     *
-     * @param jpeg a byte array containing a jpeg compressed image.
-     * @param exifOutStream an OutputStream to which the jpeg image with added
-     *            exif tags will be written.
-     * @throws IOException
-     */
-    public void writeExif(byte[] jpeg, OutputStream exifOutStream) throws IOException {
-        if (jpeg == null || exifOutStream == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        OutputStream s = getExifWriterStream(exifOutStream);
-        s.write(jpeg, 0, jpeg.length);
-        s.flush();
-    }
-
-    /**
-     * Writes the tags from this ExifInterface object into a jpeg compressed
-     * bitmap, removing prior exif tags.
-     *
-     * @param bmap a bitmap to compress and write exif into.
-     * @param exifOutStream the OutputStream to which the jpeg image with added
-     *            exif tags will be written.
-     * @throws IOException
-     */
-    public void writeExif(Bitmap bmap, OutputStream exifOutStream) throws IOException {
-        if (bmap == null || exifOutStream == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        OutputStream s = getExifWriterStream(exifOutStream);
-        bmap.compress(Bitmap.CompressFormat.JPEG, 90, s);
-        s.flush();
-    }
-
-    public void writeExif(Bitmap bmap, OutputStream exifOutStream, int quality) throws IOException {
-        if (bmap == null || exifOutStream == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        OutputStream s = getExifWriterStream(exifOutStream);
-        bmap.compress(Bitmap.CompressFormat.JPEG, quality, s);
-        s.flush();
-    }
-
-    /**
-     * Writes the tags from this ExifInterface object into a jpeg stream,
-     * removing prior exif tags.
-     *
-     * @param jpegStream an InputStream containing a jpeg compressed image.
-     * @param exifOutStream an OutputStream to which the jpeg image with added
-     *            exif tags will be written.
-     * @throws IOException
-     */
-    public void writeExif(InputStream jpegStream, OutputStream exifOutStream) throws IOException {
-        if (jpegStream == null || exifOutStream == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        OutputStream s = getExifWriterStream(exifOutStream);
-        doExifStreamIO(jpegStream, s);
-        s.flush();
-    }
-
-    /**
-     * Writes the tags from this ExifInterface object into a jpeg image,
-     * removing prior exif tags.
-     *
-     * @param jpeg a byte array containing a jpeg compressed image.
-     * @param exifOutFileName a String containing the filepath to which the jpeg
-     *            image with added exif tags will be written.
-     * @throws FileNotFoundException
-     * @throws IOException
-     */
-    public void writeExif(byte[] jpeg, String exifOutFileName) throws FileNotFoundException,
-            IOException {
-        if (jpeg == null || exifOutFileName == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        OutputStream s = null;
-        try {
-            s = getExifWriterStream(exifOutFileName);
-            s.write(jpeg, 0, jpeg.length);
-            s.flush();
-        } catch (IOException e) {
-            closeSilently(s);
-            throw e;
-        }
-        s.close();
-    }
-
-    /**
-     * Writes the tags from this ExifInterface object into a jpeg compressed
-     * bitmap, removing prior exif tags.
-     *
-     * @param bmap a bitmap to compress and write exif into.
-     * @param exifOutFileName a String containing the filepath to which the jpeg
-     *            image with added exif tags will be written.
-     * @throws FileNotFoundException
-     * @throws IOException
-     */
-    public void writeExif(Bitmap bmap, String exifOutFileName) throws FileNotFoundException,
-            IOException {
-        if (bmap == null || exifOutFileName == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        OutputStream s = null;
-        try {
-            s = getExifWriterStream(exifOutFileName);
-            bmap.compress(Bitmap.CompressFormat.JPEG, 90, s);
-            s.flush();
-        } catch (IOException e) {
-            closeSilently(s);
-            throw e;
-        }
-        s.close();
-    }
-
-    /**
-     * Writes the tags from this ExifInterface object into a jpeg stream,
-     * removing prior exif tags.
-     *
-     * @param jpegStream an InputStream containing a jpeg compressed image.
-     * @param exifOutFileName a String containing the filepath to which the jpeg
-     *            image with added exif tags will be written.
-     * @throws FileNotFoundException
-     * @throws IOException
-     */
-    public void writeExif(InputStream jpegStream, String exifOutFileName)
-            throws FileNotFoundException, IOException {
-        if (jpegStream == null || exifOutFileName == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        OutputStream s = null;
-        try {
-            s = getExifWriterStream(exifOutFileName);
-            doExifStreamIO(jpegStream, s);
-            s.flush();
-        } catch (IOException e) {
-            closeSilently(s);
-            throw e;
-        }
-        s.close();
-    }
-
-    /**
-     * Writes the tags from this ExifInterface object into a jpeg file, removing
-     * prior exif tags.
-     *
-     * @param jpegFileName a String containing the filepath for a jpeg file.
-     * @param exifOutFileName a String containing the filepath to which the jpeg
-     *            image with added exif tags will be written.
-     * @throws FileNotFoundException
-     * @throws IOException
-     */
-    public void writeExif(String jpegFileName, String exifOutFileName)
-            throws FileNotFoundException, IOException {
-        if (jpegFileName == null || exifOutFileName == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        InputStream is = null;
-        try {
-            is = new FileInputStream(jpegFileName);
-            writeExif(is, exifOutFileName);
-        } catch (IOException e) {
-            closeSilently(is);
-            throw e;
-        }
-        is.close();
-    }
-
-    /**
-     * Wraps an OutputStream object with an ExifOutputStream. Exif tags in this
-     * ExifInterface object will be added to a jpeg image written to this
-     * stream, removing prior exif tags. Other methods of this ExifInterface
-     * object should not be called until the returned OutputStream has been
-     * closed.
-     *
-     * @param outStream an OutputStream to wrap.
-     * @return an OutputStream that wraps the outStream parameter, and adds exif
-     *         metadata. A jpeg image should be written to this stream.
-     */
-    public OutputStream getExifWriterStream(OutputStream outStream) {
-        if (outStream == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        ExifOutputStream eos = new ExifOutputStream(outStream, this);
-        eos.setExifData(mData);
-        return eos;
-    }
-
-    /**
-     * Returns an OutputStream object that writes to a file. Exif tags in this
-     * ExifInterface object will be added to a jpeg image written to this
-     * stream, removing prior exif tags. Other methods of this ExifInterface
-     * object should not be called until the returned OutputStream has been
-     * closed.
-     *
-     * @param exifOutFileName an String containing a filepath for a jpeg file.
-     * @return an OutputStream that writes to the exifOutFileName file, and adds
-     *         exif metadata. A jpeg image should be written to this stream.
-     * @throws FileNotFoundException
-     */
-    public OutputStream getExifWriterStream(String exifOutFileName) throws FileNotFoundException {
-        if (exifOutFileName == null) {
-            throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
-        }
-        OutputStream out = null;
-        try {
-            out = new FileOutputStream(exifOutFileName);
-        } catch (FileNotFoundException e) {
-            closeSilently(out);
-            throw e;
-        }
-        return getExifWriterStream(out);
-    }
-
-    /**
-     * Attempts to do an in-place rewrite the exif metadata in a file for the
-     * given tags. If tags do not exist or do not have the same size as the
-     * existing exif tags, this method will fail.
-     *
-     * @param filename a String containing a filepath for a jpeg file with exif
-     *            tags to rewrite.
-     * @param tags tags that will be written into the jpeg file over existing
-     *            tags if possible.
-     * @return true if success, false if could not overwrite. If false, no
-     *         changes are made to the file.
-     * @throws FileNotFoundException
-     * @throws IOException
-     */
-    public boolean rewriteExif(String filename, Collection<ExifTag> tags)
-            throws FileNotFoundException, IOException {
-        RandomAccessFile file = null;
-        InputStream is = null;
-        boolean ret;
-        try {
-            File temp = new File(filename);
-            is = new BufferedInputStream(new FileInputStream(temp));
-
-            // Parse beginning of APP1 in exif to find size of exif header.
-            ExifParser parser = null;
-            try {
-                parser = ExifParser.parse(is, this);
-            } catch (ExifInvalidFormatException e) {
-                throw new IOException("Invalid exif format : ", e);
-            }
-            long exifSize = parser.getOffsetToExifEndFromSOF();
-
-            // Free up resources
-            is.close();
-            is = null;
-
-            // Open file for memory mapping.
-            file = new RandomAccessFile(temp, "rw");
-            long fileLength = file.length();
-            if (fileLength < exifSize) {
-                throw new IOException("Filesize changed during operation");
-            }
-
-            // Map only exif header into memory.
-            ByteBuffer buf = file.getChannel().map(MapMode.READ_WRITE, 0, exifSize);
-
-            // Attempt to overwrite tag values without changing lengths (avoids
-            // file copy).
-            ret = rewriteExif(buf, tags);
-        } catch (IOException e) {
-            closeSilently(file);
-            throw e;
-        } finally {
-            closeSilently(is);
-        }
-        file.close();
-        return ret;
-    }
-
-    /**
-     * Attempts to do an in-place rewrite the exif metadata in a ByteBuffer for
-     * the given tags. If tags do not exist or do not have the same size as the
-     * existing exif tags, this method will fail.
-     *
-     * @param buf a ByteBuffer containing a jpeg file with existing exif tags to
-     *            rewrite.
-     * @param tags tags that will be written into the jpeg ByteBuffer over
-     *            existing tags if possible.
-     * @return true if success, false if could not overwrite. If false, no
-     *         changes are made to the ByteBuffer.
-     * @throws IOException
-     */
-    public boolean rewriteExif(ByteBuffer buf, Collection<ExifTag> tags) throws IOException {
-        ExifModifier mod = null;
-        try {
-            mod = new ExifModifier(buf, this);
-            for (ExifTag t : tags) {
-                mod.modifyTag(t);
-            }
-            return mod.commit();
-        } catch (ExifInvalidFormatException e) {
-            throw new IOException("Invalid exif format : " + e);
-        }
-    }
-
-    /**
-     * Attempts to do an in-place rewrite of the exif metadata. If this fails,
-     * fall back to overwriting file. This preserves tags that are not being
-     * rewritten.
-     *
-     * @param filename a String containing a filepath for a jpeg file.
-     * @param tags tags that will be written into the jpeg file over existing
-     *            tags if possible.
-     * @throws FileNotFoundException
-     * @throws IOException
-     * @see #rewriteExif
-     */
-    public void forceRewriteExif(String filename, Collection<ExifTag> tags)
-            throws FileNotFoundException,
-            IOException {
-        // Attempt in-place write
-        if (!rewriteExif(filename, tags)) {
-            // Fall back to doing a copy
-            ExifData tempData = mData;
-            mData = new ExifData(DEFAULT_BYTE_ORDER);
-            FileInputStream is = null;
-            ByteArrayOutputStream bytes = null;
-            try {
-                is = new FileInputStream(filename);
-                bytes = new ByteArrayOutputStream();
-                doExifStreamIO(is, bytes);
-                byte[] imageBytes = bytes.toByteArray();
-                readExif(imageBytes);
-                setTags(tags);
-                writeExif(imageBytes, filename);
-            } catch (IOException e) {
-                closeSilently(is);
-                throw e;
-            } finally {
-                is.close();
-                // Prevent clobbering of mData
-                mData = tempData;
-            }
-        }
-    }
-
-    /**
-     * Attempts to do an in-place rewrite of the exif metadata using the tags in
-     * this ExifInterface object. If this fails, fall back to overwriting file.
-     * This preserves tags that are not being rewritten.
-     *
-     * @param filename a String containing a filepath for a jpeg file.
-     * @throws FileNotFoundException
-     * @throws IOException
-     * @see #rewriteExif
-     */
-    public void forceRewriteExif(String filename) throws FileNotFoundException, IOException {
-        forceRewriteExif(filename, getAllTags());
-    }
-
-    /**
-     * Get the exif tags in this ExifInterface object or null if none exist.
-     *
-     * @return a List of {@link ExifTag}s.
-     */
-    public List<ExifTag> getAllTags() {
-        return mData.getAllTags();
-    }
-
-    /**
-     * Returns a list of ExifTags that share a TID (which can be obtained by
-     * calling {@link #getTrueTagKey} on a defined tag constant) or null if none
-     * exist.
-     *
-     * @param tagId a TID as defined in the exif standard (or with
-     *            {@link #defineTag}).
-     * @return a List of {@link ExifTag}s.
-     */
-    public List<ExifTag> getTagsForTagId(short tagId) {
-        return mData.getAllTagsForTagId(tagId);
-    }
-
-    /**
-     * Returns a list of ExifTags that share an IFD (which can be obtained by
-     * calling {@link #getTrueIFD} on a defined tag constant) or null if none
-     * exist.
-     *
-     * @param ifdId an IFD as defined in the exif standard (or with
-     *            {@link #defineTag}).
-     * @return a List of {@link ExifTag}s.
-     */
-    public List<ExifTag> getTagsForIfdId(int ifdId) {
-        return mData.getAllTagsForIfd(ifdId);
-    }
-
-    /**
-     * Gets an ExifTag for an IFD other than the tag's default.
-     *
-     * @see #getTag
-     */
-    public ExifTag getTag(int tagId, int ifdId) {
-        if (!ExifTag.isValidIfd(ifdId)) {
-            return null;
-        }
-        return mData.getTag(getTrueTagKey(tagId), ifdId);
-    }
-
-    /**
-     * Returns the ExifTag in that tag's default IFD for a defined tag constant
-     * or null if none exists.
-     *
-     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @return an {@link ExifTag} or null if none exists.
-     */
-    public ExifTag getTag(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTag(tagId, ifdId);
-    }
-
-    /**
-     * Gets a tag value for an IFD other than the tag's default.
-     *
-     * @see #getTagValue
-     */
-    public Object getTagValue(int tagId, int ifdId) {
-        ExifTag t = getTag(tagId, ifdId);
-        return (t == null) ? null : t.getValue();
-    }
-
-    /**
-     * Returns the value of the ExifTag in that tag's default IFD for a defined
-     * tag constant or null if none exists or the value could not be cast into
-     * the return type.
-     *
-     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @return the value of the ExifTag or null if none exists.
-     */
-    public Object getTagValue(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTagValue(tagId, ifdId);
-    }
-
-    /*
-     * Getter methods that are similar to getTagValue. Null is returned if the
-     * tag value cannot be cast into the return type.
-     */
-
-    /**
-     * @see #getTagValue
-     */
-    public String getTagStringValue(int tagId, int ifdId) {
-        ExifTag t = getTag(tagId, ifdId);
-        if (t == null) {
-            return null;
-        }
-        return t.getValueAsString();
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public String getTagStringValue(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTagStringValue(tagId, ifdId);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public Long getTagLongValue(int tagId, int ifdId) {
-        long[] l = getTagLongValues(tagId, ifdId);
-        if (l == null || l.length <= 0) {
-            return null;
-        }
-        return new Long(l[0]);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public Long getTagLongValue(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTagLongValue(tagId, ifdId);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public Integer getTagIntValue(int tagId, int ifdId) {
-        int[] l = getTagIntValues(tagId, ifdId);
-        if (l == null || l.length <= 0) {
-            return null;
-        }
-        return new Integer(l[0]);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public Integer getTagIntValue(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTagIntValue(tagId, ifdId);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public Byte getTagByteValue(int tagId, int ifdId) {
-        byte[] l = getTagByteValues(tagId, ifdId);
-        if (l == null || l.length <= 0) {
-            return null;
-        }
-        return new Byte(l[0]);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public Byte getTagByteValue(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTagByteValue(tagId, ifdId);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public Rational getTagRationalValue(int tagId, int ifdId) {
-        Rational[] l = getTagRationalValues(tagId, ifdId);
-        if (l == null || l.length == 0) {
-            return null;
-        }
-        return new Rational(l[0]);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public Rational getTagRationalValue(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTagRationalValue(tagId, ifdId);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public long[] getTagLongValues(int tagId, int ifdId) {
-        ExifTag t = getTag(tagId, ifdId);
-        if (t == null) {
-            return null;
-        }
-        return t.getValueAsLongs();
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public long[] getTagLongValues(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTagLongValues(tagId, ifdId);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public int[] getTagIntValues(int tagId, int ifdId) {
-        ExifTag t = getTag(tagId, ifdId);
-        if (t == null) {
-            return null;
-        }
-        return t.getValueAsInts();
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public int[] getTagIntValues(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTagIntValues(tagId, ifdId);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public byte[] getTagByteValues(int tagId, int ifdId) {
-        ExifTag t = getTag(tagId, ifdId);
-        if (t == null) {
-            return null;
-        }
-        return t.getValueAsBytes();
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public byte[] getTagByteValues(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTagByteValues(tagId, ifdId);
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public Rational[] getTagRationalValues(int tagId, int ifdId) {
-        ExifTag t = getTag(tagId, ifdId);
-        if (t == null) {
-            return null;
-        }
-        return t.getValueAsRationals();
-    }
-
-    /**
-     * @see #getTagValue
-     */
-    public Rational[] getTagRationalValues(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return getTagRationalValues(tagId, ifdId);
-    }
-
-    /**
-     * Checks whether a tag has a defined number of elements.
-     *
-     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @return true if the tag has a defined number of elements.
-     */
-    public boolean isTagCountDefined(int tagId) {
-        int info = getTagInfo().get(tagId);
-        // No value in info can be zero, as all tags have a non-zero type
-        if (info == 0) {
-            return false;
-        }
-        return getComponentCountFromInfo(info) != ExifTag.SIZE_UNDEFINED;
-    }
-
-    /**
-     * Gets the defined number of elements for a tag.
-     *
-     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @return the number of elements or {@link ExifTag#SIZE_UNDEFINED} if the
-     *         tag or the number of elements is not defined.
-     */
-    public int getDefinedTagCount(int tagId) {
-        int info = getTagInfo().get(tagId);
-        if (info == 0) {
-            return ExifTag.SIZE_UNDEFINED;
-        }
-        return getComponentCountFromInfo(info);
-    }
-
-    /**
-     * Gets the number of elements for an ExifTag in a given IFD.
-     *
-     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @param ifdId the IFD containing the ExifTag to check.
-     * @return the number of elements in the ExifTag, if the tag's size is
-     *         undefined this will return the actual number of elements that is
-     *         in the ExifTag's value.
-     */
-    public int getActualTagCount(int tagId, int ifdId) {
-        ExifTag t = getTag(tagId, ifdId);
-        if (t == null) {
-            return 0;
-        }
-        return t.getComponentCount();
-    }
-
-    /**
-     * Gets the default IFD for a tag.
-     *
-     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @return the default IFD for a tag definition or {@link #IFD_NULL} if no
-     *         definition exists.
-     */
-    public int getDefinedTagDefaultIfd(int tagId) {
-        int info = getTagInfo().get(tagId);
-        if (info == DEFINITION_NULL) {
-            return IFD_NULL;
-        }
-        return getTrueIfd(tagId);
-    }
-
-    /**
-     * Gets the defined type for a tag.
-     *
-     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @return the type.
-     * @see ExifTag#getDataType()
-     */
-    public short getDefinedTagType(int tagId) {
-        int info = getTagInfo().get(tagId);
-        if (info == 0) {
-            return -1;
-        }
-        return getTypeFromInfo(info);
-    }
-
-    /**
-     * Returns true if tag TID is one of the following: {@link TAG_EXIF_IFD},
-     * {@link TAG_GPS_IFD}, {@link TAG_JPEG_INTERCHANGE_FORMAT},
-     * {@link TAG_STRIP_OFFSETS}, {@link TAG_INTEROPERABILITY_IFD}
-     * <p>
-     * Note: defining tags with these TID's is disallowed.
-     *
-     * @param tag a tag's TID (can be obtained from a defined tag constant with
-     *            {@link #getTrueTagKey}).
-     * @return true if the TID is that of an offset tag.
-     */
-    protected static boolean isOffsetTag(short tag) {
-        return sOffsetTags.contains(tag);
-    }
-
-    /**
-     * Creates a tag for a defined tag constant in a given IFD if that IFD is
-     * allowed for the tag.  This method will fail anytime the appropriate
-     * {@link ExifTag#setValue} for this tag's datatype would fail.
-     *
-     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @param ifdId the IFD that the tag should be in.
-     * @param val the value of the tag to set.
-     * @return an ExifTag object or null if one could not be constructed.
-     * @see #buildTag
-     */
-    public ExifTag buildTag(int tagId, int ifdId, Object val) {
-        int info = getTagInfo().get(tagId);
-        if (info == 0 || val == null) {
-            return null;
-        }
-        short type = getTypeFromInfo(info);
-        int definedCount = getComponentCountFromInfo(info);
-        boolean hasDefinedCount = (definedCount != ExifTag.SIZE_UNDEFINED);
-        if (!ExifInterface.isIfdAllowed(info, ifdId)) {
-            return null;
-        }
-        ExifTag t = new ExifTag(getTrueTagKey(tagId), type, definedCount, ifdId, hasDefinedCount);
-        if (!t.setValue(val)) {
-            return null;
-        }
-        return t;
-    }
-
-    /**
-     * Creates a tag for a defined tag constant in the tag's default IFD.
-     *
-     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @param val the tag's value.
-     * @return an ExifTag object.
-     */
-    public ExifTag buildTag(int tagId, Object val) {
-        int ifdId = getTrueIfd(tagId);
-        return buildTag(tagId, ifdId, val);
-    }
-
-    protected ExifTag buildUninitializedTag(int tagId) {
-        int info = getTagInfo().get(tagId);
-        if (info == 0) {
-            return null;
-        }
-        short type = getTypeFromInfo(info);
-        int definedCount = getComponentCountFromInfo(info);
-        boolean hasDefinedCount = (definedCount != ExifTag.SIZE_UNDEFINED);
-        int ifdId = getTrueIfd(tagId);
-        ExifTag t = new ExifTag(getTrueTagKey(tagId), type, definedCount, ifdId, hasDefinedCount);
-        return t;
-    }
-
-    /**
-     * Sets the value of an ExifTag if it exists in the given IFD. The value
-     * must be the correct type and length for that ExifTag.
-     *
-     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @param ifdId the IFD that the ExifTag is in.
-     * @param val the value to set.
-     * @return true if success, false if the ExifTag doesn't exist or the value
-     *         is the wrong type/length.
-     * @see #setTagValue
-     */
-    public boolean setTagValue(int tagId, int ifdId, Object val) {
-        ExifTag t = getTag(tagId, ifdId);
-        if (t == null) {
-            return false;
-        }
-        return t.setValue(val);
-    }
-
-    /**
-     * Sets the value of an ExifTag if it exists it's default IFD. The value
-     * must be the correct type and length for that ExifTag.
-     *
-     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @param val the value to set.
-     * @return true if success, false if the ExifTag doesn't exist or the value
-     *         is the wrong type/length.
-     */
-    public boolean setTagValue(int tagId, Object val) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        return setTagValue(tagId, ifdId, val);
-    }
-
-    /**
-     * Puts an ExifTag into this ExifInterface object's tags, removing a
-     * previous ExifTag with the same TID and IFD. The IFD it is put into will
-     * be the one the tag was created with in {@link #buildTag}.
-     *
-     * @param tag an ExifTag to put into this ExifInterface's tags.
-     * @return the previous ExifTag with the same TID and IFD or null if none
-     *         exists.
-     */
-    public ExifTag setTag(ExifTag tag) {
-        return mData.addTag(tag);
-    }
-
-    /**
-     * Puts a collection of ExifTags into this ExifInterface objects's tags. Any
-     * previous ExifTags with the same TID and IFDs will be removed.
-     *
-     * @param tags a Collection of ExifTags.
-     * @see #setTag
-     */
-    public void setTags(Collection<ExifTag> tags) {
-        for (ExifTag t : tags) {
-            setTag(t);
-        }
-    }
-
-    /**
-     * Removes the ExifTag for a tag constant from the given IFD.
-     *
-     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     * @param ifdId the IFD of the ExifTag to remove.
-     */
-    public void deleteTag(int tagId, int ifdId) {
-        mData.removeTag(getTrueTagKey(tagId), ifdId);
-    }
-
-    /**
-     * Removes the ExifTag for a tag constant from that tag's default IFD.
-     *
-     * @param tagId a tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     */
-    public void deleteTag(int tagId) {
-        int ifdId = getDefinedTagDefaultIfd(tagId);
-        deleteTag(tagId, ifdId);
-    }
-
-    /**
-     * Creates a new tag definition in this ExifInterface object for a given TID
-     * and default IFD. Creating a definition with the same TID and default IFD
-     * as a previous definition will override it.
-     *
-     * @param tagId the TID for the tag.
-     * @param defaultIfd the default IFD for the tag.
-     * @param tagType the type of the tag (see {@link ExifTag#getDataType()}).
-     * @param defaultComponentCount the number of elements of this tag's type in
-     *            the tags value.
-     * @param allowedIfds the IFD's this tag is allowed to be put in.
-     * @return the defined tag constant (e.g. {@link #TAG_IMAGE_WIDTH}) or
-     *         {@link #TAG_NULL} if the definition could not be made.
-     */
-    public int setTagDefinition(short tagId, int defaultIfd, short tagType,
-            short defaultComponentCount, int[] allowedIfds) {
-        if (sBannedDefines.contains(tagId)) {
-            return TAG_NULL;
-        }
-        if (ExifTag.isValidType(tagType) && ExifTag.isValidIfd(defaultIfd)) {
-            int tagDef = defineTag(defaultIfd, tagId);
-            if (tagDef == TAG_NULL) {
-                return TAG_NULL;
-            }
-            int[] otherDefs = getTagDefinitionsForTagId(tagId);
-            SparseIntArray infos = getTagInfo();
-            // Make sure defaultIfd is in allowedIfds
-            boolean defaultCheck = false;
-            for (int i : allowedIfds) {
-                if (defaultIfd == i) {
-                    defaultCheck = true;
-                }
-                if (!ExifTag.isValidIfd(i)) {
-                    return TAG_NULL;
-                }
-            }
-            if (!defaultCheck) {
-                return TAG_NULL;
-            }
-
-            int ifdFlags = getFlagsFromAllowedIfds(allowedIfds);
-            // Make sure no identical tags can exist in allowedIfds
-            if (otherDefs != null) {
-                for (int def : otherDefs) {
-                    int tagInfo = infos.get(def);
-                    int allowedFlags = getAllowedIfdFlagsFromInfo(tagInfo);
-                    if ((ifdFlags & allowedFlags) != 0) {
-                        return TAG_NULL;
-                    }
-                }
-            }
-            getTagInfo().put(tagDef, ifdFlags << 24 | (tagType << 16) | defaultComponentCount);
-            return tagDef;
-        }
-        return TAG_NULL;
-    }
-
-    protected int getTagDefinition(short tagId, int defaultIfd) {
-        return getTagInfo().get(defineTag(defaultIfd, tagId));
-    }
-
-    protected int[] getTagDefinitionsForTagId(short tagId) {
-        int[] ifds = IfdData.getIfds();
-        int[] defs = new int[ifds.length];
-        int counter = 0;
-        SparseIntArray infos = getTagInfo();
-        for (int i : ifds) {
-            int def = defineTag(i, tagId);
-            if (infos.get(def) != DEFINITION_NULL) {
-                defs[counter++] = def;
-            }
-        }
-        if (counter == 0) {
-            return null;
-        }
-
-        return Arrays.copyOfRange(defs, 0, counter);
-    }
-
-    protected int getTagDefinitionForTag(ExifTag tag) {
-        short type = tag.getDataType();
-        int count = tag.getComponentCount();
-        int ifd = tag.getIfd();
-        return getTagDefinitionForTag(tag.getTagId(), type, count, ifd);
-    }
-
-    protected int getTagDefinitionForTag(short tagId, short type, int count, int ifd) {
-        int[] defs = getTagDefinitionsForTagId(tagId);
-        if (defs == null) {
-            return TAG_NULL;
-        }
-        SparseIntArray infos = getTagInfo();
-        int ret = TAG_NULL;
-        for (int i : defs) {
-            int info = infos.get(i);
-            short def_type = getTypeFromInfo(info);
-            int def_count = getComponentCountFromInfo(info);
-            int[] def_ifds = getAllowedIfdsFromInfo(info);
-            boolean valid_ifd = false;
-            for (int j : def_ifds) {
-                if (j == ifd) {
-                    valid_ifd = true;
-                    break;
-                }
-            }
-            if (valid_ifd && type == def_type
-                    && (count == def_count || def_count == ExifTag.SIZE_UNDEFINED)) {
-                ret = i;
-                break;
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Removes a tag definition for given defined tag constant.
-     *
-     * @param tagId a defined tag constant, e.g. {@link #TAG_IMAGE_WIDTH}.
-     */
-    public void removeTagDefinition(int tagId) {
-        getTagInfo().delete(tagId);
-    }
-
-    /**
-     * Resets tag definitions to the default ones.
-     */
-    public void resetTagDefinitions() {
-        mTagInfo = null;
-    }
-
-    /**
-     * Returns the thumbnail from IFD1 as a bitmap, or null if none exists.
-     *
-     * @return the thumbnail as a bitmap.
-     */
-    public Bitmap getThumbnailBitmap() {
-        if (mData.hasCompressedThumbnail()) {
-            byte[] thumb = mData.getCompressedThumbnail();
-            return BitmapFactory.decodeByteArray(thumb, 0, thumb.length);
-        } else if (mData.hasUncompressedStrip()) {
-            // TODO: implement uncompressed
-        }
-        return null;
-    }
-
-    /**
-     * Returns the thumbnail from IFD1 as a byte array, or null if none exists.
-     * The bytes may either be an uncompressed strip as specified in the exif
-     * standard or a jpeg compressed image.
-     *
-     * @return the thumbnail as a byte array.
-     */
-    public byte[] getThumbnailBytes() {
-        if (mData.hasCompressedThumbnail()) {
-            return mData.getCompressedThumbnail();
-        } else if (mData.hasUncompressedStrip()) {
-            // TODO: implement this
-        }
-        return null;
-    }
-
-    /**
-     * Returns the thumbnail if it is jpeg compressed, or null if none exists.
-     *
-     * @return the thumbnail as a byte array.
-     */
-    public byte[] getThumbnail() {
-        return mData.getCompressedThumbnail();
-    }
-
-    /**
-     * Check if thumbnail is compressed.
-     *
-     * @return true if the thumbnail is compressed.
-     */
-    public boolean isThumbnailCompressed() {
-        return mData.hasCompressedThumbnail();
-    }
-
-    /**
-     * Check if thumbnail exists.
-     *
-     * @return true if a compressed thumbnail exists.
-     */
-    public boolean hasThumbnail() {
-        // TODO: add back in uncompressed strip
-        return mData.hasCompressedThumbnail();
-    }
-
-    // TODO: uncompressed thumbnail setters
-
-    /**
-     * Sets the thumbnail to be a jpeg compressed image. Clears any prior
-     * thumbnail.
-     *
-     * @param thumb a byte array containing a jpeg compressed image.
-     * @return true if the thumbnail was set.
-     */
-    public boolean setCompressedThumbnail(byte[] thumb) {
-        mData.clearThumbnailAndStrips();
-        mData.setCompressedThumbnail(thumb);
-        return true;
-    }
-
-    /**
-     * Sets the thumbnail to be a jpeg compressed bitmap. Clears any prior
-     * thumbnail.
-     *
-     * @param thumb a bitmap to compress to a jpeg thumbnail.
-     * @return true if the thumbnail was set.
-     */
-    public boolean setCompressedThumbnail(Bitmap thumb) {
-        ByteArrayOutputStream thumbnail = new ByteArrayOutputStream();
-        if (!thumb.compress(Bitmap.CompressFormat.JPEG, 90, thumbnail)) {
-            return false;
-        }
-        return setCompressedThumbnail(thumbnail.toByteArray());
-    }
-
-    /**
-     * Clears the compressed thumbnail if it exists.
-     */
-    public void removeCompressedThumbnail() {
-        mData.setCompressedThumbnail(null);
-    }
-
-    // Convenience methods:
-
-    /**
-     * Decodes the user comment tag into string as specified in the EXIF
-     * standard. Returns null if decoding failed.
-     */
-    public String getUserComment() {
-        return mData.getUserComment();
-    }
-
-    /**
-     * Returns the Orientation ExifTag value for a given number of degrees.
-     *
-     * @param degrees the amount an image is rotated in degrees.
-     */
-    public static short getOrientationValueForRotation(int degrees) {
-        degrees %= 360;
-        if (degrees < 0) {
-            degrees += 360;
-        }
-        if (degrees < 90) {
-            return Orientation.TOP_LEFT; // 0 degrees
-        } else if (degrees < 180) {
-            return Orientation.RIGHT_TOP; // 90 degrees cw
-        } else if (degrees < 270) {
-            return Orientation.BOTTOM_LEFT; // 180 degrees
-        } else {
-            return Orientation.RIGHT_BOTTOM; // 270 degrees cw
-        }
-    }
-
-    /**
-     * Returns the rotation degrees corresponding to an ExifTag Orientation
-     * value.
-     *
-     * @param orientation the ExifTag Orientation value.
-     */
-    public static int getRotationForOrientationValue(short orientation) {
-        switch (orientation) {
-            case Orientation.TOP_LEFT:
-                return 0;
-            case Orientation.RIGHT_TOP:
-                return 90;
-            case Orientation.BOTTOM_LEFT:
-                return 180;
-            case Orientation.RIGHT_BOTTOM:
-                return 270;
-            default:
-                return 0;
-        }
-    }
-
-    /**
-     * Gets the double representation of the GPS latitude or longitude
-     * coordinate.
-     *
-     * @param coordinate an array of 3 Rationals representing the degrees,
-     *            minutes, and seconds of the GPS location as defined in the
-     *            exif specification.
-     * @param reference a GPS reference reperesented by a String containing "N",
-     *            "S", "E", or "W".
-     * @return the GPS coordinate represented as degrees + minutes/60 +
-     *         seconds/3600
-     */
-    public static double convertLatOrLongToDouble(Rational[] coordinate, String reference) {
-        try {
-            double degrees = coordinate[0].toDouble();
-            double minutes = coordinate[1].toDouble();
-            double seconds = coordinate[2].toDouble();
-            double result = degrees + minutes / 60.0 + seconds / 3600.0;
-            if ((reference.equals("S") || reference.equals("W"))) {
-                return -result;
-            }
-            return result;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    /**
-     * Gets the GPS latitude and longitude as a pair of doubles from this
-     * ExifInterface object's tags, or null if the necessary tags do not exist.
-     *
-     * @return an array of 2 doubles containing the latitude, and longitude
-     *         respectively.
-     * @see #convertLatOrLongToDouble
-     */
-    public double[] getLatLongAsDoubles() {
-        Rational[] latitude = getTagRationalValues(TAG_GPS_LATITUDE);
-        String latitudeRef = getTagStringValue(TAG_GPS_LATITUDE_REF);
-        Rational[] longitude = getTagRationalValues(TAG_GPS_LONGITUDE);
-        String longitudeRef = getTagStringValue(TAG_GPS_LONGITUDE_REF);
-        if (latitude == null || longitude == null || latitudeRef == null || longitudeRef == null
-                || latitude.length < 3 || longitude.length < 3) {
-            return null;
-        }
-        double[] latLon = new double[2];
-        latLon[0] = convertLatOrLongToDouble(latitude, latitudeRef);
-        latLon[1] = convertLatOrLongToDouble(longitude, longitudeRef);
-        return latLon;
-    }
-
-    private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd";
-    private static final String DATETIME_FORMAT_STR = "yyyy:MM:dd kk:mm:ss";
-    private final DateFormat mDateTimeStampFormat = new SimpleDateFormat(DATETIME_FORMAT_STR);
-    private final DateFormat mGPSDateStampFormat = new SimpleDateFormat(GPS_DATE_FORMAT_STR);
-    private final Calendar mGPSTimeStampCalendar = Calendar
-            .getInstance(TimeZone.getTimeZone("UTC"));
-
-    /**
-     * Creates, formats, and sets the DateTimeStamp tag for one of:
-     * {@link #TAG_DATE_TIME}, {@link #TAG_DATE_TIME_DIGITIZED},
-     * {@link #TAG_DATE_TIME_ORIGINAL}.
-     *
-     * @param tagId one of the DateTimeStamp tags.
-     * @param timestamp a timestamp to format.
-     * @param timezone a TimeZone object.
-     * @return true if success, false if the tag could not be set.
-     */
-    public boolean addDateTimeStampTag(int tagId, long timestamp, TimeZone timezone) {
-        if (tagId == TAG_DATE_TIME || tagId == TAG_DATE_TIME_DIGITIZED
-                || tagId == TAG_DATE_TIME_ORIGINAL) {
-            mDateTimeStampFormat.setTimeZone(timezone);
-            ExifTag t = buildTag(tagId, mDateTimeStampFormat.format(timestamp));
-            if (t == null) {
-                return false;
-            }
-            setTag(t);
-        } else {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Creates and sets all to the GPS tags for a give latitude and longitude.
-     *
-     * @param latitude a GPS latitude coordinate.
-     * @param longitude a GPS longitude coordinate.
-     * @return true if success, false if they could not be created or set.
-     */
-    public boolean addGpsTags(double latitude, double longitude) {
-        ExifTag latTag = buildTag(TAG_GPS_LATITUDE, toExifLatLong(latitude));
-        ExifTag longTag = buildTag(TAG_GPS_LONGITUDE, toExifLatLong(longitude));
-        ExifTag latRefTag = buildTag(TAG_GPS_LATITUDE_REF,
-                latitude >= 0 ? GpsLatitudeRef.NORTH
-                        : GpsLatitudeRef.SOUTH);
-        ExifTag longRefTag = buildTag(TAG_GPS_LONGITUDE_REF,
-                longitude >= 0 ? GpsLongitudeRef.EAST
-                        : GpsLongitudeRef.WEST);
-        if (latTag == null || longTag == null || latRefTag == null || longRefTag == null) {
-            return false;
-        }
-        setTag(latTag);
-        setTag(longTag);
-        setTag(latRefTag);
-        setTag(longRefTag);
-        return true;
-    }
-
-    /**
-     * Creates and sets the GPS timestamp tag.
-     *
-     * @param timestamp a GPS timestamp.
-     * @return true if success, false if could not be created or set.
-     */
-    public boolean addGpsDateTimeStampTag(long timestamp) {
-        ExifTag t = buildTag(TAG_GPS_DATE_STAMP, mGPSDateStampFormat.format(timestamp));
-        if (t == null) {
-            return false;
-        }
-        setTag(t);
-        mGPSTimeStampCalendar.setTimeInMillis(timestamp);
-        t = buildTag(TAG_GPS_TIME_STAMP, new Rational[] {
-                new Rational(mGPSTimeStampCalendar.get(Calendar.HOUR_OF_DAY), 1),
-                new Rational(mGPSTimeStampCalendar.get(Calendar.MINUTE), 1),
-                new Rational(mGPSTimeStampCalendar.get(Calendar.SECOND), 1)
-        });
-        if (t == null) {
-            return false;
-        }
-        setTag(t);
-        return true;
-    }
-
-    private static Rational[] toExifLatLong(double value) {
-        // convert to the format dd/1 mm/1 ssss/100
-        value = Math.abs(value);
-        int degrees = (int) value;
-        value = (value - degrees) * 60;
-        int minutes = (int) value;
-        value = (value - minutes) * 6000;
-        int seconds = (int) value;
-        return new Rational[] {
-                new Rational(degrees, 1), new Rational(minutes, 1), new Rational(seconds, 100)
-        };
-    }
-
-    private void doExifStreamIO(InputStream is, OutputStream os) throws IOException {
-        byte[] buf = new byte[1024];
-        int ret = is.read(buf, 0, 1024);
-        while (ret != -1) {
-            os.write(buf, 0, ret);
-            ret = is.read(buf, 0, 1024);
-        }
-    }
-
-    protected static void closeSilently(Closeable c) {
-        if (c != null) {
-            try {
-                c.close();
-            } catch (Throwable e) {
-                // ignored
-            }
-        }
-    }
-
-    private SparseIntArray mTagInfo = null;
-
-    protected SparseIntArray getTagInfo() {
-        if (mTagInfo == null) {
-            mTagInfo = new SparseIntArray();
-            initTagInfo();
-        }
-        return mTagInfo;
-    }
-
-    private void initTagInfo() {
-        /**
-         * We put tag information in a 4-bytes integer. The first byte a bitmask
-         * representing the allowed IFDs of the tag, the second byte is the data
-         * type, and the last two byte are a short value indicating the default
-         * component count of this tag.
-         */
-        // IFD0 tags
-        int[] ifdAllowedIfds = {
-                IfdId.TYPE_IFD_0, IfdId.TYPE_IFD_1
-        };
-        int ifdFlags = getFlagsFromAllowedIfds(ifdAllowedIfds) << 24;
-        mTagInfo.put(ExifInterface.TAG_MAKE,
-                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_IMAGE_WIDTH,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_IMAGE_LENGTH,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_BITS_PER_SAMPLE,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 3);
-        mTagInfo.put(ExifInterface.TAG_COMPRESSION,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_PHOTOMETRIC_INTERPRETATION,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_ORIENTATION, ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16
-                | 1);
-        mTagInfo.put(ExifInterface.TAG_SAMPLES_PER_PIXEL,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_PLANAR_CONFIGURATION,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_Y_CB_CR_SUB_SAMPLING,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_Y_CB_CR_POSITIONING,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_X_RESOLUTION,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_Y_RESOLUTION,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_RESOLUTION_UNIT,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_STRIP_OFFSETS,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_ROWS_PER_STRIP,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_STRIP_BYTE_COUNTS,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_TRANSFER_FUNCTION,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 3 * 256);
-        mTagInfo.put(ExifInterface.TAG_WHITE_POINT,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_PRIMARY_CHROMATICITIES,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 6);
-        mTagInfo.put(ExifInterface.TAG_Y_CB_CR_COEFFICIENTS,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 3);
-        mTagInfo.put(ExifInterface.TAG_REFERENCE_BLACK_WHITE,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 6);
-        mTagInfo.put(ExifInterface.TAG_DATE_TIME,
-                ifdFlags | ExifTag.TYPE_ASCII << 16 | 20);
-        mTagInfo.put(ExifInterface.TAG_IMAGE_DESCRIPTION,
-                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_MAKE,
-                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_MODEL,
-                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_SOFTWARE,
-                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_ARTIST,
-                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_COPYRIGHT,
-                ifdFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_EXIF_IFD,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GPS_IFD,
-                ifdFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
-        // IFD1 tags
-        int[] ifd1AllowedIfds = {
-            IfdId.TYPE_IFD_1
-        };
-        int ifdFlags1 = getFlagsFromAllowedIfds(ifd1AllowedIfds) << 24;
-        mTagInfo.put(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT,
-                ifdFlags1 | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,
-                ifdFlags1 | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
-        // Exif tags
-        int[] exifAllowedIfds = {
-            IfdId.TYPE_IFD_EXIF
-        };
-        int exifFlags = getFlagsFromAllowedIfds(exifAllowedIfds) << 24;
-        mTagInfo.put(ExifInterface.TAG_EXIF_VERSION,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | 4);
-        mTagInfo.put(ExifInterface.TAG_FLASHPIX_VERSION,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | 4);
-        mTagInfo.put(ExifInterface.TAG_COLOR_SPACE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_COMPONENTS_CONFIGURATION,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | 4);
-        mTagInfo.put(ExifInterface.TAG_COMPRESSED_BITS_PER_PIXEL,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_PIXEL_X_DIMENSION,
-                exifFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_PIXEL_Y_DIMENSION,
-                exifFlags | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_MAKER_NOTE,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_USER_COMMENT,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_RELATED_SOUND_FILE,
-                exifFlags | ExifTag.TYPE_ASCII << 16 | 13);
-        mTagInfo.put(ExifInterface.TAG_DATE_TIME_ORIGINAL,
-                exifFlags | ExifTag.TYPE_ASCII << 16 | 20);
-        mTagInfo.put(ExifInterface.TAG_DATE_TIME_DIGITIZED,
-                exifFlags | ExifTag.TYPE_ASCII << 16 | 20);
-        mTagInfo.put(ExifInterface.TAG_SUB_SEC_TIME,
-                exifFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_SUB_SEC_TIME_ORIGINAL,
-                exifFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_SUB_SEC_TIME_DIGITIZED,
-                exifFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_IMAGE_UNIQUE_ID,
-                exifFlags | ExifTag.TYPE_ASCII << 16 | 33);
-        mTagInfo.put(ExifInterface.TAG_EXPOSURE_TIME,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_F_NUMBER,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_EXPOSURE_PROGRAM,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_SPECTRAL_SENSITIVITY,
-                exifFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_ISO_SPEED_RATINGS,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_OECF,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_SHUTTER_SPEED_VALUE,
-                exifFlags | ExifTag.TYPE_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_APERTURE_VALUE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_BRIGHTNESS_VALUE,
-                exifFlags | ExifTag.TYPE_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_EXPOSURE_BIAS_VALUE,
-                exifFlags | ExifTag.TYPE_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_MAX_APERTURE_VALUE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_SUBJECT_DISTANCE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_METERING_MODE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_LIGHT_SOURCE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_FLASH,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_FOCAL_LENGTH,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_SUBJECT_AREA,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_FLASH_ENERGY,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_SPATIAL_FREQUENCY_RESPONSE,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_FOCAL_PLANE_X_RESOLUTION,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_FOCAL_PLANE_Y_RESOLUTION,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_FOCAL_PLANE_RESOLUTION_UNIT,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_SUBJECT_LOCATION,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_EXPOSURE_INDEX,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_SENSING_METHOD,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_FILE_SOURCE,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_SCENE_TYPE,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_CFA_PATTERN,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_CUSTOM_RENDERED,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_EXPOSURE_MODE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_WHITE_BALANCE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_DIGITAL_ZOOM_RATIO,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_FOCAL_LENGTH_IN_35_MM_FILE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_SCENE_CAPTURE_TYPE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GAIN_CONTROL,
-                exifFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_CONTRAST,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_SATURATION,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_SHARPNESS,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_DEVICE_SETTING_DESCRIPTION,
-                exifFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_SUBJECT_DISTANCE_RANGE,
-                exifFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_INTEROPERABILITY_IFD, exifFlags
-                | ExifTag.TYPE_UNSIGNED_LONG << 16 | 1);
-        // GPS tag
-        int[] gpsAllowedIfds = {
-            IfdId.TYPE_IFD_GPS
-        };
-        int gpsFlags = getFlagsFromAllowedIfds(gpsAllowedIfds) << 24;
-        mTagInfo.put(ExifInterface.TAG_GPS_VERSION_ID,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_BYTE << 16 | 4);
-        mTagInfo.put(ExifInterface.TAG_GPS_LATITUDE_REF,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_GPS_LONGITUDE_REF,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_GPS_LATITUDE,
-                gpsFlags | ExifTag.TYPE_RATIONAL << 16 | 3);
-        mTagInfo.put(ExifInterface.TAG_GPS_LONGITUDE,
-                gpsFlags | ExifTag.TYPE_RATIONAL << 16 | 3);
-        mTagInfo.put(ExifInterface.TAG_GPS_ALTITUDE_REF,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_BYTE << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GPS_ALTITUDE,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GPS_TIME_STAMP,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 3);
-        mTagInfo.put(ExifInterface.TAG_GPS_SATTELLITES,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_GPS_STATUS,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_GPS_MEASURE_MODE,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_GPS_DOP,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GPS_SPEED_REF,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_GPS_SPEED,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GPS_TRACK_REF,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_GPS_TRACK,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GPS_IMG_DIRECTION_REF,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_GPS_IMG_DIRECTION,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GPS_MAP_DATUM,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_GPS_DEST_LATITUDE_REF,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_GPS_DEST_LATITUDE,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GPS_DEST_BEARING_REF,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_GPS_DEST_BEARING,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GPS_DEST_DISTANCE_REF,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 2);
-        mTagInfo.put(ExifInterface.TAG_GPS_DEST_DISTANCE,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_RATIONAL << 16 | 1);
-        mTagInfo.put(ExifInterface.TAG_GPS_PROCESSING_METHOD,
-                gpsFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_GPS_AREA_INFORMATION,
-                gpsFlags | ExifTag.TYPE_UNDEFINED << 16 | ExifTag.SIZE_UNDEFINED);
-        mTagInfo.put(ExifInterface.TAG_GPS_DATE_STAMP,
-                gpsFlags | ExifTag.TYPE_ASCII << 16 | 11);
-        mTagInfo.put(ExifInterface.TAG_GPS_DIFFERENTIAL,
-                gpsFlags | ExifTag.TYPE_UNSIGNED_SHORT << 16 | 11);
-        // Interoperability tag
-        int[] interopAllowedIfds = {
-            IfdId.TYPE_IFD_INTEROPERABILITY
-        };
-        int interopFlags = getFlagsFromAllowedIfds(interopAllowedIfds) << 24;
-        mTagInfo.put(TAG_INTEROPERABILITY_INDEX, interopFlags | ExifTag.TYPE_ASCII << 16
-                | ExifTag.SIZE_UNDEFINED);
-    }
-
-    protected static int getAllowedIfdFlagsFromInfo(int info) {
-        return info >>> 24;
-    }
-
-    protected static int[] getAllowedIfdsFromInfo(int info) {
-        int ifdFlags = getAllowedIfdFlagsFromInfo(info);
-        int[] ifds = IfdData.getIfds();
-        ArrayList<Integer> l = new ArrayList<Integer>();
-        for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) {
-            int flag = (ifdFlags >> i) & 1;
-            if (flag == 1) {
-                l.add(ifds[i]);
-            }
-        }
-        if (l.size() <= 0) {
-            return null;
-        }
-        int[] ret = new int[l.size()];
-        int j = 0;
-        for (int i : l) {
-            ret[j++] = i;
-        }
-        return ret;
-    }
-
-    protected static boolean isIfdAllowed(int info, int ifd) {
-        int[] ifds = IfdData.getIfds();
-        int ifdFlags = getAllowedIfdFlagsFromInfo(info);
-        for (int i = 0; i < ifds.length; i++) {
-            if (ifd == ifds[i] && ((ifdFlags >> i) & 1) == 1) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    protected static int getFlagsFromAllowedIfds(int[] allowedIfds) {
-        if (allowedIfds == null || allowedIfds.length == 0) {
-            return 0;
-        }
-        int flags = 0;
-        int[] ifds = IfdData.getIfds();
-        for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) {
-            for (int j : allowedIfds) {
-                if (ifds[i] == j) {
-                    flags |= 1 << i;
-                    break;
-                }
-            }
-        }
-        return flags;
-    }
-
-    protected static short getTypeFromInfo(int info) {
-        return (short) ((info >> 16) & 0x0ff);
-    }
-
-    protected static int getComponentCountFromInfo(int info) {
-        return info & 0x0ffff;
-    }
-
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifInvalidFormatException.java b/imagepicker/src/main/java/com/android/mms/exif/ExifInvalidFormatException.java
deleted file mode 100644
index ad13235..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifInvalidFormatException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-public class ExifInvalidFormatException extends Exception {
-    public ExifInvalidFormatException(String meg) {
-        super(meg);
-    }
-}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java b/imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java
deleted file mode 100644
index ae8e97e..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifModifier.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import com.android.mms.LogTag;
-
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.List;
-
-class ExifModifier {
-    public static final String TAG = LogTag.TAG;
-    public static final boolean DEBUG = false;
-    private final ByteBuffer mByteBuffer;
-    private final ExifData mTagToModified;
-    private final List<TagOffset> mTagOffsets = new ArrayList<TagOffset>();
-    private final ExifInterface mInterface;
-    private int mOffsetBase;
-
-    private static class TagOffset {
-        final int mOffset;
-        final ExifTag mTag;
-
-        TagOffset(ExifTag tag, int offset) {
-            mTag = tag;
-            mOffset = offset;
-        }
-    }
-
-    protected ExifModifier(ByteBuffer byteBuffer, ExifInterface iRef) throws IOException,
-            ExifInvalidFormatException {
-        mByteBuffer = byteBuffer;
-        mOffsetBase = byteBuffer.position();
-        mInterface = iRef;
-        InputStream is = null;
-        try {
-            is = new ByteBufferInputStream(byteBuffer);
-            // Do not require any IFD;
-            ExifParser parser = ExifParser.parse(is, mInterface);
-            mTagToModified = new ExifData(parser.getByteOrder());
-            mOffsetBase += parser.getTiffStartPosition();
-            mByteBuffer.position(0);
-        } finally {
-            ExifInterface.closeSilently(is);
-        }
-    }
-
-    protected ByteOrder getByteOrder() {
-        return mTagToModified.getByteOrder();
-    }
-
-    protected boolean commit() throws IOException, ExifInvalidFormatException {
-        InputStream is = null;
-        try {
-            is = new ByteBufferInputStream(mByteBuffer);
-            int flag = 0;
-            IfdData[] ifdDatas = new IfdData[] {
-                    mTagToModified.getIfdData(IfdId.TYPE_IFD_0),
-                    mTagToModified.getIfdData(IfdId.TYPE_IFD_1),
-                    mTagToModified.getIfdData(IfdId.TYPE_IFD_EXIF),
-                    mTagToModified.getIfdData(IfdId.TYPE_IFD_INTEROPERABILITY),
-                    mTagToModified.getIfdData(IfdId.TYPE_IFD_GPS)
-            };
-
-            if (ifdDatas[IfdId.TYPE_IFD_0] != null) {
-                flag |= ExifParser.OPTION_IFD_0;
-            }
-            if (ifdDatas[IfdId.TYPE_IFD_1] != null) {
-                flag |= ExifParser.OPTION_IFD_1;
-            }
-            if (ifdDatas[IfdId.TYPE_IFD_EXIF] != null) {
-                flag |= ExifParser.OPTION_IFD_EXIF;
-            }
-            if (ifdDatas[IfdId.TYPE_IFD_GPS] != null) {
-                flag |= ExifParser.OPTION_IFD_GPS;
-            }
-            if (ifdDatas[IfdId.TYPE_IFD_INTEROPERABILITY] != null) {
-                flag |= ExifParser.OPTION_IFD_INTEROPERABILITY;
-            }
-
-            ExifParser parser = ExifParser.parse(is, flag, mInterface);
-            int event = parser.next();
-            IfdData currIfd = null;
-            while (event != ExifParser.EVENT_END) {
-                switch (event) {
-                    case ExifParser.EVENT_START_OF_IFD:
-                        currIfd = ifdDatas[parser.getCurrentIfd()];
-                        if (currIfd == null) {
-                            parser.skipRemainingTagsInCurrentIfd();
-                        }
-                        break;
-                    case ExifParser.EVENT_NEW_TAG:
-                        ExifTag oldTag = parser.getTag();
-                        ExifTag newTag = currIfd.getTag(oldTag.getTagId());
-                        if (newTag != null) {
-                            if (newTag.getComponentCount() != oldTag.getComponentCount()
-                                    || newTag.getDataType() != oldTag.getDataType()) {
-                                return false;
-                            } else {
-                                mTagOffsets.add(new TagOffset(newTag, oldTag.getOffset()));
-                                currIfd.removeTag(oldTag.getTagId());
-                                if (currIfd.getTagCount() == 0) {
-                                    parser.skipRemainingTagsInCurrentIfd();
-                                }
-                            }
-                        }
-                        break;
-                }
-                event = parser.next();
-            }
-            for (IfdData ifd : ifdDatas) {
-                if (ifd != null && ifd.getTagCount() > 0) {
-                    return false;
-                }
-            }
-            modify();
-        } finally {
-            ExifInterface.closeSilently(is);
-        }
-        return true;
-    }
-
-    private void modify() {
-        mByteBuffer.order(getByteOrder());
-        for (TagOffset tagOffset : mTagOffsets) {
-            writeTagValue(tagOffset.mTag, tagOffset.mOffset);
-        }
-    }
-
-    private void writeTagValue(ExifTag tag, int offset) {
-        if (DEBUG) {
-            Log.v(TAG, "modifying tag to: \n" + tag.toString());
-            Log.v(TAG, "at offset: " + offset);
-        }
-        mByteBuffer.position(offset + mOffsetBase);
-        switch (tag.getDataType()) {
-            case ExifTag.TYPE_ASCII:
-                byte[] buf = tag.getStringByte();
-                if (buf.length == tag.getComponentCount()) {
-                    buf[buf.length - 1] = 0;
-                    mByteBuffer.put(buf);
-                } else {
-                    mByteBuffer.put(buf);
-                    mByteBuffer.put((byte) 0);
-                }
-                break;
-            case ExifTag.TYPE_LONG:
-            case ExifTag.TYPE_UNSIGNED_LONG:
-                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                    mByteBuffer.putInt((int) tag.getValueAt(i));
-                }
-                break;
-            case ExifTag.TYPE_RATIONAL:
-            case ExifTag.TYPE_UNSIGNED_RATIONAL:
-                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                    Rational v = tag.getRational(i);
-                    mByteBuffer.putInt((int) v.getNumerator());
-                    mByteBuffer.putInt((int) v.getDenominator());
-                }
-                break;
-            case ExifTag.TYPE_UNDEFINED:
-            case ExifTag.TYPE_UNSIGNED_BYTE:
-                buf = new byte[tag.getComponentCount()];
-                tag.getBytes(buf);
-                mByteBuffer.put(buf);
-                break;
-            case ExifTag.TYPE_UNSIGNED_SHORT:
-                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                    mByteBuffer.putShort((short) tag.getValueAt(i));
-                }
-                break;
-        }
-    }
-
-    public void modifyTag(ExifTag tag) {
-        mTagToModified.addTag(tag);
-    }
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java b/imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java
deleted file mode 100644
index e4a0683..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifOutputStream.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import com.android.mms.LogTag;
-
-import android.util.Log;
-
-import java.io.BufferedOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-
-/**
- * This class provides a way to replace the Exif header of a JPEG image.
- * <p>
- * Below is an example of writing EXIF data into a file
- *
- * <pre>
- * public static void writeExif(byte[] jpeg, ExifData exif, String path) {
- *     OutputStream os = null;
- *     try {
- *         os = new FileOutputStream(path);
- *         ExifOutputStream eos = new ExifOutputStream(os);
- *         // Set the exif header
- *         eos.setExifData(exif);
- *         // Write the original jpeg out, the header will be add into the file.
- *         eos.write(jpeg);
- *     } catch (FileNotFoundException e) {
- *         e.printStackTrace();
- *     } catch (IOException e) {
- *         e.printStackTrace();
- *     } finally {
- *         if (os != null) {
- *             try {
- *                 os.close();
- *             } catch (IOException e) {
- *                 e.printStackTrace();
- *             }
- *         }
- *     }
- * }
- * </pre>
- */
-class ExifOutputStream extends FilterOutputStream {
-    private static final String TAG = LogTag.TAG;
-    private static final boolean DEBUG = false;
-    private static final int STREAMBUFFER_SIZE = 0x00010000; // 64Kb
-
-    private static final int STATE_SOI = 0;
-    private static final int STATE_FRAME_HEADER = 1;
-    private static final int STATE_JPEG_DATA = 2;
-
-    private static final int EXIF_HEADER = 0x45786966;
-    private static final short TIFF_HEADER = 0x002A;
-    private static final short TIFF_BIG_ENDIAN = 0x4d4d;
-    private static final short TIFF_LITTLE_ENDIAN = 0x4949;
-    private static final short TAG_SIZE = 12;
-    private static final short TIFF_HEADER_SIZE = 8;
-    private static final int MAX_EXIF_SIZE = 65535;
-
-    private ExifData mExifData;
-    private int mState = STATE_SOI;
-    private int mByteToSkip;
-    private int mByteToCopy;
-    private final byte[] mSingleByteArray = new byte[1];
-    private final ByteBuffer mBuffer = ByteBuffer.allocate(4);
-    private final ExifInterface mInterface;
-
-    protected ExifOutputStream(OutputStream ou, ExifInterface iRef) {
-        super(new BufferedOutputStream(ou, STREAMBUFFER_SIZE));
-        mInterface = iRef;
-    }
-
-    /**
-     * Sets the ExifData to be written into the JPEG file. Should be called
-     * before writing image data.
-     */
-    protected void setExifData(ExifData exifData) {
-        mExifData = exifData;
-    }
-
-    /**
-     * Gets the Exif header to be written into the JPEF file.
-     */
-    protected ExifData getExifData() {
-        return mExifData;
-    }
-
-    private int requestByteToBuffer(int requestByteCount, byte[] buffer
-            , int offset, int length) {
-        int byteNeeded = requestByteCount - mBuffer.position();
-        int byteToRead = length > byteNeeded ? byteNeeded : length;
-        mBuffer.put(buffer, offset, byteToRead);
-        return byteToRead;
-    }
-
-    /**
-     * Writes the image out. The input data should be a valid JPEG format. After
-     * writing, it's Exif header will be replaced by the given header.
-     */
-    @Override
-    public void write(byte[] buffer, int offset, int length) throws IOException {
-        while ((mByteToSkip > 0 || mByteToCopy > 0 || mState != STATE_JPEG_DATA)
-                && length > 0) {
-            if (mByteToSkip > 0) {
-                int byteToProcess = length > mByteToSkip ? mByteToSkip : length;
-                length -= byteToProcess;
-                mByteToSkip -= byteToProcess;
-                offset += byteToProcess;
-            }
-            if (mByteToCopy > 0) {
-                int byteToProcess = length > mByteToCopy ? mByteToCopy : length;
-                out.write(buffer, offset, byteToProcess);
-                length -= byteToProcess;
-                mByteToCopy -= byteToProcess;
-                offset += byteToProcess;
-            }
-            if (length == 0) {
-                return;
-            }
-            switch (mState) {
-                case STATE_SOI:
-                    int byteRead = requestByteToBuffer(2, buffer, offset, length);
-                    offset += byteRead;
-                    length -= byteRead;
-                    if (mBuffer.position() < 2) {
-                        return;
-                    }
-                    mBuffer.rewind();
-                    if (mBuffer.getShort() != JpegHeader.SOI) {
-                        throw new IOException("Not a valid jpeg image, cannot write exif");
-                    }
-                    out.write(mBuffer.array(), 0, 2);
-                    mState = STATE_FRAME_HEADER;
-                    mBuffer.rewind();
-                    writeExifData();
-                    break;
-                case STATE_FRAME_HEADER:
-                    // We ignore the APP1 segment and copy all other segments
-                    // until SOF tag.
-                    byteRead = requestByteToBuffer(4, buffer, offset, length);
-                    offset += byteRead;
-                    length -= byteRead;
-                    // Check if this image data doesn't contain SOF.
-                    if (mBuffer.position() == 2) {
-                        short tag = mBuffer.getShort();
-                        if (tag == JpegHeader.EOI) {
-                            out.write(mBuffer.array(), 0, 2);
-                            mBuffer.rewind();
-                        }
-                    }
-                    if (mBuffer.position() < 4) {
-                        return;
-                    }
-                    mBuffer.rewind();
-                    short marker = mBuffer.getShort();
-                    if (marker == JpegHeader.APP1) {
-                        mByteToSkip = (mBuffer.getShort() & 0x0000ffff) - 2;
-                        mState = STATE_JPEG_DATA;
-                    } else if (!JpegHeader.isSofMarker(marker)) {
-                        out.write(mBuffer.array(), 0, 4);
-                        mByteToCopy = (mBuffer.getShort() & 0x0000ffff) - 2;
-                    } else {
-                        out.write(mBuffer.array(), 0, 4);
-                        mState = STATE_JPEG_DATA;
-                    }
-                    mBuffer.rewind();
-            }
-        }
-        if (length > 0) {
-            out.write(buffer, offset, length);
-        }
-    }
-
-    /**
-     * Writes the one bytes out. The input data should be a valid JPEG format.
-     * After writing, it's Exif header will be replaced by the given header.
-     */
-    @Override
-    public void write(int oneByte) throws IOException {
-        mSingleByteArray[0] = (byte) (0xff & oneByte);
-        write(mSingleByteArray);
-    }
-
-    /**
-     * Equivalent to calling write(buffer, 0, buffer.length).
-     */
-    @Override
-    public void write(byte[] buffer) throws IOException {
-        write(buffer, 0, buffer.length);
-    }
-
-    private void writeExifData() throws IOException {
-        if (mExifData == null) {
-            return;
-        }
-        if (DEBUG) {
-            Log.v(TAG, "Writing exif data...");
-        }
-        ArrayList<ExifTag> nullTags = stripNullValueTags(mExifData);
-        createRequiredIfdAndTag();
-        int exifSize = calculateAllOffset();
-        if (exifSize + 8 > MAX_EXIF_SIZE) {
-            throw new IOException("Exif header is too large (>64Kb)");
-        }
-        OrderedDataOutputStream dataOutputStream = new OrderedDataOutputStream(out);
-        dataOutputStream.setByteOrder(ByteOrder.BIG_ENDIAN);
-        dataOutputStream.writeShort(JpegHeader.APP1);
-        dataOutputStream.writeShort((short) (exifSize + 8));
-        dataOutputStream.writeInt(EXIF_HEADER);
-        dataOutputStream.writeShort((short) 0x0000);
-        if (mExifData.getByteOrder() == ByteOrder.BIG_ENDIAN) {
-            dataOutputStream.writeShort(TIFF_BIG_ENDIAN);
-        } else {
-            dataOutputStream.writeShort(TIFF_LITTLE_ENDIAN);
-        }
-        dataOutputStream.setByteOrder(mExifData.getByteOrder());
-        dataOutputStream.writeShort(TIFF_HEADER);
-        dataOutputStream.writeInt(8);
-        writeAllTags(dataOutputStream);
-        writeThumbnail(dataOutputStream);
-        for (ExifTag t : nullTags) {
-            mExifData.addTag(t);
-        }
-    }
-
-    private ArrayList<ExifTag> stripNullValueTags(ExifData data) {
-        ArrayList<ExifTag> nullTags = new ArrayList<ExifTag>();
-        for(ExifTag t : data.getAllTags()) {
-            if (t.getValue() == null && !ExifInterface.isOffsetTag(t.getTagId())) {
-                data.removeTag(t.getTagId(), t.getIfd());
-                nullTags.add(t);
-            }
-        }
-        return nullTags;
-    }
-
-    private void writeThumbnail(OrderedDataOutputStream dataOutputStream) throws IOException {
-        if (mExifData.hasCompressedThumbnail()) {
-            dataOutputStream.write(mExifData.getCompressedThumbnail());
-        } else if (mExifData.hasUncompressedStrip()) {
-            for (int i = 0; i < mExifData.getStripCount(); i++) {
-                dataOutputStream.write(mExifData.getStrip(i));
-            }
-        }
-    }
-
-    private void writeAllTags(OrderedDataOutputStream dataOutputStream) throws IOException {
-        writeIfd(mExifData.getIfdData(IfdId.TYPE_IFD_0), dataOutputStream);
-        writeIfd(mExifData.getIfdData(IfdId.TYPE_IFD_EXIF), dataOutputStream);
-        IfdData interoperabilityIfd = mExifData.getIfdData(IfdId.TYPE_IFD_INTEROPERABILITY);
-        if (interoperabilityIfd != null) {
-            writeIfd(interoperabilityIfd, dataOutputStream);
-        }
-        IfdData gpsIfd = mExifData.getIfdData(IfdId.TYPE_IFD_GPS);
-        if (gpsIfd != null) {
-            writeIfd(gpsIfd, dataOutputStream);
-        }
-        IfdData ifd1 = mExifData.getIfdData(IfdId.TYPE_IFD_1);
-        if (ifd1 != null) {
-            writeIfd(mExifData.getIfdData(IfdId.TYPE_IFD_1), dataOutputStream);
-        }
-    }
-
-    private void writeIfd(IfdData ifd, OrderedDataOutputStream dataOutputStream)
-            throws IOException {
-        ExifTag[] tags = ifd.getAllTags();
-        dataOutputStream.writeShort((short) tags.length);
-        for (ExifTag tag : tags) {
-            dataOutputStream.writeShort(tag.getTagId());
-            dataOutputStream.writeShort(tag.getDataType());
-            dataOutputStream.writeInt(tag.getComponentCount());
-            if (DEBUG) {
-                Log.v(TAG, "\n" + tag.toString());
-            }
-            if (tag.getDataSize() > 4) {
-                dataOutputStream.writeInt(tag.getOffset());
-            } else {
-                ExifOutputStream.writeTagValue(tag, dataOutputStream);
-                for (int i = 0, n = 4 - tag.getDataSize(); i < n; i++) {
-                    dataOutputStream.write(0);
-                }
-            }
-        }
-        dataOutputStream.writeInt(ifd.getOffsetToNextIfd());
-        for (ExifTag tag : tags) {
-            if (tag.getDataSize() > 4) {
-                ExifOutputStream.writeTagValue(tag, dataOutputStream);
-            }
-        }
-    }
-
-    private int calculateOffsetOfIfd(IfdData ifd, int offset) {
-        offset += 2 + ifd.getTagCount() * TAG_SIZE + 4;
-        ExifTag[] tags = ifd.getAllTags();
-        for (ExifTag tag : tags) {
-            if (tag.getDataSize() > 4) {
-                tag.setOffset(offset);
-                offset += tag.getDataSize();
-            }
-        }
-        return offset;
-    }
-
-    private void createRequiredIfdAndTag() throws IOException {
-        // IFD0 is required for all file
-        IfdData ifd0 = mExifData.getIfdData(IfdId.TYPE_IFD_0);
-        if (ifd0 == null) {
-            ifd0 = new IfdData(IfdId.TYPE_IFD_0);
-            mExifData.addIfdData(ifd0);
-        }
-        ExifTag exifOffsetTag = mInterface.buildUninitializedTag(ExifInterface.TAG_EXIF_IFD);
-        if (exifOffsetTag == null) {
-            throw new IOException("No definition for crucial exif tag: "
-                    + ExifInterface.TAG_EXIF_IFD);
-        }
-        ifd0.setTag(exifOffsetTag);
-
-        // Exif IFD is required for all files.
-        IfdData exifIfd = mExifData.getIfdData(IfdId.TYPE_IFD_EXIF);
-        if (exifIfd == null) {
-            exifIfd = new IfdData(IfdId.TYPE_IFD_EXIF);
-            mExifData.addIfdData(exifIfd);
-        }
-
-        // GPS IFD
-        IfdData gpsIfd = mExifData.getIfdData(IfdId.TYPE_IFD_GPS);
-        if (gpsIfd != null) {
-            ExifTag gpsOffsetTag = mInterface.buildUninitializedTag(ExifInterface.TAG_GPS_IFD);
-            if (gpsOffsetTag == null) {
-                throw new IOException("No definition for crucial exif tag: "
-                        + ExifInterface.TAG_GPS_IFD);
-            }
-            ifd0.setTag(gpsOffsetTag);
-        }
-
-        // Interoperability IFD
-        IfdData interIfd = mExifData.getIfdData(IfdId.TYPE_IFD_INTEROPERABILITY);
-        if (interIfd != null) {
-            ExifTag interOffsetTag = mInterface
-                    .buildUninitializedTag(ExifInterface.TAG_INTEROPERABILITY_IFD);
-            if (interOffsetTag == null) {
-                throw new IOException("No definition for crucial exif tag: "
-                        + ExifInterface.TAG_INTEROPERABILITY_IFD);
-            }
-            exifIfd.setTag(interOffsetTag);
-        }
-
-        IfdData ifd1 = mExifData.getIfdData(IfdId.TYPE_IFD_1);
-
-        // thumbnail
-        if (mExifData.hasCompressedThumbnail()) {
-
-            if (ifd1 == null) {
-                ifd1 = new IfdData(IfdId.TYPE_IFD_1);
-                mExifData.addIfdData(ifd1);
-            }
-
-            ExifTag offsetTag = mInterface
-                    .buildUninitializedTag(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT);
-            if (offsetTag == null) {
-                throw new IOException("No definition for crucial exif tag: "
-                        + ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT);
-            }
-
-            ifd1.setTag(offsetTag);
-            ExifTag lengthTag = mInterface
-                    .buildUninitializedTag(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
-            if (lengthTag == null) {
-                throw new IOException("No definition for crucial exif tag: "
-                        + ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
-            }
-
-            lengthTag.setValue(mExifData.getCompressedThumbnail().length);
-            ifd1.setTag(lengthTag);
-
-            // Get rid of tags for uncompressed if they exist.
-            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_OFFSETS));
-            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_BYTE_COUNTS));
-        } else if (mExifData.hasUncompressedStrip()) {
-            if (ifd1 == null) {
-                ifd1 = new IfdData(IfdId.TYPE_IFD_1);
-                mExifData.addIfdData(ifd1);
-            }
-            int stripCount = mExifData.getStripCount();
-            ExifTag offsetTag = mInterface.buildUninitializedTag(ExifInterface.TAG_STRIP_OFFSETS);
-            if (offsetTag == null) {
-                throw new IOException("No definition for crucial exif tag: "
-                        + ExifInterface.TAG_STRIP_OFFSETS);
-            }
-            ExifTag lengthTag = mInterface
-                    .buildUninitializedTag(ExifInterface.TAG_STRIP_BYTE_COUNTS);
-            if (lengthTag == null) {
-                throw new IOException("No definition for crucial exif tag: "
-                        + ExifInterface.TAG_STRIP_BYTE_COUNTS);
-            }
-            long[] lengths = new long[stripCount];
-            for (int i = 0; i < mExifData.getStripCount(); i++) {
-                lengths[i] = mExifData.getStrip(i).length;
-            }
-            lengthTag.setValue(lengths);
-            ifd1.setTag(offsetTag);
-            ifd1.setTag(lengthTag);
-            // Get rid of tags for compressed if they exist.
-            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT));
-            ifd1.removeTag(ExifInterface
-                    .getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH));
-        } else if (ifd1 != null) {
-            // Get rid of offset and length tags if there is no thumbnail.
-            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_OFFSETS));
-            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_BYTE_COUNTS));
-            ifd1.removeTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT));
-            ifd1.removeTag(ExifInterface
-                    .getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH));
-        }
-    }
-
-    private int calculateAllOffset() {
-        int offset = TIFF_HEADER_SIZE;
-        IfdData ifd0 = mExifData.getIfdData(IfdId.TYPE_IFD_0);
-        offset = calculateOffsetOfIfd(ifd0, offset);
-        ifd0.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_EXIF_IFD)).setValue(offset);
-
-        IfdData exifIfd = mExifData.getIfdData(IfdId.TYPE_IFD_EXIF);
-        offset = calculateOffsetOfIfd(exifIfd, offset);
-
-        IfdData interIfd = mExifData.getIfdData(IfdId.TYPE_IFD_INTEROPERABILITY);
-        if (interIfd != null) {
-            exifIfd.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_INTEROPERABILITY_IFD))
-                    .setValue(offset);
-            offset = calculateOffsetOfIfd(interIfd, offset);
-        }
-
-        IfdData gpsIfd = mExifData.getIfdData(IfdId.TYPE_IFD_GPS);
-        if (gpsIfd != null) {
-            ifd0.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_GPS_IFD)).setValue(offset);
-            offset = calculateOffsetOfIfd(gpsIfd, offset);
-        }
-
-        IfdData ifd1 = mExifData.getIfdData(IfdId.TYPE_IFD_1);
-        if (ifd1 != null) {
-            ifd0.setOffsetToNextIfd(offset);
-            offset = calculateOffsetOfIfd(ifd1, offset);
-        }
-
-        // thumbnail
-        if (mExifData.hasCompressedThumbnail()) {
-            ifd1.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT))
-                    .setValue(offset);
-            offset += mExifData.getCompressedThumbnail().length;
-        } else if (mExifData.hasUncompressedStrip()) {
-            int stripCount = mExifData.getStripCount();
-            long[] offsets = new long[stripCount];
-            for (int i = 0; i < mExifData.getStripCount(); i++) {
-                offsets[i] = offset;
-                offset += mExifData.getStrip(i).length;
-            }
-            ifd1.getTag(ExifInterface.getTrueTagKey(ExifInterface.TAG_STRIP_OFFSETS)).setValue(
-                    offsets);
-        }
-        return offset;
-    }
-
-    static void writeTagValue(ExifTag tag, OrderedDataOutputStream dataOutputStream)
-            throws IOException {
-        switch (tag.getDataType()) {
-            case ExifTag.TYPE_ASCII:
-                byte[] buf = tag.getStringByte();
-                if (buf.length == tag.getComponentCount()) {
-                    buf[buf.length - 1] = 0;
-                    dataOutputStream.write(buf);
-                } else {
-                    dataOutputStream.write(buf);
-                    dataOutputStream.write(0);
-                }
-                break;
-            case ExifTag.TYPE_LONG:
-            case ExifTag.TYPE_UNSIGNED_LONG:
-                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                    dataOutputStream.writeInt((int) tag.getValueAt(i));
-                }
-                break;
-            case ExifTag.TYPE_RATIONAL:
-            case ExifTag.TYPE_UNSIGNED_RATIONAL:
-                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                    dataOutputStream.writeRational(tag.getRational(i));
-                }
-                break;
-            case ExifTag.TYPE_UNDEFINED:
-            case ExifTag.TYPE_UNSIGNED_BYTE:
-                buf = new byte[tag.getComponentCount()];
-                tag.getBytes(buf);
-                dataOutputStream.write(buf);
-                break;
-            case ExifTag.TYPE_UNSIGNED_SHORT:
-                for (int i = 0, n = tag.getComponentCount(); i < n; i++) {
-                    dataOutputStream.writeShort((short) tag.getValueAt(i));
-                }
-                break;
-        }
-    }
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifParser.java b/imagepicker/src/main/java/com/android/mms/exif/ExifParser.java
deleted file mode 100644
index 44cddce..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifParser.java
+++ /dev/null
@@ -1,919 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import com.android.mms.LogTag;
-
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
-/**
- * This class provides a low-level EXIF parsing API. Given a JPEG format
- * InputStream, the caller can request which IFD's to read via
- * {@link #parse(InputStream, int)} with given options.
- * <p>
- * Below is an example of getting EXIF data from IFD 0 and EXIF IFD using the
- * parser.
- *
- * <pre>
- * void parse() {
- *     ExifParser parser = ExifParser.parse(mImageInputStream,
- *             ExifParser.OPTION_IFD_0 | ExifParser.OPTIONS_IFD_EXIF);
- *     int event = parser.next();
- *     while (event != ExifParser.EVENT_END) {
- *         switch (event) {
- *             case ExifParser.EVENT_START_OF_IFD:
- *                 break;
- *             case ExifParser.EVENT_NEW_TAG:
- *                 ExifTag tag = parser.getTag();
- *                 if (!tag.hasValue()) {
- *                     parser.registerForTagValue(tag);
- *                 } else {
- *                     processTag(tag);
- *                 }
- *                 break;
- *             case ExifParser.EVENT_VALUE_OF_REGISTERED_TAG:
- *                 tag = parser.getTag();
- *                 if (tag.getDataType() != ExifTag.TYPE_UNDEFINED) {
- *                     processTag(tag);
- *                 }
- *                 break;
- *         }
- *         event = parser.next();
- *     }
- * }
- *
- * void processTag(ExifTag tag) {
- *     // process the tag as you like.
- * }
- * </pre>
- */
-public class ExifParser {
-    private static final boolean LOGV = false;
-    private static final String TAG = LogTag.TAG;
-    /**
-     * When the parser reaches a new IFD area. Call {@link #getCurrentIfd()} to
-     * know which IFD we are in.
-     */
-    public static final int EVENT_START_OF_IFD = 0;
-    /**
-     * When the parser reaches a new tag. Call {@link #getTag()}to get the
-     * corresponding tag.
-     */
-    public static final int EVENT_NEW_TAG = 1;
-    /**
-     * When the parser reaches the value area of tag that is registered by
-     * {@link #registerForTagValue(ExifTag)} previously. Call {@link #getTag()}
-     * to get the corresponding tag.
-     */
-    public static final int EVENT_VALUE_OF_REGISTERED_TAG = 2;
-
-    /**
-     * When the parser reaches the compressed image area.
-     */
-    public static final int EVENT_COMPRESSED_IMAGE = 3;
-    /**
-     * When the parser reaches the uncompressed image strip. Call
-     * {@link #getStripIndex()} to get the index of the strip.
-     *
-     * @see #getStripIndex()
-     * @see #getStripCount()
-     */
-    public static final int EVENT_UNCOMPRESSED_STRIP = 4;
-    /**
-     * When there is nothing more to parse.
-     */
-    public static final int EVENT_END = 5;
-
-    /**
-     * Option bit to request to parse IFD0.
-     */
-    public static final int OPTION_IFD_0 = 1 << 0;
-    /**
-     * Option bit to request to parse IFD1.
-     */
-    public static final int OPTION_IFD_1 = 1 << 1;
-    /**
-     * Option bit to request to parse Exif-IFD.
-     */
-    public static final int OPTION_IFD_EXIF = 1 << 2;
-    /**
-     * Option bit to request to parse GPS-IFD.
-     */
-    public static final int OPTION_IFD_GPS = 1 << 3;
-    /**
-     * Option bit to request to parse Interoperability-IFD.
-     */
-    public static final int OPTION_IFD_INTEROPERABILITY = 1 << 4;
-    /**
-     * Option bit to request to parse thumbnail.
-     */
-    public static final int OPTION_THUMBNAIL = 1 << 5;
-
-    protected static final int EXIF_HEADER = 0x45786966; // EXIF header "Exif"
-    protected static final short EXIF_HEADER_TAIL = (short) 0x0000; // EXIF header in APP1
-
-    // TIFF header
-    protected static final short LITTLE_ENDIAN_TAG = (short) 0x4949; // "II"
-    protected static final short BIG_ENDIAN_TAG = (short) 0x4d4d; // "MM"
-    protected static final short TIFF_HEADER_TAIL = 0x002A;
-
-    protected static final int TAG_SIZE = 12;
-    protected static final int OFFSET_SIZE = 2;
-
-    private static final Charset US_ASCII = StandardCharsets.US_ASCII;
-
-    protected static final int DEFAULT_IFD0_OFFSET = 8;
-
-    private final CountedDataInputStream mTiffStream;
-    private final int mOptions;
-    private int mIfdStartOffset = 0;
-    private int mNumOfTagInIfd = 0;
-    private int mIfdType;
-    private ExifTag mTag;
-    private ImageEvent mImageEvent;
-    private int mStripCount;
-    private ExifTag mStripSizeTag;
-    private ExifTag mJpegSizeTag;
-    private boolean mNeedToParseOffsetsInCurrentIfd;
-    private boolean mContainExifData = false;
-    private int mApp1End;
-    private int mOffsetToApp1EndFromSOF = 0;
-    private byte[] mDataAboveIfd0;
-    private int mIfd0Position;
-    private int mTiffStartPosition;
-    private final ExifInterface mInterface;
-
-    private static final short TAG_EXIF_IFD = ExifInterface
-            .getTrueTagKey(ExifInterface.TAG_EXIF_IFD);
-    private static final short TAG_GPS_IFD = ExifInterface.getTrueTagKey(ExifInterface.TAG_GPS_IFD);
-    private static final short TAG_INTEROPERABILITY_IFD = ExifInterface
-            .getTrueTagKey(ExifInterface.TAG_INTEROPERABILITY_IFD);
-    private static final short TAG_JPEG_INTERCHANGE_FORMAT = ExifInterface
-            .getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT);
-    private static final short TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = ExifInterface
-            .getTrueTagKey(ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
-    private static final short TAG_STRIP_OFFSETS = ExifInterface
-            .getTrueTagKey(ExifInterface.TAG_STRIP_OFFSETS);
-    private static final short TAG_STRIP_BYTE_COUNTS = ExifInterface
-            .getTrueTagKey(ExifInterface.TAG_STRIP_BYTE_COUNTS);
-
-    private final TreeMap<Integer, Object> mCorrespondingEvent = new TreeMap<Integer, Object>();
-
-    private boolean isIfdRequested(int ifdType) {
-        switch (ifdType) {
-            case IfdId.TYPE_IFD_0:
-                return (mOptions & OPTION_IFD_0) != 0;
-            case IfdId.TYPE_IFD_1:
-                return (mOptions & OPTION_IFD_1) != 0;
-            case IfdId.TYPE_IFD_EXIF:
-                return (mOptions & OPTION_IFD_EXIF) != 0;
-            case IfdId.TYPE_IFD_GPS:
-                return (mOptions & OPTION_IFD_GPS) != 0;
-            case IfdId.TYPE_IFD_INTEROPERABILITY:
-                return (mOptions & OPTION_IFD_INTEROPERABILITY) != 0;
-        }
-        return false;
-    }
-
-    private boolean isThumbnailRequested() {
-        return (mOptions & OPTION_THUMBNAIL) != 0;
-    }
-
-    private ExifParser(InputStream inputStream, int options, ExifInterface iRef)
-            throws IOException, ExifInvalidFormatException {
-        if (inputStream == null) {
-            throw new IOException("Null argument inputStream to ExifParser");
-        }
-        if (LOGV) {
-            Log.v(TAG, "Reading exif...");
-        }
-        mInterface = iRef;
-        mContainExifData = seekTiffData(inputStream);
-        mTiffStream = new CountedDataInputStream(inputStream);
-        mOptions = options;
-        if (!mContainExifData) {
-            return;
-        }
-
-        parseTiffHeader();
-        long offset = mTiffStream.readUnsignedInt();
-        if (offset > Integer.MAX_VALUE) {
-            throw new ExifInvalidFormatException("Invalid offset " + offset);
-        }
-        mIfd0Position = (int) offset;
-        mIfdType = IfdId.TYPE_IFD_0;
-        if (isIfdRequested(IfdId.TYPE_IFD_0) || needToParseOffsetsInCurrentIfd()) {
-            registerIfd(IfdId.TYPE_IFD_0, offset);
-            if (offset != DEFAULT_IFD0_OFFSET) {
-                mDataAboveIfd0 = new byte[(int) offset - DEFAULT_IFD0_OFFSET];
-                read(mDataAboveIfd0);
-            }
-        }
-    }
-
-    /**
-     * Parses the the given InputStream with the given options
-     *
-     * @exception IOException
-     * @exception ExifInvalidFormatException
-     */
-    protected static ExifParser parse(InputStream inputStream, int options, ExifInterface iRef)
-            throws IOException, ExifInvalidFormatException {
-        return new ExifParser(inputStream, options, iRef);
-    }
-
-    /**
-     * Parses the the given InputStream with default options; that is, every IFD
-     * and thumbnaill will be parsed.
-     *
-     * @exception IOException
-     * @exception ExifInvalidFormatException
-     * @see #parse(InputStream, int)
-     */
-    protected static ExifParser parse(InputStream inputStream, ExifInterface iRef)
-            throws IOException, ExifInvalidFormatException {
-        return new ExifParser(inputStream, OPTION_IFD_0 | OPTION_IFD_1
-                | OPTION_IFD_EXIF | OPTION_IFD_GPS | OPTION_IFD_INTEROPERABILITY
-                | OPTION_THUMBNAIL, iRef);
-    }
-
-    /**
-     * Moves the parser forward and returns the next parsing event
-     *
-     * @exception IOException
-     * @exception ExifInvalidFormatException
-     * @see #EVENT_START_OF_IFD
-     * @see #EVENT_NEW_TAG
-     * @see #EVENT_VALUE_OF_REGISTERED_TAG
-     * @see #EVENT_COMPRESSED_IMAGE
-     * @see #EVENT_UNCOMPRESSED_STRIP
-     * @see #EVENT_END
-     */
-    protected int next() throws IOException, ExifInvalidFormatException {
-        if (!mContainExifData) {
-            return EVENT_END;
-        }
-        int offset = mTiffStream.getReadByteCount();
-        int endOfTags = mIfdStartOffset + OFFSET_SIZE + TAG_SIZE * mNumOfTagInIfd;
-        if (offset < endOfTags) {
-            mTag = readTag();
-            if (mTag == null) {
-                return next();
-            }
-            if (mNeedToParseOffsetsInCurrentIfd) {
-                checkOffsetOrImageTag(mTag);
-            }
-            return EVENT_NEW_TAG;
-        } else if (offset == endOfTags) {
-            // There is a link to ifd1 at the end of ifd0
-            if (mIfdType == IfdId.TYPE_IFD_0) {
-                long ifdOffset = readUnsignedLong();
-                if (isIfdRequested(IfdId.TYPE_IFD_1) || isThumbnailRequested()) {
-                    if (ifdOffset != 0) {
-                        registerIfd(IfdId.TYPE_IFD_1, ifdOffset);
-                    }
-                }
-            } else {
-                int offsetSize = 4;
-                // Some camera models use invalid length of the offset
-                if (mCorrespondingEvent.size() > 0) {
-                    offsetSize = mCorrespondingEvent.firstEntry().getKey() -
-                            mTiffStream.getReadByteCount();
-                }
-                if (offsetSize < 4) {
-                    Log.w(TAG, "Invalid size of link to next IFD: " + offsetSize);
-                } else {
-                    long ifdOffset = readUnsignedLong();
-                    if (ifdOffset != 0) {
-                        Log.w(TAG, "Invalid link to next IFD: " + ifdOffset);
-                    }
-                }
-            }
-        }
-        while (mCorrespondingEvent.size() != 0) {
-            Entry<Integer, Object> entry = mCorrespondingEvent.pollFirstEntry();
-            Object event = entry.getValue();
-            try {
-                skipTo(entry.getKey());
-            } catch (IOException e) {
-                Log.w(TAG, "Failed to skip to data at: " + entry.getKey() +
-                        " for " + event.getClass().getName() + ", the file may be broken.");
-                continue;
-            }
-            if (event instanceof IfdEvent) {
-                mIfdType = ((IfdEvent) event).ifd;
-                mNumOfTagInIfd = mTiffStream.readUnsignedShort();
-                mIfdStartOffset = entry.getKey();
-
-                if (mNumOfTagInIfd * TAG_SIZE + mIfdStartOffset + OFFSET_SIZE > mApp1End) {
-                    Log.w(TAG, "Invalid size of IFD " + mIfdType);
-                    return EVENT_END;
-                }
-
-                mNeedToParseOffsetsInCurrentIfd = needToParseOffsetsInCurrentIfd();
-                if (((IfdEvent) event).isRequested) {
-                    return EVENT_START_OF_IFD;
-                } else {
-                    skipRemainingTagsInCurrentIfd();
-                }
-            } else if (event instanceof ImageEvent) {
-                mImageEvent = (ImageEvent) event;
-                return mImageEvent.type;
-            } else {
-                ExifTagEvent tagEvent = (ExifTagEvent) event;
-                mTag = tagEvent.tag;
-                if (mTag.getDataType() != ExifTag.TYPE_UNDEFINED) {
-                    readFullTagValue(mTag);
-                    checkOffsetOrImageTag(mTag);
-                }
-                if (tagEvent.isRequested) {
-                    return EVENT_VALUE_OF_REGISTERED_TAG;
-                }
-            }
-        }
-        return EVENT_END;
-    }
-
-    /**
-     * Skips the tags area of current IFD, if the parser is not in the tag area,
-     * nothing will happen.
-     *
-     * @throws IOException
-     * @throws ExifInvalidFormatException
-     */
-    protected void skipRemainingTagsInCurrentIfd() throws IOException, ExifInvalidFormatException {
-        int endOfTags = mIfdStartOffset + OFFSET_SIZE + TAG_SIZE * mNumOfTagInIfd;
-        int offset = mTiffStream.getReadByteCount();
-        if (offset > endOfTags) {
-            return;
-        }
-        if (mNeedToParseOffsetsInCurrentIfd) {
-            while (offset < endOfTags) {
-                mTag = readTag();
-                offset += TAG_SIZE;
-                if (mTag == null) {
-                    continue;
-                }
-                checkOffsetOrImageTag(mTag);
-            }
-        } else {
-            skipTo(endOfTags);
-        }
-        long ifdOffset = readUnsignedLong();
-        // For ifd0, there is a link to ifd1 in the end of all tags
-        if (mIfdType == IfdId.TYPE_IFD_0
-                && (isIfdRequested(IfdId.TYPE_IFD_1) || isThumbnailRequested())) {
-            if (ifdOffset > 0) {
-                registerIfd(IfdId.TYPE_IFD_1, ifdOffset);
-            }
-        }
-    }
-
-    private boolean needToParseOffsetsInCurrentIfd() {
-        switch (mIfdType) {
-            case IfdId.TYPE_IFD_0:
-                return isIfdRequested(IfdId.TYPE_IFD_EXIF) || isIfdRequested(IfdId.TYPE_IFD_GPS)
-                        || isIfdRequested(IfdId.TYPE_IFD_INTEROPERABILITY)
-                        || isIfdRequested(IfdId.TYPE_IFD_1);
-            case IfdId.TYPE_IFD_1:
-                return isThumbnailRequested();
-            case IfdId.TYPE_IFD_EXIF:
-                // The offset to interoperability IFD is located in Exif IFD
-                return isIfdRequested(IfdId.TYPE_IFD_INTEROPERABILITY);
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * If {@link #next()} return {@link #EVENT_NEW_TAG} or
-     * {@link #EVENT_VALUE_OF_REGISTERED_TAG}, call this function to get the
-     * corresponding tag.
-     * <p>
-     * For {@link #EVENT_NEW_TAG}, the tag may not contain the value if the size
-     * of the value is greater than 4 bytes. One should call
-     * {@link ExifTag#hasValue()} to check if the tag contains value. If there
-     * is no value,call {@link #registerForTagValue(ExifTag)} to have the parser
-     * emit {@link #EVENT_VALUE_OF_REGISTERED_TAG} when it reaches the area
-     * pointed by the offset.
-     * <p>
-     * When {@link #EVENT_VALUE_OF_REGISTERED_TAG} is emitted, the value of the
-     * tag will have already been read except for tags of undefined type. For
-     * tags of undefined type, call one of the read methods to get the value.
-     *
-     * @see #registerForTagValue(ExifTag)
-     * @see #read(byte[])
-     * @see #read(byte[], int, int)
-     * @see #readLong()
-     * @see #readRational()
-     * @see #readString(int)
-     * @see #readString(int, Charset)
-     */
-    protected ExifTag getTag() {
-        return mTag;
-    }
-
-    /**
-     * Gets number of tags in the current IFD area.
-     */
-    protected int getTagCountInCurrentIfd() {
-        return mNumOfTagInIfd;
-    }
-
-    /**
-     * Gets the ID of current IFD.
-     *
-     * @see IfdId#TYPE_IFD_0
-     * @see IfdId#TYPE_IFD_1
-     * @see IfdId#TYPE_IFD_GPS
-     * @see IfdId#TYPE_IFD_INTEROPERABILITY
-     * @see IfdId#TYPE_IFD_EXIF
-     */
-    protected int getCurrentIfd() {
-        return mIfdType;
-    }
-
-    /**
-     * When receiving {@link #EVENT_UNCOMPRESSED_STRIP}, call this function to
-     * get the index of this strip.
-     *
-     * @see #getStripCount()
-     */
-    protected int getStripIndex() {
-        return mImageEvent.stripIndex;
-    }
-
-    /**
-     * When receiving {@link #EVENT_UNCOMPRESSED_STRIP}, call this function to
-     * get the number of strip data.
-     *
-     * @see #getStripIndex()
-     */
-    protected int getStripCount() {
-        return mStripCount;
-    }
-
-    /**
-     * When receiving {@link #EVENT_UNCOMPRESSED_STRIP}, call this function to
-     * get the strip size.
-     */
-    protected int getStripSize() {
-        if (mStripSizeTag == null)
-            return 0;
-        return (int) mStripSizeTag.getValueAt(0);
-    }
-
-    /**
-     * When receiving {@link #EVENT_COMPRESSED_IMAGE}, call this function to get
-     * the image data size.
-     */
-    protected int getCompressedImageSize() {
-        if (mJpegSizeTag == null) {
-            return 0;
-        }
-        return (int) mJpegSizeTag.getValueAt(0);
-    }
-
-    private void skipTo(int offset) throws IOException {
-        mTiffStream.skipTo(offset);
-        while (!mCorrespondingEvent.isEmpty() && mCorrespondingEvent.firstKey() < offset) {
-            mCorrespondingEvent.pollFirstEntry();
-        }
-    }
-
-    /**
-     * When getting {@link #EVENT_NEW_TAG} in the tag area of IFD, the tag may
-     * not contain the value if the size of the value is greater than 4 bytes.
-     * When the value is not available here, call this method so that the parser
-     * will emit {@link #EVENT_VALUE_OF_REGISTERED_TAG} when it reaches the area
-     * where the value is located.
-     *
-     * @see #EVENT_VALUE_OF_REGISTERED_TAG
-     */
-    protected void registerForTagValue(ExifTag tag) {
-        if (tag.getOffset() >= mTiffStream.getReadByteCount()) {
-            mCorrespondingEvent.put(tag.getOffset(), new ExifTagEvent(tag, true));
-        }
-    }
-
-    private void registerIfd(int ifdType, long offset) {
-        // Cast unsigned int to int since the offset is always smaller
-        // than the size of APP1 (65536)
-        mCorrespondingEvent.put((int) offset, new IfdEvent(ifdType, isIfdRequested(ifdType)));
-    }
-
-    private void registerCompressedImage(long offset) {
-        mCorrespondingEvent.put((int) offset, new ImageEvent(EVENT_COMPRESSED_IMAGE));
-    }
-
-    private void registerUncompressedStrip(int stripIndex, long offset) {
-        mCorrespondingEvent.put((int) offset, new ImageEvent(EVENT_UNCOMPRESSED_STRIP
-                , stripIndex));
-    }
-
-    private ExifTag readTag() throws IOException, ExifInvalidFormatException {
-        short tagId = mTiffStream.readShort();
-        short dataFormat = mTiffStream.readShort();
-        long numOfComp = mTiffStream.readUnsignedInt();
-        if (numOfComp > Integer.MAX_VALUE) {
-            throw new ExifInvalidFormatException(
-                    "Number of component is larger then Integer.MAX_VALUE");
-        }
-        // Some invalid image file contains invalid data type. Ignore those tags
-        if (!ExifTag.isValidType(dataFormat)) {
-            Log.w(TAG, String.format("Tag %04x: Invalid data type %d", tagId, dataFormat));
-            mTiffStream.skip(4);
-            return null;
-        }
-        // TODO: handle numOfComp overflow
-        ExifTag tag = new ExifTag(tagId, dataFormat, (int) numOfComp, mIfdType,
-                ((int) numOfComp) != ExifTag.SIZE_UNDEFINED);
-        int dataSize = tag.getDataSize();
-        if (dataSize > 4) {
-            long offset = mTiffStream.readUnsignedInt();
-            if (offset > Integer.MAX_VALUE) {
-                throw new ExifInvalidFormatException(
-                        "offset is larger then Integer.MAX_VALUE");
-            }
-            // Some invalid images put some undefined data before IFD0.
-            // Read the data here.
-            if ((offset < mIfd0Position) && (dataFormat == ExifTag.TYPE_UNDEFINED)) {
-                byte[] buf = new byte[(int) numOfComp];
-                System.arraycopy(mDataAboveIfd0, (int) offset - DEFAULT_IFD0_OFFSET,
-                        buf, 0, (int) numOfComp);
-                tag.setValue(buf);
-            } else {
-                tag.setOffset((int) offset);
-            }
-        } else {
-            boolean defCount = tag.hasDefinedCount();
-            // Set defined count to 0 so we can add \0 to non-terminated strings
-            tag.setHasDefinedCount(false);
-            // Read value
-            readFullTagValue(tag);
-            tag.setHasDefinedCount(defCount);
-            mTiffStream.skip(4 - dataSize);
-            // Set the offset to the position of value.
-            tag.setOffset(mTiffStream.getReadByteCount() - 4);
-        }
-        return tag;
-    }
-
-    /**
-     * Check the tag, if the tag is one of the offset tag that points to the IFD
-     * or image the caller is interested in, register the IFD or image.
-     */
-    private void checkOffsetOrImageTag(ExifTag tag) {
-        // Some invalid formattd image contains tag with 0 size.
-        if (tag.getComponentCount() == 0) {
-            return;
-        }
-        short tid = tag.getTagId();
-        int ifd = tag.getIfd();
-        if (tid == TAG_EXIF_IFD && checkAllowed(ifd, ExifInterface.TAG_EXIF_IFD)) {
-            if (isIfdRequested(IfdId.TYPE_IFD_EXIF)
-                    || isIfdRequested(IfdId.TYPE_IFD_INTEROPERABILITY)) {
-                registerIfd(IfdId.TYPE_IFD_EXIF, tag.getValueAt(0));
-            }
-        } else if (tid == TAG_GPS_IFD && checkAllowed(ifd, ExifInterface.TAG_GPS_IFD)) {
-            if (isIfdRequested(IfdId.TYPE_IFD_GPS)) {
-                registerIfd(IfdId.TYPE_IFD_GPS, tag.getValueAt(0));
-            }
-        } else if (tid == TAG_INTEROPERABILITY_IFD
-                && checkAllowed(ifd, ExifInterface.TAG_INTEROPERABILITY_IFD)) {
-            if (isIfdRequested(IfdId.TYPE_IFD_INTEROPERABILITY)) {
-                registerIfd(IfdId.TYPE_IFD_INTEROPERABILITY, tag.getValueAt(0));
-            }
-        } else if (tid == TAG_JPEG_INTERCHANGE_FORMAT
-                && checkAllowed(ifd, ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT)) {
-            if (isThumbnailRequested()) {
-                registerCompressedImage(tag.getValueAt(0));
-            }
-        } else if (tid == TAG_JPEG_INTERCHANGE_FORMAT_LENGTH
-                && checkAllowed(ifd, ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH)) {
-            if (isThumbnailRequested()) {
-                mJpegSizeTag = tag;
-            }
-        } else if (tid == TAG_STRIP_OFFSETS && checkAllowed(ifd, ExifInterface.TAG_STRIP_OFFSETS)) {
-            if (isThumbnailRequested()) {
-                if (tag.hasValue()) {
-                    for (int i = 0; i < tag.getComponentCount(); i++) {
-                        if (tag.getDataType() == ExifTag.TYPE_UNSIGNED_SHORT) {
-                            registerUncompressedStrip(i, tag.getValueAt(i));
-                        } else {
-                            registerUncompressedStrip(i, tag.getValueAt(i));
-                        }
-                    }
-                } else {
-                    mCorrespondingEvent.put(tag.getOffset(), new ExifTagEvent(tag, false));
-                }
-            }
-        } else if (tid == TAG_STRIP_BYTE_COUNTS
-                && checkAllowed(ifd, ExifInterface.TAG_STRIP_BYTE_COUNTS)
-                &&isThumbnailRequested() && tag.hasValue()) {
-            mStripSizeTag = tag;
-        }
-    }
-
-    private boolean checkAllowed(int ifd, int tagId) {
-        int info = mInterface.getTagInfo().get(tagId);
-        if (info == ExifInterface.DEFINITION_NULL) {
-            return false;
-        }
-        return ExifInterface.isIfdAllowed(info, ifd);
-    }
-
-    protected void readFullTagValue(ExifTag tag) throws IOException {
-        // Some invalid images contains tags with wrong size, check it here
-        short type = tag.getDataType();
-        if (type == ExifTag.TYPE_ASCII || type == ExifTag.TYPE_UNDEFINED ||
-                type == ExifTag.TYPE_UNSIGNED_BYTE) {
-            int size = tag.getComponentCount();
-            if (mCorrespondingEvent.size() > 0) {
-                if (mCorrespondingEvent.firstEntry().getKey() < mTiffStream.getReadByteCount()
-                        + size) {
-                    Object event = mCorrespondingEvent.firstEntry().getValue();
-                    if (event instanceof ImageEvent) {
-                        // Tag value overlaps thumbnail, ignore thumbnail.
-                        Log.w(TAG, "Thumbnail overlaps value for tag: \n" + tag.toString());
-                        Entry<Integer, Object> entry = mCorrespondingEvent.pollFirstEntry();
-                        Log.w(TAG, "Invalid thumbnail offset: " + entry.getKey());
-                    } else {
-                        // Tag value overlaps another tag, shorten count
-                        if (event instanceof IfdEvent) {
-                            Log.w(TAG, "Ifd " + ((IfdEvent) event).ifd
-                                    + " overlaps value for tag: \n" + tag.toString());
-                        } else if (event instanceof ExifTagEvent) {
-                            Log.w(TAG, "Tag value for tag: \n"
-                                    + ((ExifTagEvent) event).tag.toString()
-                                    + " overlaps value for tag: \n" + tag.toString());
-                        }
-                        size = mCorrespondingEvent.firstEntry().getKey()
-                                - mTiffStream.getReadByteCount();
-                        Log.w(TAG, "Invalid size of tag: \n" + tag.toString()
-                                + " setting count to: " + size);
-                        tag.forceSetComponentCount(size);
-                    }
-                }
-            }
-        }
-        switch (tag.getDataType()) {
-            case ExifTag.TYPE_UNSIGNED_BYTE:
-            case ExifTag.TYPE_UNDEFINED: {
-                byte[] buf = new byte[tag.getComponentCount()];
-                read(buf);
-                tag.setValue(buf);
-            }
-                break;
-            case ExifTag.TYPE_ASCII:
-                tag.setValue(readString(tag.getComponentCount()));
-                break;
-            case ExifTag.TYPE_UNSIGNED_LONG: {
-                long[] value = new long[tag.getComponentCount()];
-                for (int i = 0, n = value.length; i < n; i++) {
-                    value[i] = readUnsignedLong();
-                }
-                tag.setValue(value);
-            }
-                break;
-            case ExifTag.TYPE_UNSIGNED_RATIONAL: {
-                Rational[] value = new Rational[tag.getComponentCount()];
-                for (int i = 0, n = value.length; i < n; i++) {
-                    value[i] = readUnsignedRational();
-                }
-                tag.setValue(value);
-            }
-                break;
-            case ExifTag.TYPE_UNSIGNED_SHORT: {
-                int[] value = new int[tag.getComponentCount()];
-                for (int i = 0, n = value.length; i < n; i++) {
-                    value[i] = readUnsignedShort();
-                }
-                tag.setValue(value);
-            }
-                break;
-            case ExifTag.TYPE_LONG: {
-                int[] value = new int[tag.getComponentCount()];
-                for (int i = 0, n = value.length; i < n; i++) {
-                    value[i] = readLong();
-                }
-                tag.setValue(value);
-            }
-                break;
-            case ExifTag.TYPE_RATIONAL: {
-                Rational[] value = new Rational[tag.getComponentCount()];
-                for (int i = 0, n = value.length; i < n; i++) {
-                    value[i] = readRational();
-                }
-                tag.setValue(value);
-            }
-                break;
-        }
-        if (LOGV) {
-            Log.v(TAG, "\n" + tag.toString());
-        }
-    }
-
-    private void parseTiffHeader() throws IOException,
-            ExifInvalidFormatException {
-        short byteOrder = mTiffStream.readShort();
-        if (LITTLE_ENDIAN_TAG == byteOrder) {
-            mTiffStream.setByteOrder(ByteOrder.LITTLE_ENDIAN);
-        } else if (BIG_ENDIAN_TAG == byteOrder) {
-            mTiffStream.setByteOrder(ByteOrder.BIG_ENDIAN);
-        } else {
-            throw new ExifInvalidFormatException("Invalid TIFF header");
-        }
-
-        if (mTiffStream.readShort() != TIFF_HEADER_TAIL) {
-            throw new ExifInvalidFormatException("Invalid TIFF header");
-        }
-    }
-
-    private boolean seekTiffData(InputStream inputStream) throws IOException,
-            ExifInvalidFormatException {
-        CountedDataInputStream dataStream = new CountedDataInputStream(inputStream);
-        if (dataStream.readShort() != JpegHeader.SOI) {
-            throw new ExifInvalidFormatException("Invalid JPEG format");
-        }
-
-        short marker = dataStream.readShort();
-        while (marker != JpegHeader.EOI
-                && !JpegHeader.isSofMarker(marker)) {
-            int length = dataStream.readUnsignedShort();
-            // Some invalid formatted image contains multiple APP1,
-            // try to find the one with Exif data.
-            if (marker == JpegHeader.APP1) {
-                int header = 0;
-                short headerTail = 0;
-                if (length >= 8) {
-                    header = dataStream.readInt();
-                    headerTail = dataStream.readShort();
-                    length -= 6;
-                    if (header == EXIF_HEADER && headerTail == EXIF_HEADER_TAIL) {
-                        mTiffStartPosition = dataStream.getReadByteCount();
-                        mApp1End = length;
-                        mOffsetToApp1EndFromSOF = mTiffStartPosition + mApp1End;
-                        return true;
-                    }
-                }
-            }
-            if (length < 2 || (length - 2) != dataStream.skip(length - 2)) {
-                Log.w(TAG, "Invalid JPEG format.");
-                return false;
-            }
-            marker = dataStream.readShort();
-        }
-        return false;
-    }
-
-    protected int getOffsetToExifEndFromSOF() {
-        return mOffsetToApp1EndFromSOF;
-    }
-
-    protected int getTiffStartPosition() {
-        return mTiffStartPosition;
-    }
-
-    /**
-     * Reads bytes from the InputStream.
-     */
-    protected int read(byte[] buffer, int offset, int length) throws IOException {
-        return mTiffStream.read(buffer, offset, length);
-    }
-
-    /**
-     * Equivalent to read(buffer, 0, buffer.length).
-     */
-    protected int read(byte[] buffer) throws IOException {
-        return mTiffStream.read(buffer);
-    }
-
-    /**
-     * Reads a String from the InputStream with US-ASCII charset. The parser
-     * will read n bytes and convert it to ascii string. This is used for
-     * reading values of type {@link ExifTag#TYPE_ASCII}.
-     */
-    protected String readString(int n) throws IOException {
-        return readString(n, US_ASCII);
-    }
-
-    /**
-     * Reads a String from the InputStream with the given charset. The parser
-     * will read n bytes and convert it to string. This is used for reading
-     * values of type {@link ExifTag#TYPE_ASCII}.
-     */
-    protected String readString(int n, Charset charset) throws IOException {
-        if (n > 0) {
-            return mTiffStream.readString(n, charset);
-        } else {
-            return "";
-        }
-    }
-
-    /**
-     * Reads value of type {@link ExifTag#TYPE_UNSIGNED_SHORT} from the
-     * InputStream.
-     */
-    protected int readUnsignedShort() throws IOException {
-        return mTiffStream.readShort() & 0xffff;
-    }
-
-    /**
-     * Reads value of type {@link ExifTag#TYPE_UNSIGNED_LONG} from the
-     * InputStream.
-     */
-    protected long readUnsignedLong() throws IOException {
-        return readLong() & 0xffffffffL;
-    }
-
-    /**
-     * Reads value of type {@link ExifTag#TYPE_UNSIGNED_RATIONAL} from the
-     * InputStream.
-     */
-    protected Rational readUnsignedRational() throws IOException {
-        long nomi = readUnsignedLong();
-        long denomi = readUnsignedLong();
-        return new Rational(nomi, denomi);
-    }
-
-    /**
-     * Reads value of type {@link ExifTag#TYPE_LONG} from the InputStream.
-     */
-    protected int readLong() throws IOException {
-        return mTiffStream.readInt();
-    }
-
-    /**
-     * Reads value of type {@link ExifTag#TYPE_RATIONAL} from the InputStream.
-     */
-    protected Rational readRational() throws IOException {
-        int nomi = readLong();
-        int denomi = readLong();
-        return new Rational(nomi, denomi);
-    }
-
-    private static class ImageEvent {
-        int stripIndex;
-        int type;
-
-        ImageEvent(int type) {
-            this.stripIndex = 0;
-            this.type = type;
-        }
-
-        ImageEvent(int type, int stripIndex) {
-            this.type = type;
-            this.stripIndex = stripIndex;
-        }
-    }
-
-    private static class IfdEvent {
-        int ifd;
-        boolean isRequested;
-
-        IfdEvent(int ifd, boolean isInterestedIfd) {
-            this.ifd = ifd;
-            this.isRequested = isInterestedIfd;
-        }
-    }
-
-    private static class ExifTagEvent {
-        ExifTag tag;
-        boolean isRequested;
-
-        ExifTagEvent(ExifTag tag, boolean isRequireByUser) {
-            this.tag = tag;
-            this.isRequested = isRequireByUser;
-        }
-    }
-
-    /**
-     * Gets the byte order of the current InputStream.
-     */
-    protected ByteOrder getByteOrder() {
-        return mTiffStream.getByteOrder();
-    }
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifReader.java b/imagepicker/src/main/java/com/android/mms/exif/ExifReader.java
deleted file mode 100644
index b9ec878..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifReader.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import com.android.mms.LogTag;
-
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * This class reads the EXIF header of a JPEG file and stores it in
- * {@link ExifData}.
- */
-class ExifReader {
-    private static final String TAG = LogTag.TAG;
-
-    private final ExifInterface mInterface;
-
-    ExifReader(ExifInterface iRef) {
-        mInterface = iRef;
-    }
-
-    /**
-     * Parses the inputStream and and returns the EXIF data in an
-     * {@link ExifData}.
-     *
-     * @throws ExifInvalidFormatException
-     * @throws IOException
-     */
-    protected ExifData read(InputStream inputStream) throws ExifInvalidFormatException,
-            IOException {
-        ExifParser parser = ExifParser.parse(inputStream, mInterface);
-        ExifData exifData = new ExifData(parser.getByteOrder());
-        ExifTag tag = null;
-
-        int event = parser.next();
-        while (event != ExifParser.EVENT_END) {
-            switch (event) {
-                case ExifParser.EVENT_START_OF_IFD:
-                    exifData.addIfdData(new IfdData(parser.getCurrentIfd()));
-                    break;
-                case ExifParser.EVENT_NEW_TAG:
-                    tag = parser.getTag();
-                    if (!tag.hasValue()) {
-                        parser.registerForTagValue(tag);
-                    } else {
-                        exifData.getIfdData(tag.getIfd()).setTag(tag);
-                    }
-                    break;
-                case ExifParser.EVENT_VALUE_OF_REGISTERED_TAG:
-                    tag = parser.getTag();
-                    if (tag.getDataType() == ExifTag.TYPE_UNDEFINED) {
-                        parser.readFullTagValue(tag);
-                    }
-                    exifData.getIfdData(tag.getIfd()).setTag(tag);
-                    break;
-                case ExifParser.EVENT_COMPRESSED_IMAGE:
-                    byte[] buf = new byte[parser.getCompressedImageSize()];
-                    if (buf.length == parser.read(buf)) {
-                        exifData.setCompressedThumbnail(buf);
-                    } else {
-                        Log.w(TAG, "Failed to read the compressed thumbnail");
-                    }
-                    break;
-                case ExifParser.EVENT_UNCOMPRESSED_STRIP:
-                    buf = new byte[parser.getStripSize()];
-                    if (buf.length == parser.read(buf)) {
-                        exifData.setStripBytes(parser.getStripIndex(), buf);
-                    } else {
-                        Log.w(TAG, "Failed to read the strip bytes");
-                    }
-                    break;
-            }
-            event = parser.next();
-        }
-        return exifData;
-    }
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/ExifTag.java b/imagepicker/src/main/java/com/android/mms/exif/ExifTag.java
deleted file mode 100644
index 660c64f..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/ExifTag.java
+++ /dev/null
@@ -1,1009 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import androidx.annotation.NonNull;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-
-/**
- * This class stores information of an EXIF tag. For more information about
- * defined EXIF tags, please read the Jeita EXIF 2.2 standard. Tags should be
- * instantiated using {@link ExifInterface#buildTag}.
- *
- * @see ExifInterface
- */
-public class ExifTag {
-    /**
-     * The BYTE type in the EXIF standard. An 8-bit unsigned integer.
-     */
-    public static final short TYPE_UNSIGNED_BYTE = 1;
-    /**
-     * The ASCII type in the EXIF standard. An 8-bit byte containing one 7-bit
-     * ASCII code. The final byte is terminated with NULL.
-     */
-    public static final short TYPE_ASCII = 2;
-    /**
-     * The SHORT type in the EXIF standard. A 16-bit (2-byte) unsigned integer
-     */
-    public static final short TYPE_UNSIGNED_SHORT = 3;
-    /**
-     * The LONG type in the EXIF standard. A 32-bit (4-byte) unsigned integer
-     */
-    public static final short TYPE_UNSIGNED_LONG = 4;
-    /**
-     * The RATIONAL type of EXIF standard. It consists of two LONGs. The first
-     * one is the numerator and the second one expresses the denominator.
-     */
-    public static final short TYPE_UNSIGNED_RATIONAL = 5;
-    /**
-     * The UNDEFINED type in the EXIF standard. An 8-bit byte that can take any
-     * value depending on the field definition.
-     */
-    public static final short TYPE_UNDEFINED = 7;
-    /**
-     * The SLONG type in the EXIF standard. A 32-bit (4-byte) signed integer
-     * (2's complement notation).
-     */
-    public static final short TYPE_LONG = 9;
-    /**
-     * The SRATIONAL type of EXIF standard. It consists of two SLONGs. The first
-     * one is the numerator and the second one is the denominator.
-     */
-    public static final short TYPE_RATIONAL = 10;
-
-    private static final Charset US_ASCII = StandardCharsets.US_ASCII;
-    private static final int[] TYPE_TO_SIZE_MAP = new int[11];
-    private static final int UNSIGNED_SHORT_MAX = 65535;
-    private static final long UNSIGNED_LONG_MAX = 4294967295L;
-    private static final long LONG_MAX = Integer.MAX_VALUE;
-    private static final long LONG_MIN = Integer.MIN_VALUE;
-
-    static {
-        TYPE_TO_SIZE_MAP[TYPE_UNSIGNED_BYTE] = 1;
-        TYPE_TO_SIZE_MAP[TYPE_ASCII] = 1;
-        TYPE_TO_SIZE_MAP[TYPE_UNSIGNED_SHORT] = 2;
-        TYPE_TO_SIZE_MAP[TYPE_UNSIGNED_LONG] = 4;
-        TYPE_TO_SIZE_MAP[TYPE_UNSIGNED_RATIONAL] = 8;
-        TYPE_TO_SIZE_MAP[TYPE_UNDEFINED] = 1;
-        TYPE_TO_SIZE_MAP[TYPE_LONG] = 4;
-        TYPE_TO_SIZE_MAP[TYPE_RATIONAL] = 8;
-    }
-
-    static final int SIZE_UNDEFINED = 0;
-
-    // Exif TagId
-    private final short mTagId;
-    // Exif Tag Type
-    private final short mDataType;
-    // If tag has defined count
-    private boolean mHasDefinedDefaultComponentCount;
-    // Actual data count in tag (should be number of elements in value array)
-    private int mComponentCountActual;
-    // The ifd that this tag should be put in
-    private int mIfd;
-    // The value (array of elements of type Tag Type)
-    private Object mValue;
-    // Value offset in exif header.
-    private int mOffset;
-
-    private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("yyyy:MM:dd kk:mm:ss");
-
-    /**
-     * Returns true if the given IFD is a valid IFD.
-     */
-    public static boolean isValidIfd(int ifdId) {
-        return ifdId == IfdId.TYPE_IFD_0 || ifdId == IfdId.TYPE_IFD_1
-                || ifdId == IfdId.TYPE_IFD_EXIF || ifdId == IfdId.TYPE_IFD_INTEROPERABILITY
-                || ifdId == IfdId.TYPE_IFD_GPS;
-    }
-
-    /**
-     * Returns true if a given type is a valid tag type.
-     */
-    public static boolean isValidType(short type) {
-        return type == TYPE_UNSIGNED_BYTE || type == TYPE_ASCII ||
-                type == TYPE_UNSIGNED_SHORT || type == TYPE_UNSIGNED_LONG ||
-                type == TYPE_UNSIGNED_RATIONAL || type == TYPE_UNDEFINED ||
-                type == TYPE_LONG || type == TYPE_RATIONAL;
-    }
-
-    // Use builtTag in ExifInterface instead of constructor.
-    ExifTag(short tagId, short type, int componentCount, int ifd,
-            boolean hasDefinedComponentCount) {
-        mTagId = tagId;
-        mDataType = type;
-        mComponentCountActual = componentCount;
-        mHasDefinedDefaultComponentCount = hasDefinedComponentCount;
-        mIfd = ifd;
-        mValue = null;
-    }
-
-    /**
-     * Gets the element size of the given data type in bytes.
-     *
-     * @see #TYPE_ASCII
-     * @see #TYPE_LONG
-     * @see #TYPE_RATIONAL
-     * @see #TYPE_UNDEFINED
-     * @see #TYPE_UNSIGNED_BYTE
-     * @see #TYPE_UNSIGNED_LONG
-     * @see #TYPE_UNSIGNED_RATIONAL
-     * @see #TYPE_UNSIGNED_SHORT
-     */
-    public static int getElementSize(short type) {
-        return TYPE_TO_SIZE_MAP[type];
-    }
-
-    /**
-     * Returns the ID of the IFD this tag belongs to.
-     *
-     * @see IfdId#TYPE_IFD_0
-     * @see IfdId#TYPE_IFD_1
-     * @see IfdId#TYPE_IFD_EXIF
-     * @see IfdId#TYPE_IFD_GPS
-     * @see IfdId#TYPE_IFD_INTEROPERABILITY
-     */
-    public int getIfd() {
-        return mIfd;
-    }
-
-    protected void setIfd(int ifdId) {
-        mIfd = ifdId;
-    }
-
-    /**
-     * Gets the TID of this tag.
-     */
-    public short getTagId() {
-        return mTagId;
-    }
-
-    /**
-     * Gets the data type of this tag
-     *
-     * @see #TYPE_ASCII
-     * @see #TYPE_LONG
-     * @see #TYPE_RATIONAL
-     * @see #TYPE_UNDEFINED
-     * @see #TYPE_UNSIGNED_BYTE
-     * @see #TYPE_UNSIGNED_LONG
-     * @see #TYPE_UNSIGNED_RATIONAL
-     * @see #TYPE_UNSIGNED_SHORT
-     */
-    public short getDataType() {
-        return mDataType;
-    }
-
-    /**
-     * Gets the total data size in bytes of the value of this tag.
-     */
-    public int getDataSize() {
-        return getComponentCount() * getElementSize(getDataType());
-    }
-
-    /**
-     * Gets the component count of this tag.
-     */
-
-    // TODO: fix integer overflows with this
-    public int getComponentCount() {
-        return mComponentCountActual;
-    }
-
-    /**
-     * Sets the component count of this tag. Call this function before
-     * setValue() if the length of value does not match the component count.
-     */
-    protected void forceSetComponentCount(int count) {
-        mComponentCountActual = count;
-    }
-
-    /**
-     * Returns true if this ExifTag contains value; otherwise, this tag will
-     * contain an offset value that is determined when the tag is written.
-     */
-    public boolean hasValue() {
-        return mValue != null;
-    }
-
-    /**
-     * Sets integer values into this tag. This method should be used for tags of
-     * type {@link #TYPE_UNSIGNED_SHORT}. This method will fail if:
-     * <ul>
-     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_SHORT},
-     * {@link #TYPE_UNSIGNED_LONG}, or {@link #TYPE_LONG}.</li>
-     * <li>The value overflows.</li>
-     * <li>The value.length does NOT match the component count in the definition
-     * for this tag.</li>
-     * </ul>
-     */
-    public boolean setValue(int[] value) {
-        if (checkBadComponentCount(value.length)) {
-            return false;
-        }
-        if (mDataType != TYPE_UNSIGNED_SHORT && mDataType != TYPE_LONG &&
-                mDataType != TYPE_UNSIGNED_LONG) {
-            return false;
-        }
-        if (mDataType == TYPE_UNSIGNED_SHORT && checkOverflowForUnsignedShort(value)) {
-            return false;
-        } else if (mDataType == TYPE_UNSIGNED_LONG && checkOverflowForUnsignedLong(value)) {
-            return false;
-        }
-
-        long[] data = new long[value.length];
-        for (int i = 0; i < value.length; i++) {
-            data[i] = value[i];
-        }
-        mValue = data;
-        mComponentCountActual = value.length;
-        return true;
-    }
-
-    /**
-     * Sets integer value into this tag. This method should be used for tags of
-     * type {@link #TYPE_UNSIGNED_SHORT}, or {@link #TYPE_LONG}. This method
-     * will fail if:
-     * <ul>
-     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_SHORT},
-     * {@link #TYPE_UNSIGNED_LONG}, or {@link #TYPE_LONG}.</li>
-     * <li>The value overflows.</li>
-     * <li>The component count in the definition of this tag is not 1.</li>
-     * </ul>
-     */
-    public boolean setValue(int value) {
-        return setValue(new int[] {
-                value
-        });
-    }
-
-    /**
-     * Sets long values into this tag. This method should be used for tags of
-     * type {@link #TYPE_UNSIGNED_LONG}. This method will fail if:
-     * <ul>
-     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_LONG}.</li>
-     * <li>The value overflows.</li>
-     * <li>The value.length does NOT match the component count in the definition
-     * for this tag.</li>
-     * </ul>
-     */
-    public boolean setValue(long[] value) {
-        if (checkBadComponentCount(value.length) || mDataType != TYPE_UNSIGNED_LONG) {
-            return false;
-        }
-        if (checkOverflowForUnsignedLong(value)) {
-            return false;
-        }
-        mValue = value;
-        mComponentCountActual = value.length;
-        return true;
-    }
-
-    /**
-     * Sets long values into this tag. This method should be used for tags of
-     * type {@link #TYPE_UNSIGNED_LONG}. This method will fail if:
-     * <ul>
-     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_LONG}.</li>
-     * <li>The value overflows.</li>
-     * <li>The component count in the definition for this tag is not 1.</li>
-     * </ul>
-     */
-    public boolean setValue(long value) {
-        return setValue(new long[] {
-                value
-        });
-    }
-
-    /**
-     * Sets a string value into this tag. This method should be used for tags of
-     * type {@link #TYPE_ASCII}. The string is converted to an ASCII string.
-     * Characters that cannot be converted are replaced with '?'. The length of
-     * the string must be equal to either (component count -1) or (component
-     * count). The final byte will be set to the string null terminator '\0',
-     * overwriting the last character in the string if the value.length is equal
-     * to the component count. This method will fail if:
-     * <ul>
-     * <li>The data type is not {@link #TYPE_ASCII} or {@link #TYPE_UNDEFINED}.</li>
-     * <li>The length of the string is not equal to (component count -1) or
-     * (component count) in the definition for this tag.</li>
-     * </ul>
-     */
-    public boolean setValue(String value) {
-        if (mDataType != TYPE_ASCII && mDataType != TYPE_UNDEFINED) {
-            return false;
-        }
-
-        byte[] buf = value.getBytes(US_ASCII);
-        byte[] finalBuf = buf;
-        if (buf.length > 0) {
-            finalBuf = (buf[buf.length - 1] == 0 || mDataType == TYPE_UNDEFINED) ? buf : Arrays
-                .copyOf(buf, buf.length + 1);
-        } else if (mDataType == TYPE_ASCII && mComponentCountActual == 1) {
-            finalBuf = new byte[] { 0 };
-        }
-        int count = finalBuf.length;
-        if (checkBadComponentCount(count)) {
-            return false;
-        }
-        mComponentCountActual = count;
-        mValue = finalBuf;
-        return true;
-    }
-
-    /**
-     * Sets Rational values into this tag. This method should be used for tags
-     * of type {@link #TYPE_UNSIGNED_RATIONAL}, or {@link #TYPE_RATIONAL}. This
-     * method will fail if:
-     * <ul>
-     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_RATIONAL}
-     * or {@link #TYPE_RATIONAL}.</li>
-     * <li>The value overflows.</li>
-     * <li>The value.length does NOT match the component count in the definition
-     * for this tag.</li>
-     * </ul>
-     *
-     * @see Rational
-     */
-    public boolean setValue(Rational[] value) {
-        if (checkBadComponentCount(value.length)) {
-            return false;
-        }
-        if (mDataType != TYPE_UNSIGNED_RATIONAL && mDataType != TYPE_RATIONAL) {
-            return false;
-        }
-        if (mDataType == TYPE_UNSIGNED_RATIONAL && checkOverflowForUnsignedRational(value)) {
-            return false;
-        } else if (mDataType == TYPE_RATIONAL && checkOverflowForRational(value)) {
-            return false;
-        }
-
-        mValue = value;
-        mComponentCountActual = value.length;
-        return true;
-    }
-
-    /**
-     * Sets a Rational value into this tag. This method should be used for tags
-     * of type {@link #TYPE_UNSIGNED_RATIONAL}, or {@link #TYPE_RATIONAL}. This
-     * method will fail if:
-     * <ul>
-     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_RATIONAL}
-     * or {@link #TYPE_RATIONAL}.</li>
-     * <li>The value overflows.</li>
-     * <li>The component count in the definition for this tag is not 1.</li>
-     * </ul>
-     *
-     * @see Rational
-     */
-    public boolean setValue(Rational value) {
-        return setValue(new Rational[] {
-                value
-        });
-    }
-
-    /**
-     * Sets byte values into this tag. This method should be used for tags of
-     * type {@link #TYPE_UNSIGNED_BYTE} or {@link #TYPE_UNDEFINED}. This method
-     * will fail if:
-     * <ul>
-     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_BYTE} or
-     * {@link #TYPE_UNDEFINED} .</li>
-     * <li>The length does NOT match the component count in the definition for
-     * this tag.</li>
-     * </ul>
-     */
-    public boolean setValue(byte[] value, int offset, int length) {
-        if (checkBadComponentCount(length)) {
-            return false;
-        }
-        if (mDataType != TYPE_UNSIGNED_BYTE && mDataType != TYPE_UNDEFINED) {
-            return false;
-        }
-        mValue = new byte[length];
-        System.arraycopy(value, offset, mValue, 0, length);
-        mComponentCountActual = length;
-        return true;
-    }
-
-    /**
-     * Equivalent to setValue(value, 0, value.length).
-     */
-    public boolean setValue(byte[] value) {
-        return setValue(value, 0, value.length);
-    }
-
-    /**
-     * Sets byte value into this tag. This method should be used for tags of
-     * type {@link #TYPE_UNSIGNED_BYTE} or {@link #TYPE_UNDEFINED}. This method
-     * will fail if:
-     * <ul>
-     * <li>The component type of this tag is not {@link #TYPE_UNSIGNED_BYTE} or
-     * {@link #TYPE_UNDEFINED} .</li>
-     * <li>The component count in the definition for this tag is not 1.</li>
-     * </ul>
-     */
-    public boolean setValue(byte value) {
-        return setValue(new byte[] {
-                value
-        });
-    }
-
-    /**
-     * Sets the value for this tag using an appropriate setValue method for the
-     * given object. This method will fail if:
-     * <ul>
-     * <li>The corresponding setValue method for the class of the object passed
-     * in would fail.</li>
-     * <li>There is no obvious way to cast the object passed in into an EXIF tag
-     * type.</li>
-     * </ul>
-     */
-    public boolean setValue(Object obj) {
-        if (obj == null) {
-            return false;
-        } else if (obj instanceof Short) {
-            return setValue(((Short) obj).shortValue() & 0x0ffff);
-        } else if (obj instanceof String) {
-            return setValue((String) obj);
-        } else if (obj instanceof int[]) {
-            return setValue((int[]) obj);
-        } else if (obj instanceof long[]) {
-            return setValue((long[]) obj);
-        } else if (obj instanceof Rational) {
-            return setValue((Rational) obj);
-        } else if (obj instanceof Rational[]) {
-            return setValue((Rational[]) obj);
-        } else if (obj instanceof byte[]) {
-            return setValue((byte[]) obj);
-        } else if (obj instanceof Integer) {
-            return setValue(((Integer) obj).intValue());
-        } else if (obj instanceof Long) {
-            return setValue(((Long) obj).longValue());
-        } else if (obj instanceof Byte) {
-            return setValue(((Byte) obj).byteValue());
-        } else if (obj instanceof Short[]) {
-            // Nulls in this array are treated as zeroes.
-            Short[] arr = (Short[]) obj;
-            int[] fin = new int[arr.length];
-            for (int i = 0; i < arr.length; i++) {
-                fin[i] = (arr[i] == null) ? 0 : arr[i].shortValue() & 0x0ffff;
-            }
-            return setValue(fin);
-        } else if (obj instanceof Integer[]) {
-            // Nulls in this array are treated as zeroes.
-            Integer[] arr = (Integer[]) obj;
-            int[] fin = new int[arr.length];
-            for (int i = 0; i < arr.length; i++) {
-                fin[i] = (arr[i] == null) ? 0 : arr[i].intValue();
-            }
-            return setValue(fin);
-        } else if (obj instanceof Long[]) {
-            // Nulls in this array are treated as zeroes.
-            Long[] arr = (Long[]) obj;
-            long[] fin = new long[arr.length];
-            for (int i = 0; i < arr.length; i++) {
-                fin[i] = (arr[i] == null) ? 0 : arr[i].longValue();
-            }
-            return setValue(fin);
-        } else if (obj instanceof Byte[]) {
-            // Nulls in this array are treated as zeroes.
-            Byte[] arr = (Byte[]) obj;
-            byte[] fin = new byte[arr.length];
-            for (int i = 0; i < arr.length; i++) {
-                fin[i] = (arr[i] == null) ? 0 : arr[i].byteValue();
-            }
-            return setValue(fin);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Sets a timestamp to this tag. The method converts the timestamp with the
-     * format of "yyyy:MM:dd kk:mm:ss" and calls {@link #setValue(String)}. This
-     * method will fail if the data type is not {@link #TYPE_ASCII} or the
-     * component count of this tag is not 20 or undefined.
-     *
-     * @param time the number of milliseconds since Jan. 1, 1970 GMT
-     * @return true on success
-     */
-    public boolean setTimeValue(long time) {
-        // synchronized on TIME_FORMAT as SimpleDateFormat is not thread safe
-        synchronized (TIME_FORMAT) {
-            return setValue(TIME_FORMAT.format(new Date(time)));
-        }
-    }
-
-    /**
-     * Gets the value as a String. This method should be used for tags of type
-     * {@link #TYPE_ASCII}.
-     *
-     * @return the value as a String, or null if the tag's value does not exist
-     *         or cannot be converted to a String.
-     */
-    public String getValueAsString() {
-        if (mValue == null) {
-            return null;
-        } else if (mValue instanceof String) {
-            return (String) mValue;
-        } else if (mValue instanceof byte[]) {
-            return new String((byte[]) mValue, US_ASCII);
-        }
-        return null;
-    }
-
-    /**
-     * Gets the value as a String. This method should be used for tags of type
-     * {@link #TYPE_ASCII}.
-     *
-     * @param defaultValue the String to return if the tag's value does not
-     *            exist or cannot be converted to a String.
-     * @return the tag's value as a String, or the defaultValue.
-     */
-    public String getValueAsString(String defaultValue) {
-        String s = getValueAsString();
-        if (s == null) {
-            return defaultValue;
-        }
-        return s;
-    }
-
-    /**
-     * Gets the value as a byte array. This method should be used for tags of
-     * type {@link #TYPE_UNDEFINED} or {@link #TYPE_UNSIGNED_BYTE}.
-     *
-     * @return the value as a byte array, or null if the tag's value does not
-     *         exist or cannot be converted to a byte array.
-     */
-    public byte[] getValueAsBytes() {
-        if (mValue instanceof byte[]) {
-            return (byte[]) mValue;
-        }
-        return null;
-    }
-
-    /**
-     * Gets the value as a byte. If there are more than 1 bytes in this value,
-     * gets the first byte. This method should be used for tags of type
-     * {@link #TYPE_UNDEFINED} or {@link #TYPE_UNSIGNED_BYTE}.
-     *
-     * @param defaultValue the byte to return if tag's value does not exist or
-     *            cannot be converted to a byte.
-     * @return the tag's value as a byte, or the defaultValue.
-     */
-    public byte getValueAsByte(byte defaultValue) {
-        byte[] b = getValueAsBytes();
-        if (b == null || b.length < 1) {
-            return defaultValue;
-        }
-        return b[0];
-    }
-
-    /**
-     * Gets the value as an array of Rationals. This method should be used for
-     * tags of type {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}.
-     *
-     * @return the value as as an array of Rationals, or null if the tag's value
-     *         does not exist or cannot be converted to an array of Rationals.
-     */
-    public Rational[] getValueAsRationals() {
-        if (mValue instanceof Rational[]) {
-            return (Rational[]) mValue;
-        }
-        return null;
-    }
-
-    /**
-     * Gets the value as a Rational. If there are more than 1 Rationals in this
-     * value, gets the first one. This method should be used for tags of type
-     * {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}.
-     *
-     * @param defaultValue the Rational to return if tag's value does not exist
-     *            or cannot be converted to a Rational.
-     * @return the tag's value as a Rational, or the defaultValue.
-     */
-    public Rational getValueAsRational(Rational defaultValue) {
-        Rational[] r = getValueAsRationals();
-        if (r == null || r.length < 1) {
-            return defaultValue;
-        }
-        return r[0];
-    }
-
-    /**
-     * Gets the value as a Rational. If there are more than 1 Rationals in this
-     * value, gets the first one. This method should be used for tags of type
-     * {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}.
-     *
-     * @param defaultValue the numerator of the Rational to return if tag's
-     *            value does not exist or cannot be converted to a Rational (the
-     *            denominator will be 1).
-     * @return the tag's value as a Rational, or the defaultValue.
-     */
-    public Rational getValueAsRational(long defaultValue) {
-        Rational defaultVal = new Rational(defaultValue, 1);
-        return getValueAsRational(defaultVal);
-    }
-
-    /**
-     * Gets the value as an array of ints. This method should be used for tags
-     * of type {@link #TYPE_UNSIGNED_SHORT}, {@link #TYPE_UNSIGNED_LONG}.
-     *
-     * @return the value as as an array of ints, or null if the tag's value does
-     *         not exist or cannot be converted to an array of ints.
-     */
-    public int[] getValueAsInts() {
-        if (mValue == null) {
-            return null;
-        } else if (mValue instanceof long[]) {
-            long[] val = (long[]) mValue;
-            int[] arr = new int[val.length];
-            for (int i = 0; i < val.length; i++) {
-                arr[i] = (int) val[i]; // Truncates
-            }
-            return arr;
-        }
-        return null;
-    }
-
-    /**
-     * Gets the value as an int. If there are more than 1 ints in this value,
-     * gets the first one. This method should be used for tags of type
-     * {@link #TYPE_UNSIGNED_SHORT}, {@link #TYPE_UNSIGNED_LONG}.
-     *
-     * @param defaultValue the int to return if tag's value does not exist or
-     *            cannot be converted to an int.
-     * @return the tag's value as a int, or the defaultValue.
-     */
-    public int getValueAsInt(int defaultValue) {
-        int[] i = getValueAsInts();
-        if (i == null || i.length < 1) {
-            return defaultValue;
-        }
-        return i[0];
-    }
-
-    /**
-     * Gets the value as an array of longs. This method should be used for tags
-     * of type {@link #TYPE_UNSIGNED_LONG}.
-     *
-     * @return the value as as an array of longs, or null if the tag's value
-     *         does not exist or cannot be converted to an array of longs.
-     */
-    public long[] getValueAsLongs() {
-        if (mValue instanceof long[]) {
-            return (long[]) mValue;
-        }
-        return null;
-    }
-
-    /**
-     * Gets the value or null if none exists. If there are more than 1 longs in
-     * this value, gets the first one. This method should be used for tags of
-     * type {@link #TYPE_UNSIGNED_LONG}.
-     *
-     * @param defaultValue the long to return if tag's value does not exist or
-     *            cannot be converted to a long.
-     * @return the tag's value as a long, or the defaultValue.
-     */
-    public long getValueAsLong(long defaultValue) {
-        long[] l = getValueAsLongs();
-        if (l == null || l.length < 1) {
-            return defaultValue;
-        }
-        return l[0];
-    }
-
-    /**
-     * Gets the tag's value or null if none exists.
-     */
-    public Object getValue() {
-        return mValue;
-    }
-
-    /**
-     * Gets a long representation of the value.
-     *
-     * @param defaultValue value to return if there is no value or value is a
-     *            rational with a denominator of 0.
-     * @return the tag's value as a long, or defaultValue if no representation
-     *         exists.
-     */
-    public long forceGetValueAsLong(long defaultValue) {
-        long[] l = getValueAsLongs();
-        if (l != null && l.length >= 1) {
-            return l[0];
-        }
-        byte[] b = getValueAsBytes();
-        if (b != null && b.length >= 1) {
-            return b[0];
-        }
-        Rational[] r = getValueAsRationals();
-        if (r != null && r.length >= 1 && r[0].getDenominator() != 0) {
-            return (long) r[0].toDouble();
-        }
-        return defaultValue;
-    }
-
-    /**
-     * Gets a string representation of the value.
-     */
-    public String forceGetValueAsString() {
-        if (mValue == null) {
-            return "";
-        } else if (mValue instanceof byte[]) {
-            if (mDataType == TYPE_ASCII) {
-                return new String((byte[]) mValue, US_ASCII);
-            } else {
-                return Arrays.toString((byte[]) mValue);
-            }
-        } else if (mValue instanceof long[]) {
-            if (((long[]) mValue).length == 1) {
-                return String.valueOf(((long[]) mValue)[0]);
-            } else {
-                return Arrays.toString((long[]) mValue);
-            }
-        } else if (mValue instanceof Object[]) {
-            if (((Object[]) mValue).length == 1) {
-                Object val = ((Object[]) mValue)[0];
-                if (val == null) {
-                    return "";
-                } else {
-                    return val.toString();
-                }
-            } else {
-                return Arrays.toString((Object[]) mValue);
-            }
-        } else {
-            return mValue.toString();
-        }
-    }
-
-    /**
-     * Gets the value for type {@link #TYPE_ASCII}, {@link #TYPE_LONG},
-     * {@link #TYPE_UNDEFINED}, {@link #TYPE_UNSIGNED_BYTE},
-     * {@link #TYPE_UNSIGNED_LONG}, or {@link #TYPE_UNSIGNED_SHORT}. For
-     * {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}, call
-     * {@link #getRational(int)} instead.
-     *
-     * @exception IllegalArgumentException if the data type is
-     *                {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}.
-     */
-    protected long getValueAt(int index) {
-        if (mValue instanceof long[]) {
-            return ((long[]) mValue)[index];
-        } else if (mValue instanceof byte[]) {
-            return ((byte[]) mValue)[index];
-        }
-        throw new IllegalArgumentException("Cannot get integer value from "
-                + convertTypeToString(mDataType));
-    }
-
-    /**
-     * Gets the {@link #TYPE_ASCII} data.
-     *
-     * @exception IllegalArgumentException If the type is NOT
-     *                {@link #TYPE_ASCII}.
-     */
-    protected String getString() {
-        if (mDataType != TYPE_ASCII) {
-            throw new IllegalArgumentException("Cannot get ASCII value from "
-                    + convertTypeToString(mDataType));
-        }
-        return new String((byte[]) mValue, US_ASCII);
-    }
-
-    /*
-     * Get the converted ascii byte. Used by ExifOutputStream.
-     */
-    protected byte[] getStringByte() {
-        return (byte[]) mValue;
-    }
-
-    /**
-     * Gets the {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL} data.
-     *
-     * @exception IllegalArgumentException If the type is NOT
-     *                {@link #TYPE_RATIONAL} or {@link #TYPE_UNSIGNED_RATIONAL}.
-     */
-    protected Rational getRational(int index) {
-        if ((mDataType != TYPE_RATIONAL) && (mDataType != TYPE_UNSIGNED_RATIONAL)) {
-            throw new IllegalArgumentException("Cannot get RATIONAL value from "
-                    + convertTypeToString(mDataType));
-        }
-        return ((Rational[]) mValue)[index];
-    }
-
-    /**
-     * Equivalent to getBytes(buffer, 0, buffer.length).
-     */
-    protected void getBytes(byte[] buf) {
-        getBytes(buf, 0, buf.length);
-    }
-
-    /**
-     * Gets the {@link #TYPE_UNDEFINED} or {@link #TYPE_UNSIGNED_BYTE} data.
-     *
-     * @param buf the byte array in which to store the bytes read.
-     * @param offset the initial position in buffer to store the bytes.
-     * @param length the maximum number of bytes to store in buffer. If length >
-     *            component count, only the valid bytes will be stored.
-     * @exception IllegalArgumentException If the type is NOT
-     *                {@link #TYPE_UNDEFINED} or {@link #TYPE_UNSIGNED_BYTE}.
-     */
-    protected void getBytes(byte[] buf, int offset, int length) {
-        if ((mDataType != TYPE_UNDEFINED) && (mDataType != TYPE_UNSIGNED_BYTE)) {
-            throw new IllegalArgumentException("Cannot get BYTE value from "
-                    + convertTypeToString(mDataType));
-        }
-        System.arraycopy(mValue, 0, buf, offset,
-                (length > mComponentCountActual) ? mComponentCountActual : length);
-    }
-
-    /**
-     * Gets the offset of this tag. This is only valid if this data size > 4 and
-     * contains an offset to the location of the actual value.
-     */
-    protected int getOffset() {
-        return mOffset;
-    }
-
-    /**
-     * Sets the offset of this tag.
-     */
-    protected void setOffset(int offset) {
-        mOffset = offset;
-    }
-
-    protected void setHasDefinedCount(boolean d) {
-        mHasDefinedDefaultComponentCount = d;
-    }
-
-    protected boolean hasDefinedCount() {
-        return mHasDefinedDefaultComponentCount;
-    }
-
-    private boolean checkBadComponentCount(int count) {
-        return mHasDefinedDefaultComponentCount && (mComponentCountActual != count);
-    }
-
-    private static String convertTypeToString(short type) {
-        switch (type) {
-            case TYPE_UNSIGNED_BYTE:
-                return "UNSIGNED_BYTE";
-            case TYPE_ASCII:
-                return "ASCII";
-            case TYPE_UNSIGNED_SHORT:
-                return "UNSIGNED_SHORT";
-            case TYPE_UNSIGNED_LONG:
-                return "UNSIGNED_LONG";
-            case TYPE_UNSIGNED_RATIONAL:
-                return "UNSIGNED_RATIONAL";
-            case TYPE_UNDEFINED:
-                return "UNDEFINED";
-            case TYPE_LONG:
-                return "LONG";
-            case TYPE_RATIONAL:
-                return "RATIONAL";
-            default:
-                return "";
-        }
-    }
-
-    private boolean checkOverflowForUnsignedShort(int[] value) {
-        for (int v : value) {
-            if (v > UNSIGNED_SHORT_MAX || v < 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean checkOverflowForUnsignedLong(long[] value) {
-        for (long v : value) {
-            if (v < 0 || v > UNSIGNED_LONG_MAX) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean checkOverflowForUnsignedLong(int[] value) {
-        for (int v : value) {
-            if (v < 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean checkOverflowForUnsignedRational(Rational[] value) {
-        for (Rational v : value) {
-            if (v.getNumerator() < 0 || v.getDenominator() < 0
-                    || v.getNumerator() > UNSIGNED_LONG_MAX
-                    || v.getDenominator() > UNSIGNED_LONG_MAX) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean checkOverflowForRational(Rational[] value) {
-        for (Rational v : value) {
-            if (v.getNumerator() < LONG_MIN || v.getDenominator() < LONG_MIN
-                    || v.getNumerator() > LONG_MAX
-                    || v.getDenominator() > LONG_MAX) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (obj instanceof ExifTag) {
-            ExifTag tag = (ExifTag) obj;
-            if (tag.mTagId != this.mTagId
-                    || tag.mComponentCountActual != this.mComponentCountActual
-                    || tag.mDataType != this.mDataType) {
-                return false;
-            }
-            if (mValue != null) {
-                if (tag.mValue == null) {
-                    return false;
-                } else if (mValue instanceof long[]) {
-                    if (!(tag.mValue instanceof long[])) {
-                        return false;
-                    }
-                    return Arrays.equals((long[]) mValue, (long[]) tag.mValue);
-                } else if (mValue instanceof Rational[]) {
-                    if (!(tag.mValue instanceof Rational[])) {
-                        return false;
-                    }
-                    return Arrays.equals((Rational[]) mValue, (Rational[]) tag.mValue);
-                } else if (mValue instanceof byte[]) {
-                    if (!(tag.mValue instanceof byte[])) {
-                        return false;
-                    }
-                    return Arrays.equals((byte[]) mValue, (byte[]) tag.mValue);
-                } else {
-                    return mValue.equals(tag.mValue);
-                }
-            } else {
-                return tag.mValue == null;
-            }
-        }
-        return false;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return String.format("tag id: %04X\n", mTagId) + "ifd id: " + mIfd + "\ntype: "
-                + convertTypeToString(mDataType) + "\ncount: " + mComponentCountActual
-                + "\noffset: " + mOffset + "\nvalue: " + forceGetValueAsString() + "\n";
-    }
-
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/IfdData.java b/imagepicker/src/main/java/com/android/mms/exif/IfdData.java
deleted file mode 100644
index 992cc6f..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/IfdData.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class stores all the tags in an IFD.
- *
- * @see ExifData
- * @see ExifTag
- */
-class IfdData {
-
-    private final int mIfdId;
-    private final Map<Short, ExifTag> mExifTags = new HashMap<Short, ExifTag>();
-    private int mOffsetToNextIfd = 0;
-    private static final int[] sIfds = {
-            IfdId.TYPE_IFD_0, IfdId.TYPE_IFD_1, IfdId.TYPE_IFD_EXIF,
-            IfdId.TYPE_IFD_INTEROPERABILITY, IfdId.TYPE_IFD_GPS
-    };
-    /**
-     * Creates an IfdData with given IFD ID.
-     *
-     * @see IfdId#TYPE_IFD_0
-     * @see IfdId#TYPE_IFD_1
-     * @see IfdId#TYPE_IFD_EXIF
-     * @see IfdId#TYPE_IFD_GPS
-     * @see IfdId#TYPE_IFD_INTEROPERABILITY
-     */
-    IfdData(int ifdId) {
-        mIfdId = ifdId;
-    }
-
-    static protected int[] getIfds() {
-        return sIfds;
-    }
-
-    /**
-     * Get a array the contains all {@link ExifTag} in this IFD.
-     */
-    protected ExifTag[] getAllTags() {
-        return mExifTags.values().toArray(new ExifTag[mExifTags.size()]);
-    }
-
-    /**
-     * Gets the ID of this IFD.
-     *
-     * @see IfdId#TYPE_IFD_0
-     * @see IfdId#TYPE_IFD_1
-     * @see IfdId#TYPE_IFD_EXIF
-     * @see IfdId#TYPE_IFD_GPS
-     * @see IfdId#TYPE_IFD_INTEROPERABILITY
-     */
-    protected int getId() {
-        return mIfdId;
-    }
-
-    /**
-     * Gets the {@link ExifTag} with given tag id. Return null if there is no
-     * such tag.
-     */
-    protected ExifTag getTag(short tagId) {
-        return mExifTags.get(tagId);
-    }
-
-    /**
-     * Adds or replaces a {@link ExifTag}.
-     */
-    protected ExifTag setTag(ExifTag tag) {
-        tag.setIfd(mIfdId);
-        return mExifTags.put(tag.getTagId(), tag);
-    }
-
-    protected boolean checkCollision(short tagId) {
-        return mExifTags.get(tagId) != null;
-    }
-
-    /**
-     * Removes the tag of the given ID
-     */
-    protected void removeTag(short tagId) {
-        mExifTags.remove(tagId);
-    }
-
-    /**
-     * Gets the tags count in the IFD.
-     */
-    protected int getTagCount() {
-        return mExifTags.size();
-    }
-
-    /**
-     * Sets the offset of next IFD.
-     */
-    protected void setOffsetToNextIfd(int offset) {
-        mOffsetToNextIfd = offset;
-    }
-
-    /**
-     * Gets the offset of next IFD.
-     */
-    protected int getOffsetToNextIfd() {
-        return mOffsetToNextIfd;
-    }
-
-    /**
-     * Returns true if all tags in this two IFDs are equal. Note that tags of
-     * IFDs offset or thumbnail offset will be ignored.
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (obj instanceof IfdData) {
-            IfdData data = (IfdData) obj;
-            if (data.getId() == mIfdId && data.getTagCount() == getTagCount()) {
-                ExifTag[] tags = data.getAllTags();
-                for (ExifTag tag : tags) {
-                    if (ExifInterface.isOffsetTag(tag.getTagId())) {
-                        continue;
-                    }
-                    ExifTag tag2 = mExifTags.get(tag.getTagId());
-                    if (!tag.equals(tag2)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/IfdId.java b/imagepicker/src/main/java/com/android/mms/exif/IfdId.java
deleted file mode 100644
index ed020eb..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/IfdId.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-/**
- * The constants of the IFD ID defined in EXIF spec.
- */
-public interface IfdId {
-    int TYPE_IFD_0 = 0;
-    int TYPE_IFD_1 = 1;
-    int TYPE_IFD_EXIF = 2;
-    int TYPE_IFD_INTEROPERABILITY = 3;
-    int TYPE_IFD_GPS = 4;
-    /* This is used in ExifData to allocate enough IfdData */
-    int TYPE_IFD_COUNT = 5;
-
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/JpegHeader.java b/imagepicker/src/main/java/com/android/mms/exif/JpegHeader.java
deleted file mode 100644
index d41b0ad..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/JpegHeader.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-class JpegHeader {
-    public static final short SOI =  (short) 0xFFD8;
-    public static final short APP1 = (short) 0xFFE1;
-    public static final short APP0 = (short) 0xFFE0;
-    public static final short EOI = (short) 0xFFD9;
-
-    /**
-     *  SOF (start of frame). All value between SOF0 and SOF15 is SOF marker except for DHT, JPG,
-     *  and DAC marker.
-     */
-    public static final short SOF0 = (short) 0xFFC0;
-    public static final short SOF15 = (short) 0xFFCF;
-    public static final short DHT = (short) 0xFFC4;
-    public static final short JPG = (short) 0xFFC8;
-    public static final short DAC = (short) 0xFFCC;
-
-    public static final boolean isSofMarker(short marker) {
-        return marker >= SOF0 && marker <= SOF15 && marker != DHT && marker != JPG
-                && marker != DAC;
-    }
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/OrderedDataOutputStream.java b/imagepicker/src/main/java/com/android/mms/exif/OrderedDataOutputStream.java
deleted file mode 100644
index 961c537..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/OrderedDataOutputStream.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-class OrderedDataOutputStream extends FilterOutputStream {
-    private final ByteBuffer mByteBuffer = ByteBuffer.allocate(4);
-
-    public OrderedDataOutputStream(OutputStream out) {
-        super(out);
-    }
-
-    public OrderedDataOutputStream setByteOrder(ByteOrder order) {
-        mByteBuffer.order(order);
-        return this;
-    }
-
-    public OrderedDataOutputStream writeShort(short value) throws IOException {
-        mByteBuffer.rewind();
-        mByteBuffer.putShort(value);
-        out.write(mByteBuffer.array(), 0, 2);
-        return this;
-    }
-
-    public OrderedDataOutputStream writeInt(int value) throws IOException {
-        mByteBuffer.rewind();
-        mByteBuffer.putInt(value);
-        out.write(mByteBuffer.array());
-        return this;
-    }
-
-    public OrderedDataOutputStream writeRational(Rational rational) throws IOException {
-        writeInt((int) rational.getNumerator());
-        writeInt((int) rational.getDenominator());
-        return this;
-    }
-}
diff --git a/imagepicker/src/main/java/com/android/mms/exif/Rational.java b/imagepicker/src/main/java/com/android/mms/exif/Rational.java
deleted file mode 100644
index 8ab477c..0000000
--- a/imagepicker/src/main/java/com/android/mms/exif/Rational.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.exif;
-
-import androidx.annotation.NonNull;
-
-/**
- * The rational data type of EXIF tag. Contains a pair of longs representing the
- * numerator and denominator of a Rational number.
- */
-public class Rational {
-
-    private final long mNumerator;
-    private final long mDenominator;
-
-    /**
-     * Create a Rational with a given numerator and denominator.
-     *
-     * @param nominator
-     * @param denominator
-     */
-    public Rational(long nominator, long denominator) {
-        mNumerator = nominator;
-        mDenominator = denominator;
-    }
-
-    /**
-     * Create a copy of a Rational.
-     */
-    public Rational(Rational r) {
-        mNumerator = r.mNumerator;
-        mDenominator = r.mDenominator;
-    }
-
-    /**
-     * Gets the numerator of the rational.
-     */
-    public long getNumerator() {
-        return mNumerator;
-    }
-
-    /**
-     * Gets the denominator of the rational
-     */
-    public long getDenominator() {
-        return mDenominator;
-    }
-
-    /**
-     * Gets the rational value as type double. Will cause a divide-by-zero error
-     * if the denominator is 0.
-     */
-    public double toDouble() {
-        return mNumerator / (double) mDenominator;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof Rational) {
-            Rational data = (Rational) obj;
-            return mNumerator == data.mNumerator && mDenominator == data.mDenominator;
-        }
-        return false;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return mNumerator + "/" + mDenominator;
-    }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java
deleted file mode 100644
index f95a504..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractCameraActivity.java
+++ /dev/null
@@ -1,813 +0,0 @@
-/***
- Copyright (c) 2015-2016 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.ResultReceiver;
-import android.provider.MediaStore;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-
-import androidx.annotation.NonNull;
-
-import com.commonsware.cwac.cam2.util.Utils;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
-
-/**
- * Base class for activities that integrate with CameraFragment
- * for taking pictures or recording video.
- */
-abstract public class AbstractCameraActivity extends Activity {
-    /**
-     * List<FlashMode> indicating the desired flash modes,
-     * or null for always taking the default. These are
-     * considered in priority-first order (i.e., we will use
-     * the first FlashMode if the device supports it, otherwise
-     * we will use the second FlashMode, ...). If there is no
-     * match, whatever the default device behavior is will be
-     * used.
-     */
-    public static final String EXTRA_FLASH_MODES =
-            "cwac_cam2_flash_modes";
-
-    /**
-     * True if we should allow the user to change the flash mode
-     * on the fly (if the camera supports it), false otherwise.
-     * Defaults to false.
-     */
-    public static final String EXTRA_ALLOW_SWITCH_FLASH_MODE =
-            "cwac_cam2_allow_switch_flash_mode";
-
-    /**
-     * A ResultReceiver to be invoked on any error that the library
-     * cannot handle internally.
-     */
-    public static final String EXTRA_UNHANDLED_ERROR_RECEIVER =
-            "cwac_cam2_unhandled_error_receiver";
-
-    /**
-     * Extra name for indicating what facing rule for the
-     * camera you wish to use. The value should be a
-     * CameraSelectionCriteria.Facing instance.
-     */
-    public static final String EXTRA_FACING = "cwac_cam2_facing";
-
-    /**
-     * Extra name for indicating that the requested facing
-     * must be an exact match, without gracefully degrading to
-     * whatever camera happens to be available. If set to true,
-     * requests to take a picture, for which the desired camera
-     * is not available, will be cancelled. Defaults to false.
-     */
-    public static final String EXTRA_FACING_EXACT_MATCH =
-            "cwac_cam2_facing_exact_match";
-
-    /**
-     * Extra name for indicating whether extra diagnostic
-     * information should be reported, particularly for errors.
-     * Default is false.
-     */
-    public static final String EXTRA_DEBUG_ENABLED = "cwac_cam2_debug";
-
-    /**
-     * Extra name for indicating if MediaStore should be updated
-     * to reflect a newly-taken picture. Only relevant if
-     * a file:// Uri is used. Default to false.
-     */
-    public static final String EXTRA_UPDATE_MEDIA_STORE =
-            "cwac_cam2_update_media_store";
-
-    /**
-     * DO NOT USE. Use EXTRA_FORCE_ENGINE instead, please.
-     */
-    @Deprecated
-    public static final String EXTRA_FORCE_CLASSIC = "cwac_cam2_force_classic";
-
-    /**
-     * If set to a CameraEngine.ID value (CLASSIC or CAMERA2), will
-     * force the use of that engine. If left null/unset, the default
-     * is based on what device we are running on.
-     */
-    public static final String EXTRA_FORCE_ENGINE = "cwac_cam2_force_engine";
-
-    /**
-     * If set to true, horizontally flips or mirrors the preview.
-     * Does not change the picture or video output. Used mostly for FFC,
-     * though will be honored for any camera. Defaults to false.
-     */
-    public static final String EXTRA_MIRROR_PREVIEW = "cwac_cam2_mirror_preview";
-
-    /**
-     * Extra name for focus mode to apply. Value should be one of the
-     * FocusMode enum values. Default is CONTINUOUS.
-     * If the desired focus mode is not available, the device default
-     * focus mode is used.
-     */
-    public static final String EXTRA_FOCUS_MODE = "cwac_cam2_focus_mode";
-
-    /**
-     * Extra name for orientation lock mode to apply. Value should be
-     * one of the OrientationLockMode values. Default, shockingly,
-     * is DEFAULT.
-     */
-    public static final String EXTRA_ORIENTATION_LOCK_MODE =
-            "cwac_cam2_olock_mode";
-
-    /**
-     * Extra name for whether the camera should allow zoom and
-     * how. Value should be a ZoomStyle (NONE, PINCH, SEEKBAR).
-     * Default is NONE.
-     */
-    public static final String EXTRA_ZOOM_STYLE =
-            "cwac_cam2_zoom_style";
-
-    /**
-     * Extra name for runtime permission policy. If true, we check
-     * for runtime permissions and fail fast if they are not already
-     * granted. If false, if we lack runtime permissions (and need them
-     * based on API level), we request them ourselves. Defaults to true.
-     */
-    public static final String EXTRA_FAIL_IF_NO_PERMISSION =
-            "cwac_cam2_fail_if_no_permission";
-
-    /**
-     * Extra name for whether the camera should show a "rule of thirds"
-     * overlay above the camera preview. Defaults to false.
-     */
-    public static final String EXTRA_SHOW_RULE_OF_THIRDS_GRID =
-            "cwac_cam2_show_rule_of_thirds_grid";
-
-    /**
-     * @return true if the activity wants FEATURE_ACTION_BAR_OVERLAY,
-     * false otherwise
-     */
-    abstract protected boolean needsOverlay();
-
-    /**
-     * @return false if we should hide the action bar outright
-     * (ignored if needsOverlay() returns true)
-     */
-    abstract protected boolean needsActionBar();
-
-    /**
-     * @return true if we are recording a video, false if we are
-     * taking a still picture
-     */
-    abstract protected boolean isVideo();
-
-    /**
-     * @return a CameraFragment for the given circumstances
-     */
-    abstract protected CameraFragment buildFragment();
-
-    /**
-     * @return array of the names of the permissions needed by
-     * this activity
-     */
-    abstract protected String[] getNeededPermissions();
-
-    /**
-     * Configure the CameraEngine for things that are specific
-     * to a subclass.
-     *
-     * @param engine the CameraEngine to configure
-     */
-    abstract protected void configEngine(CameraEngine engine);
-
-    protected static final String TAG_CAMERA = CameraFragment.class.getCanonicalName();
-    private static final int REQUEST_PERMS = 13401;
-    protected CameraFragment cameraFrag;
-    public static final EventBus BUS = new EventBus();
-
-    /**
-     * Standard lifecycle method, serving as the main entry
-     * point of the activity.
-     *
-     * @param savedInstanceState the state of a previous instance
-     */
-    @TargetApi(23)
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Utils.validateEnvironment(this, failIfNoPermissions());
-
-        OrientationLockMode olockMode =
-                (OrientationLockMode) getIntent().getSerializableExtra(EXTRA_ORIENTATION_LOCK_MODE);
-
-        lockOrientation(olockMode);
-
-        if (needsOverlay()) {
-            getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
-
-            // the following is nasty stuff to get rid of the action
-            // bar drop shadow, which still exists on some devices
-            // despite going into overlay mode (Samsung Galaxy S3, I'm
-            // looking at you)
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                ActionBar ab = getActionBar();
-
-                if (ab != null) {
-                    getActionBar().setElevation(0);
-                }
-            } else {
-                View v = ((ViewGroup) getWindow().getDecorView()).getChildAt(0);
-
-                if (v != null) {
-                    v.setWillNotDraw(true);
-                }
-            }
-
-        } else if (!needsActionBar()) {
-            ActionBar ab = getActionBar();
-
-            if (ab != null) {
-                ab.hide();
-            }
-        }
-
-        if (useRuntimePermissions()) {
-            String[] perms = netPermissions(getNeededPermissions());
-
-            if (perms.length == 0) {
-                init();
-            } else if (!failIfNoPermissions()) {
-                requestPermissions(perms, REQUEST_PERMS);
-            } else {
-                throw new IllegalStateException("We lack the necessary permissions!");
-            }
-        } else {
-            init();
-        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode,
-                                           @NonNull String[] permissions,
-                                           @NonNull int[] grantResults) {
-        String[] perms = netPermissions(getNeededPermissions());
-
-        if (perms.length == 0) {
-            init();
-        } else {
-            setResult(RESULT_CANCELED);
-            finish();
-        }
-    }
-
-    /**
-     * Standard lifecycle method, for when the fragment moves into
-     * the started state. Passed along to the CameraController.
-     */
-    @Override
-    public void onStart() {
-        super.onStart();
-
-        BUS.register(this);
-    }
-
-    /**
-     * Standard lifecycle method, for when the fragment moves into
-     * the stopped state. Passed along to the CameraController.
-     */
-    @Override
-    public void onStop() {
-        BUS.unregister(this);
-
-        if (cameraFrag != null) {
-            if (isChangingConfigurations()) {
-                cameraFrag.stopVideoRecording();
-            } else {
-                cameraFrag.shutdown();
-            }
-        }
-
-        super.onStop();
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_CAMERA) {
-            cameraFrag.performCameraAction();
-
-            return (true);
-        }
-
-        return (super.onKeyUp(keyCode, event));
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(CameraController.NoSuchCameraEvent event) {
-        finish();
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(CameraController.ControllerDestroyedEvent event) {
-        finish();
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(CameraEngine.CameraTwoGenericEvent event) {
-        finish();
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(CameraEngine.DeepImpactEvent event) {
-        finish();
-    }
-
-    protected Uri getOutputUri() {
-        Uri output = null;
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            ClipData clipData = getIntent().getClipData();
-
-            if (clipData != null && clipData.getItemCount() > 0) {
-                output = clipData.getItemAt(0).getUri();
-            }
-        }
-
-        if (output == null) {
-            output = getIntent().getParcelableExtra(MediaStore.EXTRA_OUTPUT);
-        }
-
-        return (output);
-    }
-
-    protected void init() {
-        cameraFrag = (CameraFragment) getFragmentManager().findFragmentByTag(TAG_CAMERA);
-
-        boolean fragNeedsToBeAdded = false;
-
-        if (cameraFrag == null) {
-            cameraFrag = buildFragment();
-            fragNeedsToBeAdded = true;
-        }
-
-        FocusMode focusMode =
-                (FocusMode) getIntent().getSerializableExtra(EXTRA_FOCUS_MODE);
-        boolean allowChangeFlashMode =
-                getIntent().getBooleanExtra(EXTRA_ALLOW_SWITCH_FLASH_MODE, false);
-        ResultReceiver onError =
-                getIntent().getParcelableExtra(EXTRA_UNHANDLED_ERROR_RECEIVER);
-
-        CameraController ctrl =
-                new CameraController(focusMode, onError,
-                        allowChangeFlashMode, isVideo());
-
-        cameraFrag.setController(ctrl);
-        cameraFrag
-                .setMirrorPreview(getIntent()
-                        .getBooleanExtra(EXTRA_MIRROR_PREVIEW, false));
-
-        Facing facing =
-                (Facing) getIntent().getSerializableExtra(EXTRA_FACING);
-
-        if (facing == null) {
-            facing = Facing.BACK;
-        }
-
-        boolean match = getIntent()
-                .getBooleanExtra(EXTRA_FACING_EXACT_MATCH, false);
-        CameraSelectionCriteria criteria =
-                new CameraSelectionCriteria.Builder()
-                        .facing(facing)
-                        .facingExactMatch(match)
-                        .isVideo(isVideo())
-                        .build();
-        CameraEngine.ID forcedEngineId =
-                (CameraEngine.ID) getIntent().getSerializableExtra(EXTRA_FORCE_ENGINE);
-
-        ctrl.setEngine(CameraEngine.buildInstance(this, forcedEngineId), criteria);
-        ctrl.getEngine().setDebug(getIntent().getBooleanExtra(EXTRA_DEBUG_ENABLED, false));
-        configEngine(ctrl.getEngine());
-
-        if (fragNeedsToBeAdded) {
-            getFragmentManager()
-                    .beginTransaction()
-                    .add(android.R.id.content, cameraFrag, TAG_CAMERA)
-                    .commit();
-        }
-    }
-
-    boolean canSwitchSources() {
-        return (!getIntent().getBooleanExtra(EXTRA_FACING_EXACT_MATCH, false));
-    }
-
-    protected void lockOrientation(OrientationLockMode mode) {
-        if (mode == null || mode == OrientationLockMode.DEFAULT) {
-            int orientation = getResources().getConfiguration().orientation;
-
-            if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                setRequestedOrientation(SCREEN_ORIENTATION_LANDSCAPE);
-            } else if (orientation == Configuration.ORIENTATION_PORTRAIT) {
-                setRequestedOrientation(SCREEN_ORIENTATION_PORTRAIT);
-            } else {
-                setRequestedOrientation(SCREEN_ORIENTATION_UNSPECIFIED);
-            }
-        } else if (mode == OrientationLockMode.LANDSCAPE) {
-            setRequestedOrientation(SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
-        } else {
-            setRequestedOrientation(
-                    SCREEN_ORIENTATION_SENSOR_PORTRAIT);
-        }
-    }
-
-    protected Intent buildResultIntent() {
-        return (new Intent());
-    }
-
-    @TargetApi(23)
-    private boolean hasPermission(String perm) {
-        if (useRuntimePermissions()) {
-            return (checkSelfPermission(perm) == PackageManager.PERMISSION_GRANTED);
-        }
-
-        return (true);
-    }
-
-    private boolean useRuntimePermissions() {
-        return (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1);
-    }
-
-    private boolean failIfNoPermissions() {
-        return (getIntent().getBooleanExtra(EXTRA_FAIL_IF_NO_PERMISSION, true));
-    }
-
-    private String[] netPermissions(String[] wanted) {
-        ArrayList<String> result = new ArrayList<String>();
-
-        for (String perm : wanted) {
-            if (!hasPermission(perm)) {
-                result.add(perm);
-            }
-        }
-
-        return (result.toArray(new String[result.size()]));
-    }
-
-    public enum Quality {
-        LOW(0), HIGH(1);
-
-        private final int value;
-
-        Quality(int value) {
-            this.value = value;
-        }
-
-        int getValue() {
-            return (value);
-        }
-    }
-
-    abstract public static class IntentBuilder<T extends IntentBuilder> {
-        abstract public Intent buildChooserBaseIntent();
-
-        protected final Intent result;
-        private final Context ctxt;
-
-        /**
-         * Standard constructor. May throw a runtime exception
-         * if the environment is not set up properly (see
-         * validateEnvironment() on Utils).
-         *
-         * @param ctxt any Context will do
-         */
-        public IntentBuilder(Context ctxt, Class clazz) {
-            this.ctxt = ctxt.getApplicationContext();
-            result = new Intent(ctxt, clazz);
-        }
-
-        /**
-         * Returns the Intent defined by the builder.
-         *
-         * @return the Intent to use to start the activity
-         */
-        public Intent build() {
-            Utils.validateEnvironment(ctxt,
-                    result.getBooleanExtra(EXTRA_FAIL_IF_NO_PERMISSION, true));
-
-            return (result);
-        }
-
-        /**
-         * Returns an ACTION_CHOOSER Intent, to offer a choice
-         * between this library's activity and existing camera
-         * apps.
-         *
-         * @param title title for chooser dialog, or null
-         * @return the Intent to use to start the activity
-         */
-        public Intent buildChooser(CharSequence title) {
-            Intent original = build();
-
-            Intent toChooseFrom = buildChooserBaseIntent();
-
-            if (original.hasExtra(MediaStore.EXTRA_OUTPUT)) {
-                toChooseFrom.putExtra(MediaStore.EXTRA_OUTPUT,
-                        (Bundle) original.getParcelableExtra(MediaStore.EXTRA_OUTPUT));
-            }
-
-            Intent chooser = Intent.createChooser(toChooseFrom, title);
-
-            chooser.putExtra(Intent.EXTRA_INITIAL_INTENTS,
-                    new Intent[]{original});
-
-            return (chooser);
-        }
-
-        /**
-         * Indicates what camera should be used as the starting
-         * point. Defaults to the rear-facing camera.
-         *
-         * @param facing which camera to use
-         * @return the builder, for further configuration
-         */
-        public T facing(Facing facing) {
-            result.putExtra(EXTRA_FACING, facing);
-
-            return ((T) this);
-        }
-
-        /**
-         * Indicates that the desired facing value for the camera
-         * must be an exact match (and, if not, cancel the request).
-         *
-         * @return the builder, for further configuration
-         */
-        public T facingExactMatch() {
-            result.putExtra(EXTRA_FACING_EXACT_MATCH, true);
-
-            return ((T) this);
-        }
-
-        /**
-         * Call if you want extra diagnostic information dumped to
-         * LogCat. Not ideal for use in production.
-         *
-         * @return the builder, for further configuration
-         */
-        public T debug() {
-            result.putExtra(EXTRA_DEBUG_ENABLED, true);
-
-            return ((T) this);
-        }
-
-        /**
-         * Indicates where to write the picture to. Defaults to
-         * returning a thumbnail bitmap in the "data" extra, as
-         * with ACTION_IMAGE_CAPTURE. Note that you need to have
-         * write access to the supplied file.
-         *
-         * @param f file in which to write the picture
-         * @return the builder, for further configuration
-         */
-        public T to(File f) {
-            return to(Uri.fromFile(f));
-        }
-
-        /**
-         * Indicates where to write the picture to. Defaults to
-         * returning a thumbnail bitmap in the "data" extra, as
-         * with ACTION_IMAGE_CAPTURE. Note that you need to have
-         * write access to the supplied Uri.
-         *
-         * @param output Uri to which to write the picture
-         * @return the builder, for further configuration
-         */
-        public T to(Uri output) {
-            result.putExtra(MediaStore.EXTRA_OUTPUT, output);
-
-            return ((T) this);
-        }
-
-        /**
-         * Indicates that the picture that is taken should be
-         * passed over to MediaStore for indexing. By default,
-         * this does not happen automatically and is the responsibility
-         * of your app, should the image be reachable by MediaStore
-         * in the first place. This setting is only relevant for file://
-         * Uri values.
-         *
-         * @return the builder, for further configuration
-         */
-        public T updateMediaStore() {
-            result.putExtra(EXTRA_UPDATE_MEDIA_STORE, true);
-
-            return ((T) this);
-        }
-
-        /**
-         * Forces the use of a specific engine based on its ID. Default
-         * is an engine chosen by the device we are running on.
-         *
-         * @param engineId CLASSIC or CAMERA2
-         * @return the builder, for further configuration
-         */
-        public T forceEngine(CameraEngine.ID engineId) {
-            result.putExtra(EXTRA_FORCE_ENGINE, engineId);
-
-            return ((T) this);
-        }
-
-        @Deprecated
-        public T forceClassic() {
-            return (forceEngine(CameraEngine.ID.CLASSIC));
-        }
-
-        /**
-         * Horizontally flips or mirrors the preview images.
-         *
-         * @return the builder, for further configuration
-         */
-        public T mirrorPreview() {
-            result.putExtra(EXTRA_MIRROR_PREVIEW, true);
-
-            return ((T) this);
-        }
-
-        /**
-         * Sets the desired focus mode. Default is CONTINUOUS.
-         *
-         * @return the builder, for further configuration
-         */
-        public T focusMode(FocusMode focusMode) {
-            result.putExtra(EXTRA_FOCUS_MODE, focusMode);
-
-            return ((T) this);
-        }
-
-        /**
-         * Sets the desired flash mode. This is a suggestion; if
-         * the device does not support this mode, the device default
-         * behavior will be used.
-         *
-         * @param mode the desired flash mode
-         * @return the builder, for further configuration
-         */
-        public T flashMode(FlashMode mode) {
-            return (flashModes(new FlashMode[]{mode}));
-        }
-
-        /**
-         * Sets the desired flash modes, in priority-first order
-         * (the first flash mode will be used if supported, otherwise
-         * the second flash mode will be used if supported, ...).
-         * These are a suggestion; if none of these modes are supported,
-         * the default device behavior will be used.
-         *
-         * @param modes the flash modes to try
-         * @return the builder, for further configuration
-         */
-        public T flashModes(FlashMode[] modes) {
-            return (flashModes(Arrays.asList(modes)));
-        }
-
-        /**
-         * Sets the desired flash modes, in priority-first order
-         * (the first flash mode will be used if supported, otherwise
-         * the second flash mode will be used if supported, ...).
-         * These are a suggestion; if none of these modes are supported,
-         * the default device behavior will be used.
-         *
-         * @param modes the flash modes to try
-         * @return the builder, for further configuration
-         */
-        public T flashModes(List<FlashMode> modes) {
-            result.putExtra(EXTRA_FLASH_MODES,
-                    new ArrayList<FlashMode>(modes));
-
-            return ((T) this);
-        }
-
-        /**
-         * Call if we should allow the user to change the flash mode
-         * on the fly (if the camera supports it).
-         */
-        public T allowSwitchFlashMode() {
-            result.putExtra(EXTRA_ALLOW_SWITCH_FLASH_MODE, true);
-
-            return ((T) this);
-        }
-
-        /**
-         * Indicates the video quality to use for recording this
-         * video. Matches EXTRA_VIDEO_QUALITY, except uses an enum
-         * for type safety. Note that this is also used for still
-         * image quality, despite the name of the extra.
-         *
-         * @param q LOW or HIGH
-         * @return the builder, for further configuration
-         */
-        public T quality(Quality q) {
-            result.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, q.getValue());
-
-            return ((T) this);
-        }
-
-        /**
-         * Provides a ResultReceiver, which will be invoked on any
-         * error that the library cannot handle itself.
-         *
-         * @param rr a ResultReceiver to get error information
-         * @return the builder, for further configuration
-         */
-        public T onError(ResultReceiver rr) {
-            result.putExtra(EXTRA_UNHANDLED_ERROR_RECEIVER, rr);
-
-            return ((T) this);
-        }
-
-        /**
-         * Specifies an OrientationLockMode to apply to the camera
-         * operation.
-         *
-         * @param mode an OrientationLockMode value
-         * @return the builder, for further configuration
-         */
-        public T orientationLockMode(OrientationLockMode mode) {
-            result.putExtra(EXTRA_ORIENTATION_LOCK_MODE, mode);
-
-            return ((T) this);
-        }
-
-        /**
-         * Call to configure the ZoomStyle to be used. Default
-         * is NONE.
-         *
-         * @return the builder, for further configuration
-         */
-        public T zoomStyle(ZoomStyle zoomStyle) {
-            result.putExtra(EXTRA_ZOOM_STYLE, zoomStyle);
-
-            return ((T) this);
-        }
-
-        /**
-         * Call to request that the library request permissions from the
-         * user, rather than that being handled by the app.
-         *
-         * @return the builder, for further configuration
-         */
-        public T requestPermissions() {
-            result.putExtra(EXTRA_FAIL_IF_NO_PERMISSION, false);
-
-            return ((T) this);
-        }
-
-        /**
-         * Call to request that we show a "rule of thirds" grid over the camera
-         * preview.
-         *
-         * @return the builder, for further configuration
-         */
-        public T showRuleOfThirdsGrid() {
-            result.putExtra(EXTRA_SHOW_RULE_OF_THIRDS_GRID, true);
-
-            return ((T) this);
-        }
-    }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractImageProcessor.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractImageProcessor.java
deleted file mode 100644
index 93d58b4..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/AbstractImageProcessor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.content.Context;
-
-abstract public class AbstractImageProcessor implements ImageProcessor {
-  private final String tag;
-  private final Context ctxt;
-
-  public AbstractImageProcessor(Context ctxt) {
-    this(ctxt, null);
-  }
-
-  public AbstractImageProcessor(Context ctxt, String tag) {
-    this.ctxt=ctxt.getApplicationContext();
-    this.tag=tag;
-  }
-
-  @Override
-  public String getTag() {
-    return(tag==null ? getClass().getCanonicalName() : tag);
-  }
-
-  protected Context getContext() {
-    return(ctxt);
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraActivity.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraActivity.java
deleted file mode 100644
index 5886217..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraActivity.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/***
- Copyright (c) 2015-2016 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.provider.MediaStore;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Stock activity for taking pictures. Supports the same
- * protocol, in terms of extras and return data, as does
- * ACTION_IMAGE_CAPTURE.
- */
-public class CameraActivity extends AbstractCameraActivity
-        implements ConfirmationFragment.Contract {
-
-    /**
-     * Extra name for indicating whether a confirmation screen
-     * should appear after taking the picture, or whether taking
-     * the picture should immediately return said picture. Defaults
-     * to true, meaning that the user should confirm the picture.
-     */
-    public static final String EXTRA_CONFIRM = "cwac_cam2_confirm";
-
-    /**
-     * Extra name for whether a preview frame should be saved
-     * to getExternalCacheDir() at the point when a picture
-     * is taken. This is for debugging purposes, to compare
-     * the preview frame with both the taken picture and what
-     * you see on the activity's preview. It is very unlikely
-     * that you will want this enabled in a production app.
-     * Defaults to false.
-     */
-    public static final String EXTRA_DEBUG_SAVE_PREVIEW_FRAME =
-            "cwac_cam2_save_preview";
-
-    /**
-     * Extra name for how much heap space we should try to use
-     * to load the picture for the confirmation screen. Should
-     * be a `float` greater than 0.0f and less than 1.0f.
-     * Defaults to not being used.
-     */
-    public static final String EXTRA_CONFIRMATION_QUALITY =
-            "cwac_cam2_confirmation_quality";
-
-    /**
-     * Extra name for boolean indicating if we should skip the
-     * default logic to rotate the image based on the EXIF orientation
-     * tag. Defaults to false (meaning: do the rotation if needed).
-     */
-    public static final String EXTRA_SKIP_ORIENTATION_NORMALIZATION =
-            "cwac_cam2_skip_orientation_normalization";
-
-    /**
-     * Extra name for duration of countdown timer, in seconds. If negative, 0,
-     * or missing, no countdown timer will be used. If positive, a countdown
-     * will be displayed on-screen, and the picture will be taken automatically
-     * when the countdown completes, if the user has not already taken a picture.
-     */
-    public static final String EXTRA_TIMER = "cwac_cam2_timer";
-
-    private static final String TAG_CONFIRM = ConfirmationFragment.class.getCanonicalName();
-    private static final String[] PERMS = {Manifest.permission.CAMERA};
-    private ConfirmationFragment confirmFrag;
-    private boolean needsThumbnail = false;
-    private boolean isDestroyed = false;
-
-    @Override
-    protected void onDestroy() {
-        isDestroyed = true;
-
-        super.onDestroy();
-    }
-
-    @Override
-    protected String[] getNeededPermissions() {
-        return (PERMS);
-    }
-
-    @Override
-    protected void init() {
-        super.init();
-
-        confirmFrag = (ConfirmationFragment) getFragmentManager().findFragmentByTag(TAG_CONFIRM);
-
-        Uri output = getOutputUri();
-
-        needsThumbnail = (output == null);
-
-        if (confirmFrag == null) {
-            confirmFrag =
-                    ConfirmationFragment
-                            .newInstance(normalizeOrientation());
-            getFragmentManager()
-                    .beginTransaction()
-                    .add(android.R.id.content, confirmFrag, TAG_CONFIRM)
-                    .commit();
-        }
-
-        if (!cameraFrag.isVisible() && !confirmFrag.isVisible()) {
-            getFragmentManager()
-                    .beginTransaction()
-                    .hide(confirmFrag)
-                    .show(cameraFrag)
-                    .commit();
-        }
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(CameraEngine.PictureTakenEvent event) {
-        if (event.exception == null) {
-            if (getIntent().getBooleanExtra(EXTRA_CONFIRM, true)) {
-                confirmFrag.setImage(event.getImageContext(),
-                        getIntent().getExtras().getFloat(EXTRA_CONFIRMATION_QUALITY));
-
-                getFragmentManager()
-                        .beginTransaction()
-                        .hide(cameraFrag)
-                        .show(confirmFrag)
-                        .commit();
-            } else {
-                completeRequest(event.getImageContext(), true);
-            }
-        } else {
-            finish();
-        }
-    }
-
-    @Override
-    public void retakePicture() {
-        getFragmentManager()
-                .beginTransaction()
-                .hide(confirmFrag)
-                .show(cameraFrag)
-                .commit();
-    }
-
-    @Override
-    public void completeRequest(ImageContext imageContext, boolean isOK) {
-        if (!isOK) {
-            setResult(RESULT_CANCELED);
-            finish();
-        } else {
-            if (needsThumbnail) {
-                final Intent result = buildResultIntent();
-
-                result.putExtra("data",
-                        imageContext.buildResultThumbnail(normalizeOrientation()));
-
-                findViewById(android.R.id.content).post(() -> {
-                    setResult(RESULT_OK, result);
-                    removeFragments();
-                });
-            } else {
-                findViewById(android.R.id.content).post(() -> {
-                    setResult(RESULT_OK, buildResultIntent().setData(getOutputUri()));
-                    removeFragments();
-                });
-            }
-        }
-    }
-
-    @Override
-    protected boolean needsOverlay() {
-        return (true);
-    }
-
-    @Override
-    protected boolean needsActionBar() {
-        return (true);
-    }
-
-    @Override
-    protected boolean isVideo() {
-        return (false);
-    }
-
-    @Override
-    protected void configEngine(CameraEngine engine) {
-        if (getIntent()
-                .getBooleanExtra(EXTRA_DEBUG_SAVE_PREVIEW_FRAME, false)) {
-            engine
-                    .setDebugSavePreviewFile(new File(getExternalCacheDir(),
-                            "cam2-preview.jpg"));
-        }
-
-        List<FlashMode> flashModes =
-                (List<FlashMode>) getIntent().getSerializableExtra(EXTRA_FLASH_MODES);
-
-        if (flashModes == null) {
-            flashModes = new ArrayList<FlashMode>();
-        }
-
-        if (flashModes != null) {
-            engine.setPreferredFlashModes(flashModes);
-        }
-    }
-
-    @Override
-    protected CameraFragment buildFragment() {
-        return (CameraFragment.newPictureInstance(getOutputUri(),
-                getIntent().getBooleanExtra(EXTRA_UPDATE_MEDIA_STORE, false),
-                getIntent().getIntExtra(MediaStore.EXTRA_VIDEO_QUALITY, 1),
-                (ZoomStyle) getIntent().getSerializableExtra(EXTRA_ZOOM_STYLE),
-                getIntent().getBooleanExtra(EXTRA_FACING_EXACT_MATCH, false),
-                getIntent().getBooleanExtra(EXTRA_SKIP_ORIENTATION_NORMALIZATION, false),
-                getIntent().getIntExtra(EXTRA_TIMER, 0),
-                getIntent().getBooleanExtra(EXTRA_SHOW_RULE_OF_THIRDS_GRID, false)));
-    }
-
-    private void removeFragments() {
-        if (!isDestroyed) {
-            getFragmentManager()
-                    .beginTransaction()
-                    .remove(confirmFrag)
-                    .remove(cameraFrag)
-                    .commit();
-        }
-    }
-
-    private boolean normalizeOrientation() {
-        boolean result = !getIntent()
-                .getBooleanExtra(EXTRA_SKIP_ORIENTATION_NORMALIZATION, false);
-
-        return (result);
-    }
-
-    /**
-     * Class to build an Intent used to start the CameraActivity.
-     * Call setComponent() on the Intent if you are using your
-     * own subclass of CameraActivity.
-     */
-    public static class IntentBuilder
-            extends AbstractCameraActivity.IntentBuilder<IntentBuilder> {
-        /**
-         * Standard constructor. May throw a runtime exception
-         * if the environment is not set up properly (see
-         * validateEnvironment() on Utils).
-         *
-         * @param ctxt any Context will do
-         */
-        public IntentBuilder(Context ctxt) {
-            super(ctxt, CameraActivity.class);
-        }
-
-        @Override
-        public Intent buildChooserBaseIntent() {
-            return (new Intent(MediaStore.ACTION_IMAGE_CAPTURE));
-        }
-
-        /**
-         * Call to skip the confirmation screen, so once the user
-         * takes the picture, you get control back right away.
-         *
-         * @return the builder, for further configuration
-         */
-        public IntentBuilder skipConfirm() {
-            result.putExtra(EXTRA_CONFIRM, false);
-
-            return (this);
-        }
-
-        /**
-         * Call to skip examining the picture for the EXIF orientation
-         * tag and rotating the image if needed.
-         *
-         * @return the builder, for further configuration
-         */
-        public IntentBuilder skipOrientationNormalization() {
-            result.putExtra(EXTRA_SKIP_ORIENTATION_NORMALIZATION, true);
-
-            return (this);
-        }
-
-        public IntentBuilder debugSavePreviewFrame() {
-            result.putExtra(EXTRA_DEBUG_SAVE_PREVIEW_FRAME, true);
-
-            return (this);
-        }
-
-        /**
-         * Call to set the quality factor for the confirmation screen.
-         * Value should be greater than 0.0f and below 1.0f, and
-         * represents the fraction of the app's heap size that we
-         * should be willing to use for loading the confirmation
-         * image. Defaults to not being used.
-         *
-         * @param quality something in (0.0f, 1.0f] range
-         * @return the builder, for further configuration
-         */
-        public IntentBuilder confirmationQuality(float quality) {
-            if (quality <= 0.0f || quality > 1.0f) {
-                throw new IllegalArgumentException("Quality outside (0.0f, 1.0f] range!");
-            }
-
-            result.putExtra(EXTRA_CONFIRMATION_QUALITY, quality);
-
-            return (this);
-        }
-
-        /**
-         * Call to set a countdown timer for taking the picture. The picture will
-         * be taken after the specified number of seconds automatically, unless
-         * the activity is destroyed already (e.g., user already took a picture).
-         *
-         * @param duration time to wait before taking picture, in seconds
-         * @return the builder, for further configuration
-         */
-        public IntentBuilder timer(int duration) {
-            if (duration <= 0) {
-                throw new IllegalArgumentException("Timer duration must be positive");
-            }
-
-            result.putExtra(EXTRA_TIMER, duration);
-
-            return (this);
-        }
-    }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConfigurator.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConfigurator.java
deleted file mode 100644
index 135e12f..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConfigurator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-/**
- * Stub base interface for all configurators, mostly for type
- * safety.
- */
-public interface CameraConfigurator {
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConstraints.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConstraints.java
deleted file mode 100644
index 3d16422..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraConstraints.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/***
- Copyright (c) 2016 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.media.CamcorderProfile;
-import android.os.Build;
-import com.commonsware.cwac.cam2.util.Size;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-public class CameraConstraints {
-  private static final ArrayList<CameraConstraints> CONSTRAINTS=
-    new ArrayList<>();
-  private static final CameraConstraints DEVICE_CONSTRAINT;
-  private final Pattern manufacturer;
-  private final Pattern product;
-  private final Pattern model;
-  private final boolean supportsCameraTwo;
-  private final int highCamcorderProfile;
-  private final boolean disableFocusMode;
-  private final int cameraDisplayOrientation;
-  private final boolean supportsFFC;
-  private final boolean supportsFFCVideo;
-  private final boolean supportsRFC;
-  private final boolean supportsRFCVideo;
-  private final ArrayList<Size> previewFFCSizeWhitelist;
-  private final ArrayList<Size> previewRFCSizeWhitelist;
-  private final ArrayList<Size> pictureFFCSizeWhitelist;
-  private final ArrayList<Size> pictureRFCSizeWhitelist;
-
-  static {
-    add(new Builder()
-      .product("sdk_phone_x86")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("Amazon")
-      .product("full_ford")
-      .supportsCameraTwo(false)
-      .highCamcorderProfile(CamcorderProfile.QUALITY_1080P)
-      .build());
-    add(new Builder()
-      .manufacturer("asus")
-      .product("razor")
-      .supportsCameraTwo(false)
-      .supportsRFCVideo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("asus")
-      .product("US_epad")
-      .highCamcorderProfile(CamcorderProfile.QUALITY_480P)
-      .build());
-    add(new Builder()
-      .manufacturer("htc")
-      .product("volantis")
-      .disableFocusMode(true)
-      .build());
-    add(new Builder()
-      .manufacturer("HTC")
-      .product("htc_mecha")
-      .supportsFFC(false)
-      .supportsFFCVideo(false)
-      .supportsRFCVideo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("htc")
-      .product("volantisg")
-      .disableFocusMode(true)
-      .build());
-    add(new Builder()
-      .manufacturer("HUAWEI")
-      .product("KIW-L24")
-      .supportsCameraTwo(false)
-      .highCamcorderProfile(CamcorderProfile.QUALITY_1080P)
-      .build());
-    add(new Builder()
-      .manufacturer("LGE")
-      .product("bullhead")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("LGE")
-      .product("g3_tmo_us")
-      .supportsFFCVideo(false)
-      .supportsRFCVideo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("LGE")
-      .product("hammerhead")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("LGE")
-      .product("palman")
-      .supportsCameraTwo(false)
-      .previewFFCSizeWhitelist(new Size(1280,720))
-      .build());
-    add(new Builder()
-      .manufacturer("LGE")
-      .product("p1_global_com")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("LGE")
-      .product("p1_usc_us")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("LGE")
-      .product("pplus_tmo_us")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("motorola")
-      .product("surnia_retca")
-      .supportsCameraTwo(false)
-      .previewRFCSizeWhitelist(new Size(1280,720))
-      .build());
-    add(new Builder()
-      .manufacturer("NVIDIA")
-      .product("sb_na_wf")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("OnePlus")
-      .model("ONE E1005")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("samsung")
-      .product("baffinssvj")
-      .previewRFCSizeWhitelist(new Size(1280,720))
-      .previewFFCSizeWhitelist(new Size(720,480))
-      .build());
-    add(new Builder()
-      .manufacturer("samsung")
-      .product("chagallwifixx")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("samsung")
-      .product("ha3gub")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("samsung")
-      .product("mantaray")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("samsung")
-      .product("m0xx")
-      .highCamcorderProfile(CamcorderProfile.QUALITY_QCIF)
-      .build());
-    add(new Builder()
-      .manufacturer("samsung")
-      .product("serranoltexx")
-      .previewRFCSizeWhitelist(new Size(960, 720))
-      .supportsFFC(false)
-      .highCamcorderProfile(CamcorderProfile.QUALITY_480P)
-      .build());
-    add(new Builder()
-      .manufacturer("samsung")
-      .product("sf2wifixx")
-      .cameraDisplayOrientation(0)
-      .build());
-    add(new Builder()
-      .manufacturer("samsung")
-      .product("t03gxx")
-      .supportsFFCVideo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("samsung")
-      .product("zerofltexx")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("Sony")
-      .product("C1505")
-      .supportsFFCVideo(false)
-      .supportsRFCVideo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("Sony")
-      .product("C6603")
-      .disableFocusMode(true)
-      .highCamcorderProfile(CamcorderProfile.QUALITY_480P)
-      .build());
-    add(new Builder()
-      .manufacturer("Sony")
-      .product("C6802")
-      .disableFocusMode(true)
-      .build());
-    add(new Builder()
-      .manufacturer("Sony")
-      .product("D5803")
-      .disableFocusMode(true)
-      .highCamcorderProfile(CamcorderProfile.QUALITY_480P)
-      .build());
-    add(new Builder()
-      .manufacturer("Sony")
-      .product("E2115")
-      .highCamcorderProfile(CamcorderProfile.QUALITY_480P)
-      .build());
-    add(new Builder()
-      .manufacturer("Spectralink")
-      .product("cyclops_6dq")
-      .highCamcorderProfile(CamcorderProfile.QUALITY_1080P)
-      .previewRFCSizeWhitelist(new Size(1920,1080))
-      .pictureRFCSizeWhitelist(new Size(1920,1080))
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("Wileyfox")
-      .product("Swift")
-      .supportsCameraTwo(false)
-      .build());
-    add(new Builder()
-      .manufacturer("LGE")
-      .supportsCameraTwo(false)
-      .build());
-
-    CameraConstraints match=null;
-
-    for (CameraConstraints m : CONSTRAINTS) {
-      if (m.isMatch()) {
-        match=m;
-        break;
-      }
-    }
-
-    DEVICE_CONSTRAINT=match;
-  }
-
-  public static void add(CameraConstraints matcher) {
-    CONSTRAINTS.add(matcher);
-  }
-
-  public static CameraConstraints get() {
-    return(DEVICE_CONSTRAINT);
-  }
-
-  private CameraConstraints(Pattern manufacturer,
-                            Pattern product, Pattern model,
-                            boolean supportsCameraTwo,
-                            int highCamcorderProfile,
-                            boolean disableFocusMode,
-                            int cameraDisplayOrientation,
-                            boolean supportsFFC,
-                            boolean supportsFFCVideo,
-                            boolean supportsRFC,
-                            boolean supportsRFCVideo,
-                            ArrayList<Size> previewFFCSizeWhitelist,
-                            ArrayList<Size> previewRFCSizeWhitelist,
-                            ArrayList<Size> pictureFFCSizeWhitelist,
-                            ArrayList<Size> pictureRFCSizeWhitelist) {
-    this.manufacturer=manufacturer;
-    this.product=product;
-    this.model=model;
-    this.supportsCameraTwo=supportsCameraTwo;
-    this.highCamcorderProfile=highCamcorderProfile;
-    this.disableFocusMode=disableFocusMode;
-    this.cameraDisplayOrientation=cameraDisplayOrientation;
-    this.supportsFFC=supportsFFC;
-    this.supportsFFCVideo=supportsFFCVideo;
-    this.supportsRFC=supportsRFC;
-    this.supportsRFCVideo=supportsRFCVideo;
-    this.previewFFCSizeWhitelist=previewFFCSizeWhitelist;
-    this.previewRFCSizeWhitelist=previewRFCSizeWhitelist;
-    this.pictureFFCSizeWhitelist=pictureFFCSizeWhitelist;
-    this.pictureRFCSizeWhitelist=pictureRFCSizeWhitelist;
-  }
-
-  public boolean isMatch() {
-    boolean result=true;
-
-/*
-android.util.Log.e("20160618", Build.MANUFACTURER);
-android.util.Log.e("20160618", Build.PRODUCT);
-android.util.Log.e("20160618", Build.MODEL);
-*/
-
-    if (manufacturer!=null) {
-      result=manufacturer.matcher(Build.MANUFACTURER).matches();
-    }
-
-    if (result && product!=null) {
-      result=product.matcher(Build.PRODUCT).matches();
-    }
-
-    if (result && model!=null) {
-      result=model.matcher(Build.MODEL).matches();
-    }
-
-    return(result);
-  }
-
-  public boolean supportsCameraTwo() {
-    return(supportsCameraTwo);
-  }
-
-  public int getHighCamcorderProfile() {
-    return(highCamcorderProfile);
-  }
-
-  public boolean getDisableFocusMode() {
-    return(disableFocusMode);
-  }
-
-  public int getCameraDisplayOrientation() {
-    return(cameraDisplayOrientation);
-  }
-
-  public boolean supportsFFC() {
-    return(supportsFFC);
-  }
-
-  public boolean supportsFFCVideo() {
-    return(supportsFFCVideo);
-  }
-
-  public boolean supportsRFC() {
-    return(supportsRFC);
-  }
-
-  public boolean supportsRFCVideo() {
-    return(supportsRFCVideo);
-  }
-
-  public List<Size> getPreviewFFCSizeWhitelist() {
-    return(previewFFCSizeWhitelist);
-  }
-
-  public List<Size> getPreviewRFCSizeWhitelist() {
-    return(previewRFCSizeWhitelist);
-  }
-
-  public List<Size> getPictureFFCSizeWhitelist() {
-    return(pictureFFCSizeWhitelist);
-  }
-
-  public List<Size> getPictureRFCSizeWhitelist() {
-    return(pictureRFCSizeWhitelist);
-  }
-
-  public static class Builder {
-    private Pattern manufacturer;
-    private Pattern product;
-    private Pattern model;
-    private boolean supportsCameraTwo=false;
-    private int highCamcorderProfile=CamcorderProfile.QUALITY_HIGH;
-    private boolean disableFocusMode=false;
-    private int cameraDisplayOrientation=-1;
-    private boolean supportsFFC=true;
-    private boolean supportsFFCVideo=true;
-    private boolean supportsRFC=true;
-    private boolean supportsRFCVideo=true;
-    private ArrayList<Size> previewFFCSizeWhitelist;
-    private ArrayList<Size> previewRFCSizeWhitelist;
-    private ArrayList<Size> pictureFFCSizeWhitelist;
-    private ArrayList<Size> pictureRFCSizeWhitelist;
-
-    public Builder manufacturer(String mfr) {
-      return(manufacturer(Pattern.compile(mfr)));
-    }
-
-    public Builder manufacturer(Pattern manufacturer) {
-      this.manufacturer=manufacturer;
-
-      return(this);
-    }
-
-    public Builder product(String product) {
-      return(product(Pattern.compile(product)));
-    }
-
-    public Builder product(Pattern product) {
-      this.product=product;
-
-      return(this);
-    }
-
-    public Builder model(String model) {
-      return(model(Pattern.compile(model)));
-    }
-
-    public Builder model(Pattern model) {
-      this.model=model;
-
-      return(this);
-    }
-
-    public Builder supportsCameraTwo(boolean supportsCameraTwo) {
-      this.supportsCameraTwo=supportsCameraTwo;
-
-      return(this);
-    }
-
-    public Builder highCamcorderProfile(int highCamcorderProfile) {
-      this.highCamcorderProfile=highCamcorderProfile;
-
-      return(this);
-    }
-
-    public Builder disableFocusMode(boolean disableFocusMode) {
-      this.disableFocusMode=disableFocusMode;
-
-      return(this);
-    }
-
-    public Builder cameraDisplayOrientation(int cameraDisplayOrientation) {
-      this.cameraDisplayOrientation=cameraDisplayOrientation;
-
-      return(this);
-    }
-
-    public Builder supportsFFC(boolean supportsFFC) {
-      this.supportsFFC=supportsFFC;
-
-      return(this);
-    }
-
-    public Builder supportsFFCVideo(boolean supportsFFCVideo) {
-      this.supportsFFCVideo=supportsFFCVideo;
-
-      return(this);
-    }
-
-    public Builder supportsRFC(boolean supportsRFC) {
-      this.supportsRFC=supportsRFC;
-
-      return(this);
-    }
-
-    public Builder supportsRFCVideo(boolean supportsRFCVideo) {
-      this.supportsRFCVideo=supportsRFCVideo;
-
-      return(this);
-    }
-
-    public Builder previewFFCSizeWhitelist(Size... sizes) {
-      if (previewFFCSizeWhitelist==null) {
-        previewFFCSizeWhitelist=new ArrayList<>();
-      }
-
-      for (Size size : sizes) {
-        previewFFCSizeWhitelist.add(size);
-      }
-
-      return(this);
-    }
-
-    public Builder previewRFCSizeWhitelist(Size... sizes) {
-      if (previewRFCSizeWhitelist==null) {
-        previewRFCSizeWhitelist=new ArrayList<>();
-      }
-
-      for (Size size : sizes) {
-        previewRFCSizeWhitelist.add(size);
-      }
-
-      return(this);
-    }
-
-    public Builder pictureFFCSizeWhitelist(Size... sizes) {
-      if (pictureFFCSizeWhitelist==null) {
-        pictureFFCSizeWhitelist=new ArrayList<>();
-      }
-
-      for (Size size : sizes) {
-        pictureFFCSizeWhitelist.add(size);
-      }
-
-      return(this);
-    }
-
-    public Builder pictureRFCSizeWhitelist(Size... sizes) {
-      if (pictureRFCSizeWhitelist==null) {
-        pictureRFCSizeWhitelist=new ArrayList<>();
-      }
-
-      for (Size size : sizes) {
-        pictureRFCSizeWhitelist.add(size);
-      }
-
-      return(this);
-    }
-
-    public CameraConstraints build() {
-      return(new CameraConstraints(manufacturer, product, model,
-        supportsCameraTwo, highCamcorderProfile, disableFocusMode,
-        cameraDisplayOrientation, supportsFFC, supportsFFCVideo,
-        supportsRFC, supportsRFCVideo, previewFFCSizeWhitelist,
-        previewRFCSizeWhitelist, pictureFFCSizeWhitelist,
-        pictureRFCSizeWhitelist));
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraController.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraController.java
deleted file mode 100644
index 6339e4b..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraController.java
+++ /dev/null
@@ -1,510 +0,0 @@
-/***
- * Copyright (c) 2015 CommonsWare, LLC
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you
- * may
- * not use this file except in compliance with the License. You may
- * obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing,
- * software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions
- * and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.content.res.Configuration;
-import android.graphics.ImageFormat;
-import android.graphics.SurfaceTexture;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.ResultReceiver;
-import android.view.View;
-import com.commonsware.cwac.cam2.plugin.FlashModePlugin;
-import com.commonsware.cwac.cam2.plugin.FocusModePlugin;
-import com.commonsware.cwac.cam2.plugin.OrientationPlugin;
-import com.commonsware.cwac.cam2.plugin.SizeAndFormatPlugin;
-import com.commonsware.cwac.cam2.util.Size;
-import com.commonsware.cwac.cam2.util.Utils;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Queue;
-
-/**
- * Controller for camera-related functions, designed to be used
- * by CameraFragment or the equivalent.
- */
-public class CameraController implements CameraView.StateCallback {
-  private final boolean allowChangeFlashMode;
-  private CameraEngine engine;
-  private CameraSession session;
-  private List<CameraDescriptor> cameras=null;
-  private int currentCamera=0;
-  private final HashMap<CameraDescriptor, CameraView> previews=
-    new HashMap<CameraDescriptor, CameraView>();
-  private Queue<CameraView> availablePreviews=null;
-  private boolean switchPending=false;
-  private boolean isVideoRecording=false;
-  private final FocusMode focusMode;
-  private final boolean isVideo;
-  private FlashModePlugin flashModePlugin;
-  private int zoomLevel=0;
-  private int quality=0;
-  private final ResultReceiver onError;
-
-  public CameraController(FocusMode focusMode,
-                          ResultReceiver onError,
-                          boolean allowChangeFlashMode,
-                          boolean isVideo) {
-    this.onError=onError;
-    this.focusMode=focusMode==null ?
-      FocusMode.CONTINUOUS : focusMode;
-    this.isVideo=isVideo;
-    this.allowChangeFlashMode=allowChangeFlashMode;
-  }
-
-  /**
-   * @return the engine being used by this fragment to access
-   * the camera(s) on the device
-   */
-  public CameraEngine getEngine() {
-    return (engine);
-  }
-
-  /**
-   * Setter for the engine. Must be called before onCreateView()
-   * is called, preferably shortly after constructing the
-   * fragment.
-   *
-   * @param engine the engine to be used by this fragment to access
-   * the camera(s) on the device
-   */
-  public void setEngine(CameraEngine engine,
-                        CameraSelectionCriteria criteria) {
-    this.engine=engine;
-
-    AbstractCameraActivity.BUS.register(this);
-
-    engine.loadCameraDescriptors(criteria);
-  }
-
-  public int getNumberOfCameras() {
-    return (cameras==null ? 0 : cameras.size());
-  }
-
-  /**
-   * Call this from onStart() of an activity or fragment, or from
-   * an equivalent point in time. If the CameraView is ready,
-   * the preview should begin; otherwise, the preview will
-   * begin after the CameraView is ready.
-   */
-  public void start() {
-    if (cameras!=null) {
-      CameraDescriptor camera=cameras.get(currentCamera);
-      CameraView cv=getPreview(camera);
-
-      if (cv.isAvailable()) {
-        open();
-      }
-    }
-  }
-
-  /**
-   * Call this from onStop() of an activity or fragment, or
-   * from an equivalent point in time, to indicate that you want
-   * the camera preview to stop.
-   */
-  public void stop() throws Exception {
-    if (session!=null) {
-      stopVideoRecording(true);
-
-      CameraSession temp=session;
-
-      session=null;
-      engine.close(temp);
-      // session.destroy(); -- moved into engines
-    }
-  }
-
-  /**
-   * Call this from onDestroy() of an activity or fragment,
-   * or from an equivalent point in time, to tear down the
-   * entire controller. A fresh controller should
-   * be created if you want to use the camera again in the future.
-   */
-  public void destroy() {
-    AbstractCameraActivity.BUS.post(
-      new ControllerDestroyedEvent(this));
-    AbstractCameraActivity.BUS.unregister(this);
-  }
-
-  /**
-   * Call to switch to the next camera in sequence. Most
-   * devices have only two cameras, and so calling this will
-   * switch the preview and pictures to the camera other than
-   * the one presently being used.
-   */
-  public void switchCamera() throws Exception {
-    if (session!=null) {
-      getPreview(session.getDescriptor()).setVisibility(
-        View.INVISIBLE);
-      switchPending=true;
-      stop();
-    }
-  }
-
-  /**
-   * Supplies CameraView objects for each camera. After this,
-   * we can open() the camera.
-   *
-   * @param cameraViews a list of CameraViews
-   */
-  public void setCameraViews(Queue<CameraView> cameraViews) {
-    availablePreviews=cameraViews;
-    previews.clear();
-
-    for (CameraView cv : cameraViews) {
-      cv.setStateCallback(this);
-    }
-
-    open(); // in case visible CameraView is already ready
-  }
-
-  /**
-   * Public because Java interfaces are intrinsically public.
-   * This method is not part of the class' API and should not
-   * be used by third-party developers.
-   *
-   * @param cv the CameraView that is now ready
-   */
-  @Override
-  public void onReady(CameraView cv) {
-    if (cameras!=null) {
-      open();
-    }
-  }
-
-  /**
-   * Public because Java interfaces are intrinsically public.
-   * This method is not part of the class' API and should not
-   * be used by third-party developers.
-   *
-   * @param cv the CameraView that is now destroyed
-   */
-  @Override
-  public void onDestroyed(CameraView cv) throws Exception {
-    stop();
-  }
-
-  /**
-   * Takes a picture, in accordance with the details supplied
-   * in the PictureTransaction. Subscribe to the
-   * PictureTakenEvent to get the results of the picture.
-   *
-   * @param xact a PictureTransaction describing what should be taken
-   */
-  public void takePicture(PictureTransaction xact) {
-    if (session!=null) {
-      AbstractCameraActivity.BUS.post(new PictureCaptureStartEvent());
-      engine.takePicture(session, xact);
-    }
-  }
-
-  public void recordVideo(VideoTransaction xact) throws Exception {
-    if (session!=null) {
-      engine.recordVideo(session, xact);
-      isVideoRecording=true;
-    }
-  }
-
-  public void stopVideoRecording(boolean abandon) throws Exception {
-    if (session!=null && isVideoRecording) {
-      try {
-        engine.stopVideoRecording(session, abandon);
-      }
-      finally {
-        isVideoRecording=false;
-      }
-    }
-  }
-
-  public void setQuality(int quality) {
-    this.quality=quality;
-  }
-
-  public boolean canToggleFlashMode() {
-    return (allowChangeFlashMode &&
-      engine.supportsDynamicFlashModes() &&
-      engine.hasMoreThanOneEligibleFlashMode());
-  }
-
-  public FlashMode getCurrentFlashMode() {
-    return (session.getCurrentFlashMode());
-  }
-
-  public boolean supportsZoom() {
-    return (engine.supportsZoom(session));
-  }
-
-  public int getCurrentCamera() {
-    return (currentCamera);
-  }
-
-  public void setCurrentCamera(int currentCamera) {
-    this.currentCamera=currentCamera;
-  }
-
-  public boolean changeZoom(int delta) {
-    zoomLevel+=delta;
-
-    return (handleZoom());
-  }
-
-  public boolean setZoom(int zoomLevel) {
-    this.zoomLevel=zoomLevel;
-
-    return (handleZoom());
-  }
-
-  private boolean handleZoom() {
-    if (zoomLevel<0) {
-      zoomLevel=0;
-    }
-    else if (zoomLevel>100) {
-      zoomLevel=100;
-    }
-
-    return (engine.zoomTo(session, zoomLevel));
-  }
-
-  private CameraView getPreview(CameraDescriptor camera) {
-    CameraView result=previews.get(camera);
-
-    if (result==null && availablePreviews!=null) {
-      result=availablePreviews.remove();
-      previews.put(camera, result);
-    }
-
-    return (result);
-  }
-
-  private int getNextCameraIndex() {
-    int next=currentCamera+1;
-
-    if (next==cameras.size()) {
-      next=0;
-    }
-
-    return (next);
-  }
-
-  private void open() {
-    if (session==null) {
-      Size previewSize=null;
-      CameraDescriptor camera=cameras.get(currentCamera);
-      CameraView cv=getPreview(camera);
-      Size pictureSize;
-
-      if (quality>0) {
-        pictureSize=Utils.getLargestPictureSize(camera);
-      }
-      else {
-        pictureSize=Utils.getSmallestPictureSize(camera);
-      }
-
-      if (camera!=null && cv.getWidth()>0 && cv.getHeight()>0) {
-        previewSize=Utils.chooseOptimalSize(camera.getPreviewSizes(),
-          cv.getWidth(), cv.getHeight(), pictureSize);
-      }
-
-      SurfaceTexture texture=cv.getSurfaceTexture();
-
-      if (previewSize!=null && texture!=null) {
-        if (Build.VERSION.SDK_INT>=
-          Build.VERSION_CODES.JELLY_BEAN_MR1) {
-          texture.setDefaultBufferSize(previewSize.getWidth(),
-            previewSize.getHeight());
-        }
-
-        flashModePlugin=new FlashModePlugin();
-
-        session=engine
-          .buildSession(cv.getContext(), camera)
-          .addPlugin(new SizeAndFormatPlugin(previewSize,
-            pictureSize, ImageFormat.JPEG))
-          .addPlugin(new OrientationPlugin(cv.getContext()))
-          .addPlugin(
-            new FocusModePlugin(cv.getContext(), focusMode, isVideo))
-          .addPlugin(flashModePlugin)
-          .build();
-
-        session.setPreviewSize(previewSize);
-        engine.open(session, texture);
-      }
-    }
-  }
-
-  @SuppressWarnings("unused")
-  @Subscribe(threadMode=ThreadMode.MAIN)
-  public void onEventMainThread(
-    CameraEngine.CameraDescriptorsEvent event) {
-    if (event.exception!=null) {
-      postError(ErrorConstants.ERROR_LIST_CAMERAS, event.exception);
-    }
-
-    if (event.descriptors.size()>0) {
-      cameras=event.descriptors;
-      AbstractCameraActivity.BUS.post(
-        new ControllerReadyEvent(this, cameras.size()));
-    }
-    else {
-      AbstractCameraActivity.BUS.post(new NoSuchCameraEvent());
-    }
-  }
-
-  @SuppressWarnings("unused")
-  @Subscribe(threadMode=ThreadMode.MAIN)
-  public void onEventMainThread(CameraEngine.OpenedEvent event) {
-    if (event.exception!=null) {
-      // handled at fragment level
-    }
-    else {
-      CameraDescriptor camera=cameras.get(currentCamera);
-      CameraView cv=getPreview(camera);
-
-      if (cv!=null) {
-        boolean shouldSwapPreviewDimensions=
-          cv
-            .getContext()
-            .getResources()
-            .getConfiguration().orientation==
-            Configuration.ORIENTATION_PORTRAIT;
-        Size virtualPreviewSize=session.getPreviewSize();
-        /*
-         * Size will always be like this: 4032x3024, 2688x1512 or 800x600, so in portrait mode,
-         * it is mandatory to swap these values or preview will stretch
-         */
-        if (shouldSwapPreviewDimensions) {
-          virtualPreviewSize=
-            new Size(session.getPreviewSize().getHeight(),
-              session.getPreviewSize().getWidth());
-        }
-
-        cv.setPreviewSize(virtualPreviewSize);
-      }
-    }
-  }
-
-  @SuppressWarnings("unused")
-  @Subscribe(threadMode=ThreadMode.MAIN)
-  public void onEventMainThread(CameraEngine.ClosedEvent event) {
-    if (event.exception!=null) {
-      postError(ErrorConstants.ERROR_CLOSE_CAMERA, event.exception);
-      AbstractCameraActivity.BUS.post(new NoSuchCameraEvent());
-    }
-    else {
-      if (switchPending) {
-        switchPending=false;
-        currentCamera=getNextCameraIndex();
-        getPreview(cameras.get(currentCamera))
-          .setVisibility(View.VISIBLE);
-        open();
-      }
-    }
-  }
-
-  @SuppressWarnings("unused")
-  @Subscribe(threadMode=ThreadMode.MAIN)
-  public void onEventMainThread(
-    CameraEngine.OrientationChangedEvent event) {
-    if (engine!=null) {
-      engine.handleOrientationChange(session, event);
-    }
-  }
-
-  @SuppressWarnings("unused")
-  @Subscribe(threadMode=ThreadMode.MAIN)
-  public void onEventMainThread(CameraEngine.DeepImpactEvent event) {
-    postError(ErrorConstants.ERROR_MISC, event.exception);
-  }
-
-  public void postError(int resultCode, Throwable e) {
-    if (onError!=null) {
-      Bundle resultData=new Bundle();
-      StringWriter sw=new StringWriter();
-
-      e.printStackTrace(new PrintWriter(sw));
-      resultData
-        .putString(ErrorConstants.RESULT_STACK_TRACE,
-          sw.toString());
-      onError.send(resultCode, resultData);
-    }
-  }
-
-  /**
-   * Raised if there are no available cameras on this
-   * device. Consider using uses-feature elements in the
-   * manifest, so your app only runs on devices that have
-   * a camera, if you need a camera.
-   */
-  public static class NoSuchCameraEvent {
-
-  }
-
-  /**
-   * Event raised when the controller has its cameras
-   * and is ready for use. Clients should then turn
-   * around and call setCameraViews() to complete the process
-   * and start showing the first preview.
-   */
-  public static class ControllerReadyEvent {
-    final private int cameraCount;
-    final private CameraController ctlr;
-
-    private ControllerReadyEvent(CameraController ctlr,
-                                 int cameraCount) {
-      this.cameraCount=cameraCount;
-      this.ctlr=ctlr;
-    }
-
-    public int getNumberOfCameras() {
-      return (cameraCount);
-    }
-
-    public boolean isEventForController(CameraController ctlr) {
-      return (this.ctlr==ctlr);
-    }
-  }
-
-  /**
-   * Event raised when the controller has its cameras
-   * and is ready for use. Clients should then turn
-   * around and call setCameraViews() to complete the process
-   * and start showing the first preview.
-   */
-  public static class ControllerDestroyedEvent {
-    private final CameraController ctlr;
-
-    ControllerDestroyedEvent(CameraController ctlr) {
-      this.ctlr=ctlr;
-    }
-
-    public CameraController getDestroyedController() {
-      return (ctlr);
-    }
-  }
-
-  public static class PictureCaptureStartEvent {
-
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraDescriptor.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraDescriptor.java
deleted file mode 100644
index b760087..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraDescriptor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import com.commonsware.cwac.cam2.util.Size;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A representation of a camera. Specific camera engines will
- * have their own descriptors, which they can use for tracking
- * IDs or other information about the camera. From the standpoint
- * of the public API, a descriptor should be fairly opaque, supplying
- * information about the camera capabilities, but nothing more.
- */
-public interface CameraDescriptor {
-  /**
-   * @return The possible preview sizes for the camera, in no
-   * particular order
-   */
-  List<Size> getPreviewSizes();
-
-  /**
-   * @return The possible picture sizes for the camera, in no
-   * particular order
-   */
-  List<Size> getPictureSizes();
-
-  /**
-   * Indicates if the camera (and this library) supports a
-   * particular image format for pictures.
-   *
-   * @param format an ImageFormat value (e.g., ImageFormat.JPEG)
-   * @return true if supported, false otherwise
-   */
-  boolean isPictureFormatSupported(int format);
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java
deleted file mode 100644
index f141c3a..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraEngine.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.content.Context;
-import android.graphics.SurfaceTexture;
-import android.os.Build;
-import android.util.Log;
-import org.greenrobot.eventbus.EventBus;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Base class for camera engines, which abstract out camera
- * functionality for different APIs (e.g., android.hardware.Camera,
- * android.hardware.camera2.*).
- */
-abstract public class CameraEngine {
-  private static final int CORE_POOL_SIZE=1;
-  private static final int MAX_POOL_SIZE=Runtime.getRuntime().availableProcessors();
-  private static final int KEEP_ALIVE_SECONDS=60;
-  private static volatile CameraEngine singletonClassic=null;
-  private static volatile CameraEngine singletonTwo=null;
-  private EventBus bus=AbstractCameraActivity.BUS;
-  private boolean isDebug=false;
-  private final LinkedBlockingQueue<Runnable> queue=new LinkedBlockingQueue<Runnable>();
-  private ThreadPoolExecutor pool;
-  private File savePreviewFile=null;
-  protected List<FlashMode> preferredFlashModes;
-  protected ArrayList<FlashMode> eligibleFlashModes=
-    new ArrayList<FlashMode>();
-
-  public enum ID {
-    CLASSIC,
-    CAMERA2
-  }
-
-  private static class CrashableEvent {
-    /**
-     * The exception that was raised when trying to process
-     * the request, or null if no such exception was raised.
-     */
-    public final Throwable exception;
-
-    public CrashableEvent() {
-      this(null);
-    }
-
-    public CrashableEvent(Throwable e) {
-      if (e!=null) {
-        Log.e("CWAC-Cam2", "Exception in camera processing", e);
-      }
-
-      this.exception=e;
-    }
-  }
-
-  /**
-   * Event raised when camera descriptors are ready for use.
-   * Subscribe to this event if you use loadCameraDescriptors()
-   * to get the results. May include an exception if there was
-   * an exception accessing the camera.
-   *
-   * Note that the descriptors will be in a ranked order based
-   * on your requested CameraSelectionCriteria, with the best
-   * match as the 0th element of the list.
-   */
-  public static class CameraDescriptorsEvent extends CrashableEvent {
-    /**
-     * The camera descriptors loaded in response to a call
-     * to loadCameraDescriptors()
-     */
-    public final List<CameraDescriptor> descriptors;
-
-    public CameraDescriptorsEvent(List<CameraDescriptor> descriptors) {
-      this.descriptors=descriptors;
-    }
-
-    public CameraDescriptorsEvent(Exception exception) {
-      super(exception);
-      this.descriptors=null;
-    }
-  }
-
-  /**
-   * Event raised when the camera has been opened.
-   * Subscribe to this event if you use open()
-   * to to find out when the open has succeeded.
-   * May include an exception if there was
-   * an exception accessing the camera.
-   */
-  public static class OpenedEvent extends CrashableEvent {
-    public OpenedEvent() {
-      super();
-    }
-
-    public OpenedEvent(Exception exception) {
-      super(exception);
-    }
-  }
-
-  /**
-   * Event raised when the camera has been closed.
-   * Subscribe to this event if you use close()
-   * to to find out when the close has completed.
-   * May include an exception if there was
-   * an exception closing the camera.
-   */
-  public static class ClosedEvent extends CrashableEvent {
-    public ClosedEvent() {
-      super();
-    }
-
-    public ClosedEvent(Exception exception) {
-      super(exception);
-    }
-  }
-
-  /**
-   * Used for errors happening deep in the engines or elsewhere
-   * (e.g., JPEGWriter ran out of disk space)
-   */
-  public static class DeepImpactEvent extends CrashableEvent {
-    public DeepImpactEvent(Throwable exception) {
-      super(exception);
-    }
-  }
-
-  public static class OrientationChangedEvent {
-
-  }
-
-  public static class SmoothZoomCompletedEvent {
-
-  }
-
-  /**
-   * Event raised when picture is taken, as a result of a
-   * takePicture() call. May include an exception if there was
-   * an exception accessing the camera.
-   */
-  public static class PictureTakenEvent extends CrashableEvent {
-    private ImageContext imageContext;
-    private PictureTransaction xact;
-
-    public PictureTakenEvent(PictureTransaction xact,
-                             ImageContext imageContext) {
-      super();
-      this.xact=xact;
-      this.imageContext=imageContext;
-    }
-
-    public PictureTakenEvent(Exception exception) {
-      super(exception);
-    }
-
-    public ImageContext getImageContext() {
-      return(imageContext);
-    }
-
-    public PictureTransaction getPictureTransaction() {
-      return(xact);
-    }
-  }
-
-  /**
-   * Event raised when picture is taken, as a result of a
-   * takePicture() call. May include an exception if there was
-   * an exception accessing the camera.
-   */
-  public static class VideoTakenEvent extends CrashableEvent {
-    private VideoTransaction xact;
-
-    public VideoTakenEvent(VideoTransaction xact) {
-      super();
-      this.xact=xact;
-    }
-
-    public VideoTakenEvent(Exception exception) {
-      super(exception);
-    }
-
-    public VideoTransaction getVideoTransaction() {
-      return(xact);
-    }
-  }
-
-  /**
-   * Base class for all ¯\_(ツ)_/¯ errors triggered by camera2
-   * API operations that we really should surface to callers,
-   * but either are not tied to specific requests or happen
-   * asynchronously with respect to the request. Usually, these
-   * are bad. However, they frequently do not have useful
-   * error information associated with them, because, well,
-   * that would have been useful.
-   */
-  public static class CameraTwoGenericEvent {
-
-  }
-
-  /**
-   * Event raised if there is a problem starting up the
-   * CameraTwoEngine preview. The error field is the value passed
-   * into onError() of a CameraDevice.StateCallback object and
-   * probably means something to somebody.
-   */
-  public static class CameraTwoPreviewErrorEvent
-    extends CameraTwoGenericEvent {
-    public final int error;
-
-    CameraTwoPreviewErrorEvent(int error) {
-      this.error=error;
-    }
-  }
-
-  /**
-   * Event raised if there is a different sort of problem
-   * starting up the CameraTwoEngine preview. This will be
-   * triggered by a CameraCaptureSession.StateCallback,
-   * and there is no error information of note.
-   */
-  public static class CameraTwoPreviewFailureEvent
-    extends CameraTwoGenericEvent {
-  }
-
-  /**
-   * Create a CameraSession.Builder to build a CameraSession
-   * for a given CameraDescriptor. On the Builder is where you
-   * indicate your desired preview size, picture size, and
-   * so forth.
-   *
-   * @param ctxt an Android Context for accessing system stuff
-   * @param descriptor the CameraDescriptor for which we want
-   *                   a session
-   * @return a Builder to build that session
-   */
-  abstract public CameraSession.Builder buildSession(Context ctxt,
-                                                     CameraDescriptor descriptor);
-
-  /**
-   * Loads a roster of the available cameras for this engine,
-   * ranked based on the supplied criteria. Subscribe
-   * to the CameraDescriptorsEvent to get the results of this
-   * call asynchronously.
-   *
-   * @param criteria preferred camera capabilities, or
-   *                 null for a default ranking
-   */
-  abstract public void loadCameraDescriptors(CameraSelectionCriteria criteria);
-
-  /**
-   * Open the requested camera and show a preview on the supplied
-   * surface. Subscribe to the OpenEvent to find out when this
-   * work is completed.
-   *
-   * @param session the session for the camera of interest
-   * @param texture the preview surface
-   */
-  abstract public void open(CameraSession session,
-                            SurfaceTexture texture);
-
-  /**
-   * Close the open camera. Subscribe to the ClosedEvent to
-   * find out when this work is completed. Note that this
-   * method may be synchronous or asynchronous.
-   *
-   * @param session the session for the camera of interest
-   */
-  abstract public void close(CameraSession session);
-
-  /**
-   * Take a picture, on the supplied camera, using the picture
-   * configuration from the supplied transaction. Posts a
-   * PictureTakenEvent when the request is completed, successfully
-   * or unsuccessfully.
-   *
-   * @param session the session for the camera of interest
-   * @param xact the configuration of the picture to take
-   */
-  abstract public void takePicture(CameraSession session,
-                                   PictureTransaction xact);
-
-  abstract public void recordVideo(CameraSession session,
-      VideoTransaction xact) throws Exception;
-
-  abstract public void stopVideoRecording(CameraSession session,
-                                          boolean abandon) throws Exception;
-
-  abstract public void handleOrientationChange(CameraSession session,
-                                               OrientationChangedEvent event);
-
-  /**
-   * @return true if the engine supports changing flash modes
-   * on the fly, false otherwise
-   */
-  abstract public boolean supportsDynamicFlashModes();
-
-  /**
-   * @return true if this camera supports zoom, false otherwise
-   */
-  abstract public boolean supportsZoom(CameraSession session);
-
-  /**
-   * Sets the zoom level for the camera.
-   *
-   * @param session the session for the camera of interest
-   * @param zoomLevel 0-100, 100=max zoom
-   * @return true if "smooth zoom" (and should not request
-   * zoom until complete), false otherwise
-   */
-  abstract public boolean zoomTo(CameraSession session,
-                                   int zoomLevel);
-
-  /**
-   * Builds a CameraEngine instance based on the device's
-   * API level.
-   *
-   * @param ctxt any Context will do
-   * @param forcedEngineId if not null, use this engine always
-   * @return a new CameraEngine instance
-   */
-  synchronized public static CameraEngine buildInstance(Context ctxt,
-                                                        ID forcedEngineId) {
-    CameraEngine result;
-    boolean useCameraTwo;
-
-    if (forcedEngineId==ID.CLASSIC) {
-      useCameraTwo=false;
-    }
-    else if (forcedEngineId==ID.CAMERA2) {
-      useCameraTwo=true;
-    }
-    else {
-      useCameraTwo=Build.VERSION.SDK_INT>=Build.VERSION_CODES.LOLLIPOP;
-
-      CameraConstraints constraints=CameraConstraints.get();
-
-      if (constraints!=null) {
-        useCameraTwo=useCameraTwo && constraints.supportsCameraTwo();
-      }
-    }
-
-    if (useCameraTwo) {
-      if (singletonTwo==null) {
-        singletonTwo=new CameraTwoEngine(ctxt);
-      }
-
-      result=singletonTwo;
-    }
-    else {
-      if (singletonClassic==null) {
-        singletonClassic=new ClassicCameraEngine(ctxt);
-      }
-
-      result=singletonClassic;
-    }
-
-    return(result);
-  }
-
-  /**
-   * Sets the event bus to use, where the default is the
-   * default event bus supplied by the EventBus class.
-   *
-   * @param bus the bus to use for events
-   */
-  public void setBus(EventBus bus) {
-    this.bus=bus;
-  }
-
-  /**
-   * @return the bus to use for events
-   */
-  public EventBus getBus() {
-    return(bus);
-  }
-
-  /**
-   * Sets whether or not exceptions should be logged, in addition
-   * to being included in relevant events. The default is false.
-   *
-   * @param isDebug true if exceptions should be logged, false otherwise
-   */
-  public void setDebug(boolean isDebug) {
-    this.isDebug=isDebug;
-  }
-
-  /**
-   * @return true if exceptions should be logged, false otherwise
-   */
-  public boolean isDebug() {
-    return(isDebug);
-  }
-
-  public void setDebugSavePreviewFile(File savePreviewFile) {
-    this.savePreviewFile=savePreviewFile;
-  }
-
-  public File savePreviewFile() {
-    return(savePreviewFile);
-  }
-
-  public ThreadPoolExecutor getThreadPool() {
-    if (pool==null) {
-      pool=new ThreadPoolExecutor(CORE_POOL_SIZE, MAX_POOL_SIZE,
-          KEEP_ALIVE_SECONDS, TimeUnit.SECONDS, queue);
-    }
-
-    return(pool);
-  }
-
-  public void setThreadPool(ThreadPoolExecutor pool) {
-    this.pool=pool;
-  }
-
-  public void setPreferredFlashModes(List<FlashMode> flashModes) {
-    preferredFlashModes=flashModes;
-  }
-
-  boolean hasMoreThanOneEligibleFlashMode() {
-    return(eligibleFlashModes.size()>1);
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java
deleted file mode 100644
index e5e396f..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraFragment.java
+++ /dev/null
@@ -1,723 +0,0 @@
-/***
- * Copyright (c) 2015-2016 CommonsWare, LLC
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you
- * may
- * not use this file except in compliance with the License. You may
- * obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing,
- * software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- * See the License for the specific language governing permissions
- * and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.app.ActionBar;
-import android.app.Fragment;
-import android.content.Context;
-import android.media.MediaScannerConnection;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.ScaleGestureDetector;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.OvershootInterpolator;
-import android.widget.Chronometer;
-import android.widget.ImageView;
-import android.widget.SeekBar;
-
-import com.github.clans.fab.FloatingActionButton;
-import com.github.clans.fab.FloatingActionMenu;
-
-import net.yazeed44.imagepicker.library.R;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.io.File;
-import java.util.LinkedList;
-
-/**
- * Fragment for displaying a camera preview, with hooks to allow
- * you (or the user) to take a picture.
- */
-public class CameraFragment extends Fragment
-        implements ReverseChronometer.Listener {
-    private static final String ARG_OUTPUT = "output";
-    private static final String ARG_UPDATE_MEDIA_STORE =
-            "updateMediaStore";
-    private static final String ARG_SKIP_ORIENTATION_NORMALIZATION
-            = "skipOrientationNormalization";
-    private static final String ARG_IS_VIDEO = "isVideo";
-    private static final String ARG_QUALITY = "quality";
-    private static final String ARG_SIZE_LIMIT = "sizeLimit";
-    private static final String ARG_DURATION_LIMIT = "durationLimit";
-    private static final String ARG_ZOOM_STYLE = "zoomStyle";
-    private static final String ARG_FACING_EXACT_MATCH =
-            "facingExactMatch";
-    private static final String ARG_CHRONOTYPE = "chronotype";
-    private static final String ARG_RULE_OF_THIRDS = "ruleOfThirds";
-    private static final String ARG_TIMER_DURATION = "timerDuration";
-    private static final int PINCH_ZOOM_DELTA = 20;
-    private CameraController ctlr;
-    private ViewGroup previewStack;
-    private FloatingActionButton fabPicture;
-    private FloatingActionButton fabSwitch;
-    private View progress;
-    private boolean isVideoRecording = false;
-    private boolean mirrorPreview = false;
-    private ScaleGestureDetector scaleDetector;
-    private boolean inSmoothPinchZoom = false;
-    private SeekBar zoomSlider;
-    private Chronometer chronometer;
-    private ReverseChronometer reverseChronometer;
-
-    public static CameraFragment newPictureInstance(Uri output,
-                                                    boolean updateMediaStore,
-                                                    int quality,
-                                                    ZoomStyle zoomStyle,
-                                                    boolean facingExactMatch,
-                                                    boolean skipOrientationNormalization,
-                                                    int timerDuration,
-                                                    boolean ruleOfThirds) {
-        CameraFragment f = new CameraFragment();
-        Bundle args = new Bundle();
-
-        args.putParcelable(ARG_OUTPUT, output);
-        args.putBoolean(ARG_UPDATE_MEDIA_STORE, updateMediaStore);
-        args.putBoolean(ARG_SKIP_ORIENTATION_NORMALIZATION,
-                skipOrientationNormalization);
-        args.putInt(ARG_QUALITY, quality);
-        args.putBoolean(ARG_IS_VIDEO, false);
-        args.putSerializable(ARG_ZOOM_STYLE, zoomStyle);
-        args.putBoolean(ARG_FACING_EXACT_MATCH, facingExactMatch);
-        args.putInt(ARG_TIMER_DURATION, timerDuration);
-        args.putBoolean(ARG_RULE_OF_THIRDS, ruleOfThirds);
-        f.setArguments(args);
-
-        return (f);
-    }
-
-    public static CameraFragment newVideoInstance(Uri output,
-                                                  boolean updateMediaStore,
-                                                  int quality,
-                                                  int sizeLimit,
-                                                  int durationLimit,
-                                                  ZoomStyle zoomStyle,
-                                                  boolean facingExactMatch,
-                                                  ChronoType chronoType,
-                                                  boolean ruleOfThirds) {
-        CameraFragment f = new CameraFragment();
-        Bundle args = new Bundle();
-
-        args.putParcelable(ARG_OUTPUT, output);
-        args.putBoolean(ARG_UPDATE_MEDIA_STORE, updateMediaStore);
-        args.putBoolean(ARG_IS_VIDEO, true);
-        args.putInt(ARG_QUALITY, quality);
-        args.putInt(ARG_SIZE_LIMIT, sizeLimit);
-        args.putInt(ARG_DURATION_LIMIT, durationLimit);
-        args.putSerializable(ARG_ZOOM_STYLE, zoomStyle);
-        args.putBoolean(ARG_FACING_EXACT_MATCH, facingExactMatch);
-        args.putBoolean(ARG_RULE_OF_THIRDS, ruleOfThirds);
-
-        if (durationLimit > 0 || chronoType != ChronoType.COUNT_DOWN) {
-            args.putSerializable(ARG_CHRONOTYPE, chronoType);
-        }
-
-        f.setArguments(args);
-
-        return (f);
-    }
-
-    /**
-     * Standard fragment entry point.
-     *
-     * @param savedInstanceState State of a previous instance
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setRetainInstance(true);
-        scaleDetector =
-                new ScaleGestureDetector(getActivity().getApplicationContext(),
-                        scaleListener);
-    }
-
-    /**
-     * Standard lifecycle method, passed along to the CameraController.
-     */
-    @Override
-    public void onStart() {
-        super.onStart();
-
-        AbstractCameraActivity.BUS.register(this);
-
-        if (ctlr != null) {
-            ctlr.start();
-        }
-    }
-
-    @Override
-    public void onHiddenChanged(boolean isHidden) {
-        super.onHiddenChanged(isHidden);
-
-        if (!isHidden) {
-            ActionBar ab = getActivity().getActionBar();
-
-            if (ab != null) {
-                ab.setBackgroundDrawable(getActivity()
-                        .getResources()
-                        .getDrawable(
-                                R.drawable.cwac_cam2_action_bar_bg_transparent));
-                ab.setTitle("");
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    ab.setDisplayHomeAsUpEnabled(false);
-                } else {
-                    ab.setDisplayShowHomeEnabled(false);
-                    ab.setHomeButtonEnabled(false);
-                }
-            }
-
-            if (fabPicture != null) {
-                fabPicture.setEnabled(true);
-                fabSwitch.setEnabled(canSwitchSources());
-            }
-        }
-    }
-
-    /**
-     * Standard lifecycle method, for when the fragment moves into
-     * the stopped state. Passed along to the CameraController.
-     */
-    @Override
-    public void onStop() {
-        stopChronometers();
-
-        if (ctlr != null) {
-            try {
-                ctlr.stop();
-            } catch (Exception e) {
-                ctlr.postError(ErrorConstants.ERROR_STOPPING, e);
-                Log.e(getClass().getSimpleName(),
-                        "Exception stopping controller", e);
-            }
-        }
-
-        AbstractCameraActivity.BUS.unregister(this);
-
-        super.onStop();
-    }
-
-    /**
-     * Standard lifecycle method, for when the fragment is utterly,
-     * ruthlessly destroyed. Passed along to the CameraController,
-     * because why should the fragment have all the fun?
-     */
-    @Override
-    public void onDestroy() {
-        if (ctlr != null) {
-            ctlr.destroy();
-        }
-
-        super.onDestroy();
-    }
-
-    /**
-     * Standard callback method to create the UI managed by
-     * this fragment.
-     *
-     * @param inflater           Used to inflate layouts
-     * @param container          Parent of the fragment's UI (eventually)
-     * @param savedInstanceState State of a previous instance
-     * @return the UI being managed by this fragment
-     */
-    @Override
-    public View onCreateView(LayoutInflater inflater,
-                             ViewGroup container,
-                             Bundle savedInstanceState) {
-        View v =
-                inflater.inflate(R.layout.cwac_cam2_fragment, container, false);
-
-        previewStack =
-                v.findViewById(R.id.cwac_cam2_preview_stack);
-
-        progress = v.findViewById(R.id.cwac_cam2_progress);
-        fabPicture =
-                v.findViewById(R.id.cwac_cam2_picture);
-        reverseChronometer =
-                v.findViewById(R.id.rchrono);
-
-        if (isVideo()) {
-            fabPicture.setImageResource(R.drawable.cwac_cam2_ic_videocam);
-            chronometer = v.findViewById(R.id.chrono);
-        }
-
-        fabPicture.setOnClickListener(view -> performCameraAction());
-
-        fabSwitch = v.findViewById(
-                R.id.cwac_cam2_switch_camera);
-        fabSwitch.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                progress.setVisibility(View.VISIBLE);
-                fabSwitch.setEnabled(false);
-
-                try {
-                    ctlr.switchCamera();
-                } catch (Exception e) {
-                    ctlr.postError(ErrorConstants.ERROR_SWITCHING_CAMERAS, e);
-                    Log.e(getClass().getSimpleName(),
-                            "Exception switching camera", e);
-                }
-            }
-        });
-
-        changeMenuIconAnimation(
-                v.findViewById(R.id.cwac_cam2_settings));
-
-        onHiddenChanged(false); // hack, since this does not get
-        // called on initial display
-
-        fabPicture.setEnabled(false);
-        fabSwitch.setEnabled(false);
-
-        if (ctlr != null && ctlr.getNumberOfCameras() > 0) {
-            prepController();
-        }
-
-        if (showRuleOfThirds()) {
-            v.findViewById(R.id.rule_of_thirds).setVisibility(View.VISIBLE);
-        }
-
-        return (v);
-    }
-
-    @Override
-    public void onCountdownCompleted() {
-        takePicture();
-    }
-
-    public void shutdown() {
-        if (isVideoRecording) {
-            stopVideoRecording(true);
-        } else {
-            progress.setVisibility(View.VISIBLE);
-
-            if (ctlr != null) {
-                try {
-                    ctlr.stop();
-                } catch (Exception e) {
-                    ctlr.postError(ErrorConstants.ERROR_STOPPING, e);
-                    Log.e(getClass().getSimpleName(),
-                            "Exception stopping controller", e);
-                }
-            }
-        }
-    }
-
-    /**
-     * @return the CameraController this fragment delegates to
-     */
-    public CameraController getController() {
-        return (ctlr);
-    }
-
-    /**
-     * Establishes the controller that this fragment delegates to
-     *
-     * @param ctlr the controller that this fragment delegates to
-     */
-    public void setController(CameraController ctlr) {
-        int currentCamera = -1;
-
-        if (this.ctlr != null) {
-            currentCamera = this.ctlr.getCurrentCamera();
-        }
-
-        this.ctlr = ctlr;
-        ctlr.setQuality(getArguments().getInt(ARG_QUALITY, 1));
-
-        if (currentCamera > -1) {
-            ctlr.setCurrentCamera(currentCamera);
-        }
-    }
-
-    /**
-     * Indicates if we should mirror the preview or not. Defaults
-     * to false.
-     *
-     * @param mirror true if we should horizontally mirror the
-     *               preview, false otherwise
-     */
-    public void setMirrorPreview(boolean mirror) {
-        this.mirrorPreview = mirror;
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(
-            CameraController.ControllerReadyEvent event) {
-        if (event.isEventForController(ctlr)) {
-            prepController();
-        }
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(CameraEngine.OpenedEvent event) {
-        if (event.exception == null) {
-            progress.setVisibility(View.GONE);
-            fabSwitch.setEnabled(canSwitchSources());
-            fabPicture.setEnabled(true);
-            zoomSlider = getView().findViewById(R.id.cwac_cam2_zoom);
-
-            int timerDuration = getArguments().getInt(ARG_TIMER_DURATION);
-
-            if (timerDuration > 0) {
-                reverseChronometer.setVisibility(View.VISIBLE);
-                reverseChronometer.setOverallDuration(timerDuration);
-                reverseChronometer.setListener(this);
-                reverseChronometer.reset();
-                reverseChronometer.run();
-            }
-
-            if (ctlr.supportsZoom()) {
-                if (getZoomStyle() == ZoomStyle.PINCH) {
-                    previewStack.setOnTouchListener(
-                            (v, event1) -> (scaleDetector.onTouchEvent(event1)));
-                } else if (getZoomStyle() == ZoomStyle.SEEKBAR) {
-                    zoomSlider.setVisibility(View.VISIBLE);
-                    zoomSlider.setOnSeekBarChangeListener(seekListener);
-                }
-            } else {
-                previewStack.setOnTouchListener(null);
-                zoomSlider.setVisibility(View.GONE);
-            }
-        } else {
-            ctlr.postError(ErrorConstants.ERROR_OPEN_CAMERA,
-                    event.exception);
-            getActivity().finish();
-        }
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(CameraEngine.VideoTakenEvent event) {
-        isVideoRecording = false;
-        stopChronometers();
-
-        if (event.exception == null) {
-            if (getArguments().getBoolean(ARG_UPDATE_MEDIA_STORE, false)) {
-                final Context app = getActivity().getApplicationContext();
-                Uri output = getArguments().getParcelable(ARG_OUTPUT);
-                final String path = output.getPath();
-
-                new Thread() {
-                    @Override
-                    public void run() {
-                        SystemClock.sleep(2000);
-                        MediaScannerConnection.scanFile(app,
-                                new String[]{path}, new String[]{"video/mp4"},
-                                null);
-                    }
-                }.start();
-            }
-
-            isVideoRecording = false;
-            setVideoFABToNormal();
-        } else if (getActivity().isFinishing()) {
-            shutdown();
-        } else {
-            ctlr.postError(ErrorConstants.ERROR_VIDEO_TAKEN,
-                    event.exception);
-            getActivity().finish();
-        }
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(
-            CameraEngine.SmoothZoomCompletedEvent event) {
-        inSmoothPinchZoom = false;
-        zoomSlider.setEnabled(true);
-    }
-
-    protected void performCameraAction() {
-        if (isVideo()) {
-            recordVideo();
-        } else {
-            takePicture();
-        }
-    }
-
-    private void takePicture() {
-        Uri output = getArguments().getParcelable(ARG_OUTPUT);
-
-        PictureTransaction.Builder b = new PictureTransaction.Builder();
-
-        if (output != null) {
-            b.toUri(getActivity(), output,
-                    getArguments().getBoolean(ARG_UPDATE_MEDIA_STORE, false),
-                    getArguments().getBoolean(ARG_SKIP_ORIENTATION_NORMALIZATION,
-                            false));
-        }
-
-        fabPicture.setEnabled(false);
-        fabSwitch.setEnabled(false);
-        ctlr.takePicture(b.build());
-    }
-
-    private void recordVideo() {
-        if (isVideoRecording) {
-            stopVideoRecording(false);
-        } else {
-            try {
-                VideoTransaction.Builder b =
-                        new VideoTransaction.Builder();
-                Uri output = getArguments().getParcelable(ARG_OUTPUT);
-
-                b.to(new File(output.getPath()))
-                        .quality(getArguments().getInt(ARG_QUALITY, 1))
-                        .sizeLimit(getArguments().getInt(ARG_SIZE_LIMIT, 0))
-                        .durationLimit(
-                                getArguments().getInt(ARG_DURATION_LIMIT, 0));
-
-                ctlr.recordVideo(b.build());
-                isVideoRecording = true;
-                fabPicture.setImageResource(
-                        R.drawable.cwac_cam2_ic_stop);
-                fabPicture.setColorNormalResId(
-                        R.color.cwac_cam2_recording_fab);
-                fabPicture.setColorPressedResId(
-                        R.color.cwac_cam2_recording_fab_pressed);
-                fabSwitch.setEnabled(false);
-                configureChronometer();
-            } catch (Exception e) {
-                Log.e(getClass().getSimpleName(),
-                        "Exception recording video", e);
-                // TODO: um, do something here
-            }
-        }
-    }
-
-    public void stopVideoRecording() {
-        stopVideoRecording(true);
-    }
-
-    private void stopVideoRecording(boolean abandon) {
-        setVideoFABToNormal();
-
-        try {
-            ctlr.stopVideoRecording(abandon);
-        } catch (Exception e) {
-            ctlr.postError(ErrorConstants.ERROR_STOPPING_VIDEO, e);
-            Log.e(getClass().getSimpleName(),
-                    "Exception stopping recording of video", e);
-        } finally {
-            isVideoRecording = false;
-        }
-    }
-
-    private void setVideoFABToNormal() {
-        fabPicture.setImageResource(
-                R.drawable.cwac_cam2_ic_videocam);
-        fabPicture.setColorNormalResId(
-                R.color.cwac_cam2_picture_fab);
-        fabPicture.setColorPressedResId(
-                R.color.cwac_cam2_picture_fab_pressed);
-        fabSwitch.setEnabled(canSwitchSources());
-    }
-
-    private boolean canSwitchSources() {
-        if (isVideo() && !CameraConstraints.get().supportsFFCVideo()) {
-            return (false);
-        }
-
-        return (!getArguments().getBoolean(ARG_FACING_EXACT_MATCH,
-                false));
-    }
-
-    private boolean isVideo() {
-        return (getArguments().getBoolean(ARG_IS_VIDEO, false));
-    }
-
-    private boolean showRuleOfThirds() {
-        return (getArguments().getBoolean(ARG_RULE_OF_THIRDS, false));
-    }
-
-    private ChronoType getChronoType() {
-        ChronoType chronoType =
-                (ChronoType) getArguments().getSerializable(ARG_CHRONOTYPE);
-
-        if (chronoType == null) {
-            chronoType = ChronoType.NONE;
-        }
-
-        return (chronoType);
-    }
-
-    private void configureChronometer() {
-        chronometer.setBase(SystemClock.elapsedRealtime());
-
-        if (getChronoType() == ChronoType.COUNT_UP) {
-            chronometer.setVisibility(View.VISIBLE);
-            chronometer.start();
-        } else if (getChronoType() == ChronoType.COUNT_DOWN) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                chronometer.setVisibility(View.VISIBLE);
-                chronometer.setBase(SystemClock.elapsedRealtime() +
-                        getArguments().getInt(ARG_DURATION_LIMIT, 0));
-                chronometer.setCountDown(true);
-                chronometer.start();
-            } else {
-                reverseChronometer.setVisibility(View.VISIBLE);
-                reverseChronometer
-                        .setOverallDuration(getArguments()
-                                .getInt(ARG_DURATION_LIMIT, 0) / 1000);
-                reverseChronometer.reset();
-                reverseChronometer.run();
-            }
-        }
-    }
-
-    private void stopChronometers() {
-        if (chronometer != null) {
-            chronometer.stop();
-        }
-
-        if (reverseChronometer != null) {
-            reverseChronometer.setListener(null);
-            reverseChronometer.stop();
-        }
-    }
-
-    private void prepController() {
-        LinkedList<CameraView> cameraViews = new LinkedList<CameraView>();
-        CameraView cv = (CameraView) previewStack.getChildAt(0);
-
-        cv.setMirror(mirrorPreview);
-        cameraViews.add(cv);
-
-        for (int i = 1; i < ctlr.getNumberOfCameras(); i++) {
-            cv = new CameraView(getActivity());
-            cv.setVisibility(View.INVISIBLE);
-            cv.setMirror(mirrorPreview);
-            previewStack.addView(cv);
-            cameraViews.add(cv);
-        }
-
-        ctlr.setCameraViews(cameraViews);
-    }
-
-    // based on https://goo.gl/3IUM8K
-
-    private void changeMenuIconAnimation(
-            final FloatingActionMenu menu) {
-        AnimatorSet set = new AnimatorSet();
-        final ImageView v = menu.getMenuIconView();
-        ObjectAnimator scaleOutX =
-                ObjectAnimator.ofFloat(v, "scaleX", 1.0f, 0.2f);
-        ObjectAnimator scaleOutY =
-                ObjectAnimator.ofFloat(v, "scaleY", 1.0f, 0.2f);
-        ObjectAnimator scaleInX =
-                ObjectAnimator.ofFloat(v, "scaleX", 0.2f, 1.0f);
-        ObjectAnimator scaleInY =
-                ObjectAnimator.ofFloat(v, "scaleY", 0.2f, 1.0f);
-
-        scaleOutX.setDuration(50);
-        scaleOutY.setDuration(50);
-
-        scaleInX.setDuration(150);
-        scaleInY.setDuration(150);
-        scaleInX.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                v.setImageResource(menu.isOpened()
-                        ? R.drawable.cwac_cam2_ic_action_settings
-                        : R.drawable.cwac_cam2_ic_close);
-                // yes, that seems backwards, but it works
-                // presumably, opened state not yet toggled
-            }
-        });
-
-        set.play(scaleOutX).with(scaleOutY);
-        set.play(scaleInX).with(scaleInY).after(scaleOutX);
-        set.setInterpolator(new OvershootInterpolator(2));
-        menu.setIconToggleAnimatorSet(set);
-    }
-
-    private ZoomStyle getZoomStyle() {
-        ZoomStyle result =
-                (ZoomStyle) getArguments().getSerializable(ARG_ZOOM_STYLE);
-
-        if (result == null) {
-            result = ZoomStyle.NONE;
-        }
-
-        return (result);
-    }
-
-    private final ScaleGestureDetector.OnScaleGestureListener scaleListener =
-            new ScaleGestureDetector.SimpleOnScaleGestureListener() {
-                @Override
-                public void onScaleEnd(ScaleGestureDetector detector) {
-                    float scale = detector.getScaleFactor();
-                    int delta;
-
-                    if (scale > 1.0f) {
-                        delta = PINCH_ZOOM_DELTA;
-                    } else if (scale < 1.0f) {
-                        delta = -1 * PINCH_ZOOM_DELTA;
-                    } else {
-                        return;
-                    }
-
-                    if (!inSmoothPinchZoom) {
-                        if (ctlr.changeZoom(delta)) {
-                            inSmoothPinchZoom = true;
-                        }
-                    }
-                }
-            };
-
-    private final SeekBar.OnSeekBarChangeListener seekListener =
-            new SeekBar.OnSeekBarChangeListener() {
-                @Override
-                public void onProgressChanged(SeekBar seekBar,
-                                              int progress,
-                                              boolean fromUser) {
-                    if (fromUser) {
-                        if (ctlr.setZoom(progress)) {
-                            seekBar.setEnabled(false);
-                        }
-                    }
-                }
-
-                @Override
-                public void onStartTrackingTouch(SeekBar seekBar) {
-                    // no-op
-                }
-
-                @Override
-                public void onStopTrackingTouch(SeekBar seekBar) {
-                    // no-op
-                }
-            };
-}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraPlugin.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraPlugin.java
deleted file mode 100644
index c469aed..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraPlugin.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-/**
- * A plugin for configuration camera behavior. A CameraSession
- * will hold onto a chain of these.
- * <p/>
- * Changing plugins, either by reconfiguring plugin instances or
- * by changing the chain, is not supported once the CameraSession
- * is created. Create a new session with the new plugins.
- * This is to minimize compatibility issues where changing the
- * behavior of the camera on the fly breaks the camera.
- */
-public interface CameraPlugin {
-  /**
-   * Returns a CameraConfigurator of a given class for this
-   * plugin. Plugins ideally should support both ClassicCameraConfigurator
-   * and CameraTwoConfigurator, though that is up to the plugin.
-   * <p/>
-   * Configurators should be fairly cheap objects to instantiate.
-   * While at the moment they are only used once per session,
-   * that may not be true in the future, and they are not being cached.
-   *
-   * @param type ClassicCameraConfigurator.class or
-   *             CameraTwoConfigurator.class, indicating which type
-   *             of configurator to create
-   * @param <T> ClassicCameraConfigurator or CameraTwoConfigurator
-   * @return instance of the designated configurator class, or
-   *           null if that type is not supported
-   */
-  <T extends CameraConfigurator> T buildConfigurator(Class<T> type);
-
-  /**
-   * Validates whether or not the plugin is valid for this
-   * CameraSession. Throw a runtime exception if it is not.
-   *
-   * @param session the session to validate against
-   */
-  void validate(CameraSession session);
-
-  void destroy();
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSelectionCriteria.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSelectionCriteria.java
deleted file mode 100644
index 7b7dff3..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSelectionCriteria.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-/**
- * Representation of criteria used to select a camera from
- * available cameras on the device. Used with CameraEngine
- * for finding a subset of interesting cameras.
- */
-public class CameraSelectionCriteria {
-  private Facing facing;
-  private boolean facingExactMatch=false;
-  private boolean isVideo=false;
-
-  /**
-   * Getter method for the facing value, indicating if we
-   * want the camera to be front-facing, back-facing, or
-   * any direction.
-   *
-   * @return the facing value
-   */
-  public Facing getFacing() {
-    return(facing);
-  }
-
-  /**
-   * @return true if the requested facing camera must be an
-   * exact match, false otherwise
-   */
-  public boolean getFacingExactMatch() {
-    return(facingExactMatch);
-  }
-
-  /**
-   * @return true if this will be used for video
-   */
-  public boolean isVideo() {
-    return(isVideo);
-  }
-
-  /**
-   * Class to create instances of CameraSelectionCriteria via
-   * a fluent, builder-style API.
-   */
-  public static class Builder {
-    final private CameraSelectionCriteria criteria=new CameraSelectionCriteria();
-
-    /**
-     * Setter for the facing value, indicating if we
-     * want the camera to be front-facing, back-facing, or
-     * any direction.
-     *
-     * @param facing the facing value
-     * @return the builder, for chained calls
-     */
-    public Builder facing(Facing facing) {
-      criteria.facing=facing;
-
-      return(this);
-    }
-
-    /**
-     * Setter for indicating if the requested facing value must
-     * be an exact match or not. Defaults to false.
-     *
-     * @param match true if must be an exact match, false otherwise
-     * @return the builder, for chained calls
-     */
-    public Builder facingExactMatch(boolean match) {
-      criteria.facingExactMatch=match;
-
-      return(this);
-    }
-
-    /**
-     * Setting for indicating if we will be using this camera for video
-     *
-     * @param isVideo true if the camera will be used for video, false otherwise
-     * @return the builder, for chained calls
-     */
-    public Builder isVideo(boolean isVideo) {
-      criteria.isVideo=isVideo;
-
-      return(this);
-    }
-
-    /**
-     * Returns the fabricated criteria
-     *
-     * @return the criteria defined via calls on the builder
-     */
-    public CameraSelectionCriteria build() {
-      return(criteria);
-    }
-  }
-
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java
deleted file mode 100644
index aa159c6..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraSession.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.content.Context;
-import com.commonsware.cwac.cam2.util.Size;
-import java.util.ArrayList;
-
-/**
- * Class representing a session with a camera. While
- * a CameraDescriptor is simply a declaration of "there exists
- * a camera with these capabilities", CameraSession indicates
- * what you want to have happen with a particular camera, for
- * general operation. This is roughly analogous to Camera.Parameters
- * in the classic Camera API.
- *
- * To create instances, call buildSession() on an
- * instance of a CameraEngine, then use the resulting
- * CameraSession.Builder to describe what you want, followed
- * by a call to build() to give you the actual CameraSession.
- */
-public class CameraSession {
-  private final CameraDescriptor descriptor;
-  private final Context ctxt;
-  private final ArrayList<CameraPlugin> plugins=new ArrayList<CameraPlugin>();
-  private Size previewSize;
-  private FlashMode currentFlashMode;
-
-  /**
-   * Constructor.
-   *
-   * @param ctxt an Android Context to use for accessing system stuff
-   * @param descriptor the camera to use for this session
-   */
-  CameraSession(Context ctxt, CameraDescriptor descriptor) {
-    this.ctxt=ctxt.getApplicationContext();
-    this.descriptor=descriptor;
-  }
-
-  /**
-   * @return an Android Context suitable for looking up filesystem
-   * paths and the like
-   */
-  public Context getContext() {
-    return(ctxt);
-  }
-
-  /**
-   * @return the camera to use for this session
-   */
-  public CameraDescriptor getDescriptor() {
-    return(descriptor);
-  }
-
-  /**
-   * @return the roster of plugins configured for this session
-   */
-  protected ArrayList<CameraPlugin> getPlugins() {
-    return(plugins);
-  }
-
-  public void destroy() {
-    for (CameraPlugin plugin : getPlugins()) {
-      plugin.destroy();
-    }
-  }
-
-  public Size getPreviewSize() {
-    return(previewSize);
-  }
-
-  public void setPreviewSize(Size previewSize) {
-    this.previewSize=previewSize;
-  }
-
-  public FlashMode getCurrentFlashMode() {
-    return(currentFlashMode);
-  }
-
-  void setCurrentFlashMode(FlashMode currentFlashMode) {
-    this.currentFlashMode=currentFlashMode;
-  }
-
-  /**
-   * Class to build an instance of a CameraSession. Get an instance
-   * from buildSession() on your chosen CameraEngine.
-   */
-  abstract public static class Builder {
-    protected final CameraSession session;
-
-    protected Builder(CameraSession session) {
-      this.session=session;
-    }
-
-    /**
-     * Adds a plugin to the chain of plugins for this session.
-     * Pre-configure the plugin before adding.
-     *
-     * @param plugin a CameraPlugin instance
-     * @return the Builder, for chained calls
-     */
-    public Builder addPlugin(CameraPlugin plugin) {
-      plugin.validate(session);
-      session.plugins.add(plugin);
-
-      return(this);
-    }
-
-    /**
-     * @return the CameraSession, configured as you requested
-     */
-    public CameraSession build() {
-      return(session);
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoConfigurator.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoConfigurator.java
deleted file mode 100644
index d2e75e6..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoConfigurator.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CaptureRequest;
-import android.media.ImageReader;
-
-/**
- * Camera configurator for the CameraTwoEngine, to be used as
- * part of a CameraPlugin for configuring camera behavior.
- */
-public interface CameraTwoConfigurator extends CameraConfigurator {
-  /**
-   * @return an ImageReader to be used by the CameraTwoEngine,
-   * or null if this configurator is not responsible for creating
-   * the ImageReader
-   */
-  ImageReader buildImageReader();
-
-  /**
-   * Updates a CaptureRequest to reflect what the plugin needs.
-   *
-   * @param cc CameraCharacteristics for the camera being used
-   * @param facingFront true if the camera is front-facing, false
-   *                    otherwise
-   * @param captureBuilder the builder for the request, to be
-   *                       configured
-   */
-  void addToCaptureRequest(CameraSession session,
-                           CameraCharacteristics cc,
-                           boolean facingFront,
-                           CaptureRequest.Builder captureBuilder);
-
-  /**
-   * Updates a preview CaptureRequest to reflect what the plugin needs.
-   *
-   * @param cc CameraCharacteristics for the camera being used
-   * @param captureBuilder the builder for the request, to be
-   *                       configured
-   */
-  void addToPreviewRequest(CameraSession session,
-                           CameraCharacteristics cc,
-                           CaptureRequest.Builder captureBuilder);
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java
deleted file mode 100644
index 1f7b8f7..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraTwoEngine.java
+++ /dev/null
@@ -1,924 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.graphics.ImageFormat;
-import android.graphics.Rect;
-import android.graphics.SurfaceTexture;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraDevice;
-import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CameraMetadata;
-import android.hardware.camera2.CaptureFailure;
-import android.hardware.camera2.CaptureRequest;
-import android.hardware.camera2.CaptureResult;
-import android.hardware.camera2.TotalCaptureResult;
-import android.hardware.camera2.params.StreamConfigurationMap;
-import android.media.Image;
-import android.media.ImageReader;
-import android.media.MediaActionSound;
-import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.util.Log;
-import android.view.Surface;
-
-import androidx.annotation.NonNull;
-
-import com.commonsware.cwac.cam2.util.Size;
-import org.greenrobot.eventbus.EventBus;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Implementation of a CameraEngine that supports the
- * Android 5.0+ android.hardware.camera2 API.
- */
-@SuppressWarnings("ResourceType")
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
-public class CameraTwoEngine extends CameraEngine {
-  private final Context ctxt;
-  private final CameraManager mgr;
-  final private HandlerThread handlerThread=new HandlerThread(getClass().getSimpleName(),
-      android.os.Process.THREAD_PRIORITY_BACKGROUND);
-  final private Handler handler;
-  final private Semaphore lock=new Semaphore(1);
-//  private CountDownLatch closeLatch=null;
-  private final MediaActionSound shutter=new MediaActionSound();
-  private List<Descriptor> descriptors=null;
-
-  /**
-   * Standard constructor
-   *
-   * @param ctxt any Context will do
-   */
-  public CameraTwoEngine(Context ctxt) {
-    this.ctxt=ctxt.getApplicationContext();
-    mgr=(CameraManager)this.ctxt.
-        getSystemService(Context.CAMERA_SERVICE);
-    handlerThread.start();
-    handler=new Handler(handlerThread.getLooper());
-    shutter.load(MediaActionSound.SHUTTER_CLICK);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public CameraSession.Builder buildSession(Context ctxt, CameraDescriptor descriptor) {
-    return(new SessionBuilder(ctxt, descriptor));
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void loadCameraDescriptors(final CameraSelectionCriteria criteria) {
-    getThreadPool().execute(new Runnable() {
-      @Override
-      public void run() {
-        if (descriptors==null) {
-          List<Descriptor> result=new ArrayList<Descriptor>();
-
-          try {
-            for (String cameraId : mgr.getCameraIdList()) {
-              CameraCharacteristics cc=
-                mgr.getCameraCharacteristics(cameraId);
-              Descriptor camera=new Descriptor(cameraId, cc);
-              StreamConfigurationMap map=cc.get(
-                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-              android.util.Size[] rawSizes=
-                map.getOutputSizes(SurfaceTexture.class);
-              CameraConstraints constraint=CameraConstraints.get();
-
-              camera.setFacingFront(
-                cc.get(CameraCharacteristics.LENS_FACING)==
-                  CameraCharacteristics.LENS_FACING_FRONT);
-
-              List<Size> sizes=null;
-
-              if (constraint!=null) {
-                if (camera.isFacingFront) {
-                  sizes=constraint.getPreviewFFCSizeWhitelist();
-                }
-                else {
-                  sizes=constraint.getPreviewRFCSizeWhitelist();
-                }
-              }
-
-              if (sizes==null) {
-                sizes=new ArrayList<Size>();
-
-                for (android.util.Size size : rawSizes) {
-                  if (size.getWidth()<2160 &&
-                    size.getHeight()<2160) {
-                    sizes.add(
-                      new Size(size.getWidth(), size.getHeight()));
-                  }
-                }
-              }
-
-              camera.setPreviewSizes(sizes);
-              sizes=null;
-
-              if (constraint!=null) {
-                if (camera.isFacingFront) {
-                  sizes=constraint.getPictureFFCSizeWhitelist();
-                }
-                else {
-                  sizes=constraint.getPictureRFCSizeWhitelist();
-                }
-              }
-
-              if (sizes==null) {
-                sizes=new ArrayList<>();
-
-                for (android.util.Size size : map.getOutputSizes(ImageFormat.JPEG)) {
-                  sizes.add(new Size(size.getWidth(), size.getHeight()));
-                }
-              }
-
-              camera.setPictureSizes(sizes);
-              result.add(camera);
-            }
-
-            descriptors=result;
-          }
-          catch (CameraAccessException e) {
-            getBus().post(
-              new CameraEngine.CameraDescriptorsEvent(e));
-
-            if (isDebug()) {
-              Log.e(getClass().getSimpleName(),
-                "Exception accessing camera", e);
-            }
-          }
-        }
-
-        List<CameraDescriptor> result=
-          new ArrayList<CameraDescriptor>();
-
-        for (Descriptor camera : descriptors) {
-          if ((!criteria.getFacingExactMatch() ||
-            camera.getScore(criteria)>0) &&
-            !criteria.isVideo() ||
-            (camera.isFacingFront && CameraConstraints.get().supportsFFCVideo()) ||
-            (!camera.isFacingFront && CameraConstraints.get().supportsRFCVideo())) {
-            result.add(camera);
-          }
-        }
-
-        Collections.sort(result,
-                (descriptor, t1) -> {
-                  Descriptor lhs=(Descriptor)descriptor;
-                  Descriptor rhs=(Descriptor)t1;
-
-                  // descending, so invert normal side-ness
-
-                  return (Integer.compare(rhs.getScore(criteria),
-                    lhs.getScore(criteria)));
-                });
-
-        getBus().post(
-          new CameraEngine.CameraDescriptorsEvent(result));
-      }
-    });
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void open(final CameraSession session,
-                   final SurfaceTexture texture) {
-    getThreadPool().execute(new Runnable() {
-      @Override
-      public void run() {
-        Descriptor camera=(Descriptor)session.getDescriptor();
-
-        try {
-          CameraCharacteristics cc=
-            mgr.getCameraCharacteristics(camera.getId());
-
-          eligibleFlashModes.clear();
-
-          int[] availModes=cc.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES);
-
-          for (FlashMode flashMode : preferredFlashModes) {
-            for (int rawFlashMode : availModes) {
-              if (rawFlashMode==flashMode.getCameraTwoMode()) {
-                eligibleFlashModes.add(flashMode);
-                break;
-              }
-            }
-          }
-
-          if (eligibleFlashModes.isEmpty()) {
-            for (int rawFlashMode : availModes) {
-              FlashMode flashMode=FlashMode.lookupCameraTwoMode(
-                rawFlashMode);
-
-              if (flashMode!=null) {
-                eligibleFlashModes.add(flashMode);
-              }
-            }
-          }
-
-          session.setCurrentFlashMode(eligibleFlashModes.get(0));
-
-          if (!lock.tryAcquire(2500, TimeUnit.MILLISECONDS)) {
-            throw new RuntimeException("Time out waiting to lock camera opening.");
-          }
-
-          mgr.openCamera(camera.getId(),
-              new InitPreviewTransaction(session, new Surface(texture)),
-              handler);
-        }
-        catch (Exception e) {
-          getBus().post(new OpenedEvent(e));
-
-          if (isDebug()) {
-            Log.e(getClass().getSimpleName(), "Exception opening camera", e);
-          }
-        }
-      }
-    });
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void close(final CameraSession session) {
-    final Session s=(Session)session;
-
-    try {
-      lock.acquire();
-
-      if (s.captureSession != null) {
-        // closeLatch=new CountDownLatch(1);
-        s.captureSession.close();
-        // closeLatch.await(2, TimeUnit.SECONDS);
-        s.captureSession=null;
-      }
-
-      if (s.cameraDevice != null) {
-        s.cameraDevice.close();
-        s.cameraDevice=null;
-      }
-
-      if (s.reader != null) {
-        s.reader.close();
-      }
-
-      s.setClosed(true);
-
-      Descriptor camera=(Descriptor)session.getDescriptor();
-
-      camera.setDevice(null);
-      session.destroy();
-      getBus().post(new ClosedEvent());
-    }
-    catch (Exception e) {
-      getBus().post(new ClosedEvent(e));
-    }
-    finally {
-      lock.release();
-    }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public void takePicture(CameraSession session,
-                          PictureTransaction xact) {
-    final Session s=(Session)session;
-
-    s.reader.setOnImageAvailableListener(new TakePictureTransaction(session.getContext(), getBus(), xact),
-        handler);
-
-    getThreadPool().execute(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          // This is how to tell the camera to lock focus.
-          s.previewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
-              CameraMetadata.CONTROL_AF_TRIGGER_START);
-          s.captureSession.setRepeatingRequest(
-            s.previewRequestBuilder.build(),
-            new RequestCaptureTransaction(s),
-            handler);
-        }
-        catch (Exception e) {
-          getBus().post(new PictureTakenEvent(e));
-
-          if (isDebug()) {
-            Log.e(getClass().getSimpleName(), "Exception taking picture", e);
-          }
-        }
-      }
-    });
-  }
-
-  @Override
-  public void handleOrientationChange(CameraSession session,
-                                      OrientationChangedEvent event) {
-    // TODO
-  }
-
-  @Override
-  public void recordVideo(CameraSession session, VideoTransaction xact) {
-    // TODO
-  }
-
-  @Override
-  public void stopVideoRecording(CameraSession session, boolean abandon) {
-    // TODO
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public boolean supportsDynamicFlashModes() {
-    return(true);
-  }
-
-  @Override
-  public boolean supportsZoom(CameraSession session) {
-    boolean result=false;
-    Descriptor descriptor=(Descriptor)session.getDescriptor();
-
-    try {
-      CameraCharacteristics cc=
-        mgr.getCameraCharacteristics(descriptor.cameraId);
-
-      float maxZoom=cc.get(
-        CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
-
-      result=(maxZoom>=1.0f);
-    }
-    catch (CameraAccessException e) {
-      getBus().post(new DeepImpactEvent(e));
-    }
-
-    return(result);
-  }
-
-  @Override
-  public boolean zoomTo(CameraSession session,
-                         int zoomLevel) {
-    final Session s=(Session)session;
-
-    if (session!=null) {
-      final Descriptor descriptor=(Descriptor)session.getDescriptor();
-
-      if (s.previewRequest!=null) {
-        try {
-          final CameraCharacteristics cc=
-            mgr.getCameraCharacteristics(descriptor.cameraId);
-          final float maxZoom=
-            cc.get(
-              CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
-
-          // if <=1, zoom not possible, so eat the the event
-          if (maxZoom>1.0f) {
-            float zoomTo=1.0f+((float)zoomLevel*(maxZoom-1.0f)/100.0f);
-            Rect zoomRect=cropRegionForZoom(cc, zoomTo);
-
-            s.previewRequestBuilder
-              .set(CaptureRequest.SCALER_CROP_REGION, zoomRect);
-            s.setZoomRect(zoomRect);
-            s.previewRequest=s.previewRequestBuilder.build();
-            s.captureSession.setRepeatingRequest(s.previewRequest,
-              null, handler);
-          }
-        }
-        catch (CameraAccessException e) {
-          getBus().post(new DeepImpactEvent(e));
-        }
-      }
-    }
-
-    return(false);
-  }
-
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  private static Rect cropRegionForZoom(CameraCharacteristics cc,
-                                        float zoomTo) {
-    Rect sensor=
-      cc.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
-    int sensorCenterX=sensor.width()/2;
-    int sensorCenterY=sensor.height()/2;
-    int deltaX=(int)(0.5f*sensor.width()/zoomTo);
-    int deltaY=(int)(0.5f*sensor.height()/zoomTo);
-
-    return(new Rect(
-      sensorCenterX-deltaX,
-      sensorCenterY-deltaY,
-      sensorCenterX+deltaX,
-      sensorCenterY+deltaY));
-  }
-
-  private class InitPreviewTransaction extends CameraDevice.StateCallback {
-    private final Session s;
-    private final Surface surface;
-
-    InitPreviewTransaction(CameraSession session, Surface surface) {
-      this.s=(Session)session;
-      this.surface=surface;
-    }
-
-    @Override
-    public void onOpened(@NonNull CameraDevice cameraDevice) {
-      lock.release();
-      s.cameraDevice=cameraDevice;
-      s.reader=s.buildImageReader();
-
-      Descriptor camera=(Descriptor)s.getDescriptor();
-
-      camera.setDevice(cameraDevice);
-
-      try {
-        cameraDevice.createCaptureSession(
-            Arrays.asList(surface, s.reader.getSurface()),
-            new StartPreviewTransaction(s, surface), handler);
-      }
-      catch (CameraAccessException e) {
-        getBus().post(new OpenedEvent(e));
-      }
-      catch (IllegalStateException e2) {
-        getBus().post(new DeepImpactEvent(e2));
-      }
-    }
-
-    @Override
-    public void onDisconnected(CameraDevice cameraDevice) {
-      lock.release();
-      cameraDevice.close();
-    }
-
-    @Override
-    public void onError(CameraDevice cameraDevice, int i) {
-      lock.release();
-      cameraDevice.close();
-      getBus().post(new CameraTwoPreviewErrorEvent(i));
-    }
-
-    @Override
-    public void onClosed(@NonNull CameraDevice camera) {
-      super.onClosed(camera);
-
-/*
-      if (closeLatch != null) {
-        closeLatch.countDown();
-      }
-*/
-    }
-  }
-
-  private class StartPreviewTransaction extends CameraCaptureSession.StateCallback {
-    private final Surface surface;
-    private final Session s;
-
-    StartPreviewTransaction(CameraSession session, Surface surface) {
-      this.s=(Session)session;
-      this.surface=surface;
-    }
-
-    @Override
-    public void onConfigured(@NonNull CameraCaptureSession session) {
-      try {
-        if (!s.isClosed()) {
-          s.captureSession=session;
-
-          s.previewRequestBuilder=session.getDevice().createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
-          s.previewRequestBuilder.addTarget(surface);
-          s.previewRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
-              CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
-          s.previewRequestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
-              CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
-
-          Descriptor camera=(Descriptor)s.getDescriptor();
-          CameraCharacteristics cc=mgr.getCameraCharacteristics(camera.cameraId);
-
-          if (s.getZoomRect()!=null) {
-            s
-              .previewRequestBuilder
-              .set(CaptureRequest.SCALER_CROP_REGION,
-                s.getZoomRect());
-          }
-
-          s.addToPreviewRequest(cc, s.previewRequestBuilder);
-
-          s.previewRequest=s.previewRequestBuilder.build();
-
-          session.setRepeatingRequest(s.previewRequest, null, handler);
-
-          getBus().post(new OpenedEvent());
-        }
-      }
-      catch (CameraAccessException e) {
-        getBus().post(new OpenedEvent(e));
-      }
-      catch (IllegalStateException e) {
-        if (isDebug()) {
-          Log.w(getClass().getSimpleName(), "Exception resetting focus", e);
-        }
-      }
-    }
-
-    @Override
-    public void onConfigureFailed(@NonNull CameraCaptureSession session) {
-      getBus().post(new CameraTwoPreviewFailureEvent());
-    }
-  }
-
-  private class RequestCaptureTransaction extends CameraCaptureSession.CaptureCallback {
-    private final Session s;
-    boolean isWaitingForFocus=true;
-    boolean isWaitingForPrecapture=false;
-    boolean haveWeStartedCapture=false;
-
-    RequestCaptureTransaction(CameraSession session) {
-      this.s=(Session)session;
-    }
-
-    @Override
-    public void onCaptureProgressed(@NonNull CameraCaptureSession session,
-                                    @NonNull CaptureRequest request, @NonNull CaptureResult partialResult) {
-      capture(partialResult);
-    }
-
-    @Override
-    public void onCaptureFailed(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, @NonNull CaptureFailure failure) {
-      getBus().post(new PictureTakenEvent(new RuntimeException("generic camera2 capture failure")));
-    }
-
-    @Override
-    public void onCaptureCompleted(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, @NonNull TotalCaptureResult result) {
-      capture(result);
-    }
-
-    private void capture(CaptureResult result) {
-      if (isWaitingForFocus) {
-        isWaitingForFocus=false;
-
-        Integer autoFocusState=result.get(CaptureResult.CONTROL_AF_STATE);
-
-        if (autoFocusState!=null &&
-            (CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED == autoFocusState ||
-              CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED == autoFocusState)) {
-          Integer state=result.get(CaptureResult.CONTROL_AE_STATE);
-
-          if (state == null ||
-              state == CaptureResult.CONTROL_AE_STATE_CONVERGED) {
-            isWaitingForPrecapture=false;
-            haveWeStartedCapture=true;
-            capture(s);
-          } else {
-            isWaitingForPrecapture=true;
-            precapture(s);
-          }
-        }
-      }
-      else if (isWaitingForPrecapture) {
-        Integer state=result.get(CaptureResult.CONTROL_AE_STATE);
-
-        if (state == null ||
-            state == CaptureResult.CONTROL_AE_STATE_PRECAPTURE ||
-            state == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) {
-          isWaitingForPrecapture=false;
-        }
-      }
-      else if (!haveWeStartedCapture) {
-        Integer state=result.get(CaptureResult.CONTROL_AE_STATE);
-
-        if (state == null ||
-            state != CaptureResult.CONTROL_AE_STATE_PRECAPTURE) {
-          haveWeStartedCapture=true;
-          capture(s);
-        }
-      }
-    }
-
-    private void precapture(Session s) {
-      try {
-        s.previewRequestBuilder.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
-            CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_START);
-        s.captureSession.capture(s.previewRequestBuilder.build(), this,
-            handler);
-      }
-      catch (Exception e) {
-        getBus().post(new PictureTakenEvent(e));
-
-        if (isDebug()) {
-          Log.e(getClass().getSimpleName(), "Exception running precapture", e);
-        }
-      }
-    }
-
-    private void capture(Session s) {
-      try {
-        CaptureRequest.Builder captureBuilder=
-            s.cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
-
-        captureBuilder.addTarget(s.reader.getSurface());
-        captureBuilder.set(CaptureRequest.CONTROL_AF_MODE,
-            CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
-        captureBuilder.set(CaptureRequest.CONTROL_AE_MODE,
-            CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
-
-        Descriptor camera=(Descriptor)s.getDescriptor();
-        CameraCharacteristics cc=mgr.getCameraCharacteristics(camera.cameraId);
-
-        if (s.getZoomRect()!=null) {
-          captureBuilder
-            .set(CaptureRequest.SCALER_CROP_REGION,
-              s.getZoomRect());
-        }
-
-        s.addToCaptureRequest(cc, camera.isFacingFront, captureBuilder);
-
-        s.captureSession.stopRepeating();
-        s.captureSession.capture(captureBuilder.build(),
-            new CapturePictureTransaction(s), null);
-      }
-      catch (Exception e) {
-        getBus().post(new PictureTakenEvent(e));
-
-        if (isDebug()) {
-          Log.e(getClass().getSimpleName(), "Exception running capture", e);
-        }
-      }
-    }
-  }
-
-  private class CapturePictureTransaction
-    extends CameraCaptureSession.CaptureCallback {
-    private final Session s;
-
-    CapturePictureTransaction(CameraSession session) {
-      this.s=(Session)session;
-    }
-
-    @Override
-    public void onCaptureStarted(@NonNull CameraCaptureSession session,
-                                 @NonNull CaptureRequest request,
-                                 long timestamp, long frameNumber) {
-      super.onCaptureStarted(session, request, timestamp, frameNumber);
-
-      shutter.play(MediaActionSound.SHUTTER_CLICK);
-    }
-
-    @Override
-    public void onCaptureCompleted(@NonNull CameraCaptureSession session,
-                                   @NonNull CaptureRequest request,
-                                   @NonNull TotalCaptureResult result) {
-      // TODO: something useful with the picture
-      unlockFocus();
-    }
-
-    @Override
-    public void onCaptureFailed(@NonNull CameraCaptureSession session,
-                                @NonNull CaptureRequest request,
-                                @NonNull CaptureFailure failure) {
-      getBus()
-        .post(new PictureTakenEvent(new RuntimeException("generic camera2 capture failure")));
-    }
-
-    private void unlockFocus() {
-      try {
-        if (!s.isClosed()) {
-          s.previewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
-              CameraMetadata.CONTROL_AF_TRIGGER_CANCEL);
-          s.previewRequestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
-              CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
-
-          CameraCaptureSession session=s.captureSession;
-
-          if (session!=null) {
-            session.capture(s.previewRequestBuilder.build(), null,
-              handler);
-            session.setRepeatingRequest(s.previewRequest, null,
-              handler);
-          }
-        }
-      }
-      catch (CameraAccessException e) {
-        getBus().post(new PictureTakenEvent(e));
-
-        if (isDebug()) {
-          Log.e(getClass().getSimpleName(), "Exception resetting focus", e);
-        }
-      }
-      catch (IllegalStateException e) {
-        getBus().post(new DeepImpactEvent(e));
-
-        if (isDebug()) {
-          Log.w(getClass().getSimpleName(), "Exception resetting focus", e);
-        }
-      }
-    }
-  }
-
-  private static class AreaComparator implements Comparator<Size> {
-    @Override
-    public int compare(Size lhs, Size rhs) {
-      long lhArea=(long)lhs.getWidth() * lhs.getHeight();
-      long rhArea=(long)rhs.getWidth() * rhs.getHeight();
-
-      return(Long.signum(lhArea - rhArea));
-    }
-  }
-
-  static class Descriptor implements CameraDescriptor {
-    private final String cameraId;
-    private CameraDevice device;
-    private List<Size> pictureSizes;
-    private List<Size> previewSizes;
-    private boolean isFacingFront;
-    private final Integer facing;
-
-    private Descriptor(String cameraId, CameraCharacteristics cc) {
-      this.cameraId=cameraId;
-      facing=cc.get(CameraCharacteristics.LENS_FACING);
-    }
-
-    public String getId() {
-      return (cameraId);
-    }
-
-    private void setDevice(CameraDevice device) {
-      this.device=device;
-    }
-
-    private CameraDevice getDevice() {
-      return (device);
-    }
-
-    @Override
-    public boolean isPictureFormatSupported(int format) {
-      return(ImageFormat.JPEG == format);
-    }
-
-    @Override
-    public List<Size> getPreviewSizes() {
-      return(previewSizes);
-    }
-
-    private void setPreviewSizes(List<Size> sizes) {
-      previewSizes=sizes;
-    }
-
-    @Override
-    public List<Size> getPictureSizes() {
-      return(pictureSizes);
-    }
-
-    private void setPictureSizes(List<Size> sizes) {
-      pictureSizes=sizes;
-    }
-
-    private void setFacingFront(boolean isFacingFront) {
-      this.isFacingFront=isFacingFront;
-    }
-
-    private int getScore(CameraSelectionCriteria criteria) {
-      int score=10;
-
-      if (criteria != null) {
-        if ((criteria.getFacing().isFront() &&
-            facing!=CameraCharacteristics.LENS_FACING_FRONT) ||
-            (!criteria.getFacing().isFront() &&
-                facing!=CameraCharacteristics.LENS_FACING_BACK)) {
-          score=0;
-        }
-      }
-
-      return(score);
-    }
-  }
-
-  private static class Session extends CameraSession {
-    CameraDevice cameraDevice=null;
-    CameraCaptureSession captureSession=null;
-    CaptureRequest.Builder previewRequestBuilder=null;
-    CaptureRequest previewRequest;
-    ImageReader reader;
-    boolean isClosed=false;
-    Rect zoomRect=null;
-
-    private Session(Context ctxt, CameraDescriptor descriptor) {
-      super(ctxt, descriptor);
-    }
-
-    ImageReader buildImageReader() {
-      ImageReader result=null;
-
-      for (CameraPlugin plugin : getPlugins()) {
-        CameraTwoConfigurator configurator=plugin.buildConfigurator(CameraTwoConfigurator.class);
-
-        if (configurator!=null) {
-          result=configurator.buildImageReader();
-        }
-
-        if (result!=null) break;
-      }
-
-      return(result);
-    }
-
-    void addToCaptureRequest(CameraCharacteristics cc,
-                             boolean isFacingFront,
-                             CaptureRequest.Builder captureBuilder) {
-      for (CameraPlugin plugin : getPlugins()) {
-        CameraTwoConfigurator configurator=plugin.buildConfigurator(CameraTwoConfigurator.class);
-
-        if (configurator!=null) {
-          configurator.addToCaptureRequest(this, cc, isFacingFront, captureBuilder);
-        }
-      }
-    }
-
-    void addToPreviewRequest(CameraCharacteristics cc,
-                             CaptureRequest.Builder captureBuilder) {
-      for (CameraPlugin plugin : getPlugins()) {
-        CameraTwoConfigurator configurator=plugin.buildConfigurator(CameraTwoConfigurator.class);
-
-        if (configurator!=null) {
-          configurator.addToPreviewRequest(this, cc, captureBuilder);
-        }
-      }
-    }
-
-    boolean isClosed() {
-      return(isClosed);
-    }
-
-    void setClosed(boolean isClosed) {
-      this.isClosed=isClosed;
-    }
-
-    Rect getZoomRect() {
-      return(zoomRect);
-    }
-
-    void setZoomRect(Rect zoomRect) {
-      this.zoomRect=zoomRect;
-    }
-  }
-
-  private static class SessionBuilder extends CameraSession.Builder {
-    private SessionBuilder(Context ctxt, CameraDescriptor descriptor) {
-      super(new Session(ctxt, descriptor));
-    }
-  }
-
-  private static class TakePictureTransaction implements ImageReader.OnImageAvailableListener {
-    private final EventBus bus;
-    private final PictureTransaction xact;
-    private final Context ctxt;
-
-    TakePictureTransaction(Context ctxt, EventBus bus, PictureTransaction xact) {
-      this.bus=bus;
-      this.xact=xact;
-      this.ctxt=ctxt.getApplicationContext();
-    }
-
-    @Override
-    public void onImageAvailable(ImageReader imageReader) {
-      Image image=imageReader.acquireNextImage();
-      ByteBuffer buffer=image.getPlanes()[0].getBuffer();
-      byte[] bytes=new byte[buffer.remaining()];
-
-      buffer.get(bytes);
-      image.close();
-
-      bus.post(new PictureTakenEvent(xact,
-        xact.process(new ImageContext(ctxt, bytes))));
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraView.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraView.java
deleted file mode 100644
index a6d949c..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/CameraView.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.graphics.Matrix;
-import android.graphics.RectF;
-import android.graphics.SurfaceTexture;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.Surface;
-import android.view.TextureView;
-import android.view.WindowManager;
-import com.commonsware.cwac.cam2.util.Size;
-
-/**
- * Class responsible for rendering preview frames on the UI
- * as a View for the user to see and interact with. Also handles
- * maintaining aspect ratios and dealing with full-bleed previews.
- */
-public class CameraView extends TextureView implements TextureView.SurfaceTextureListener {
-  public interface StateCallback {
-    void onReady(CameraView cv);
-    void onDestroyed(CameraView cv) throws Exception;
-  }
-
-  /**
-   * The requested size of the preview frames, or null to just
-   * use the size of the view itself
-   */
-  private Size previewSize;
-  private StateCallback stateCallback;
-  private boolean mirror=false;
-
-  /**
-   * Constructor, used for creating instances from Java code.
-   *
-   * @param context the Activity that will host this View
-   */
-  public CameraView(Context context) {
-    super(context, null);
-    initListener();
-  }
-
-  /**
-   * Constructor, used by layout inflation.
-   *
-   * @param context the Activity that will host this View
-   * @param attrs the parsed attributes from the layout resource tag
-   */
-  public CameraView(Context context, AttributeSet attrs) {
-    super(context, attrs, 0);
-    initListener();
-  }
-
-  /**
-   * Constructor, used by... something.
-   *
-   * @param context the Activity that will host this View
-   * @param attrs the parsed attributes from the layout resource tag
-   * @param defStyle "An attribute in the current theme that
-   *                 contains a reference to a style resource
-   *                 that supplies default values for the view.
-   *                 Can be 0 to not look for defaults."
-   */
-  public CameraView(Context context, AttributeSet attrs, int defStyle) {
-    super(context, attrs, defStyle);
-    initListener();
-  }
-
-  /**
-   * @return the requested preview size
-   */
-  public Size getPreviewSize() {
-    return(previewSize);
-  }
-
-  /**
-   * @param previewSize the requested preview size
-   */
-  public void setPreviewSize(Size previewSize) {
-    this.previewSize=previewSize;
-
-    enterTheMatrix();
-    requestLayout();
-  }
-
-  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
-    int width=MeasureSpec.getSize(widthMeasureSpec);
-    int height=MeasureSpec.getSize(heightMeasureSpec);
-    boolean isFullBleed=true;
-
-    if (previewSize==null) {
-      setMeasuredDimension(width, height);
-    }
-    else {
-      if (isFullBleed) {
-        if (width>height*previewSize.getWidth()/previewSize.getHeight()) {
-          setMeasuredDimension(width,
-            width*previewSize.getHeight()/previewSize.getWidth());
-        }
-        else {
-          setMeasuredDimension(height*previewSize.getWidth()/previewSize.getHeight(),
-            height);
-        }
-      }
-      else {
-        if (width<height*previewSize.getWidth()/previewSize.getHeight()) {
-          setMeasuredDimension(width,
-            width*previewSize.getHeight()/previewSize.getWidth());
-        }
-        else {
-          setMeasuredDimension(height*previewSize.getWidth()/previewSize.getHeight(),
-            height);
-        }
-      }
-    }
-  }
-
-  public void setStateCallback(StateCallback cb) {
-    stateCallback=cb;
-  }
-
-  public void setMirror(boolean mirror) {
-    this.mirror=mirror;
-  }
-
-  private void initListener() {
-    setSurfaceTextureListener(this);
-  }
-
-  @Override
-  public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int i, int i1) {
-    if (stateCallback!=null) {
-      stateCallback.onReady(this);
-    }
-  }
-
-  @Override
-  public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture, int i, int i1) {
-    enterTheMatrix();
-  }
-
-  @Override
-  public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
-    if (stateCallback!=null) {
-      try {
-        stateCallback.onDestroyed(this);
-      }
-      catch (Exception e) {
-        Log.e(getClass().getSimpleName(),
-          "Exception destroying state", e);
-      }
-    }
-
-    return(false);
-  }
-
-  @Override
-  public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
-
-  }
-
-  private void enterTheMatrix() {
-    if (previewSize!=null) {
-      adjustAspectRatio(previewSize.getWidth(),
-          previewSize.getHeight(),
-          ((Activity)getContext()).getWindowManager().getDefaultDisplay().getRotation());
-    }
-  }
-
-  // based on https://github.com/googlesamples/android-Camera2Basic/blob/master/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
-
-  private void adjustAspectRatio(int previewWidth,
-                                 int previewHeight,
-                                 int rotation) {
-    Matrix txform=new Matrix();
-    int viewWidth=getWidth();
-    int viewHeight=getHeight();
-    RectF rectView=new RectF(0, 0, viewWidth, viewHeight);
-    float viewCenterX=rectView.centerX();
-    float viewCenterY=rectView.centerY();
-    RectF rectPreview=new RectF(0, 0, previewHeight, previewWidth);
-    float previewCenterX=rectPreview.centerX();
-    float previewCenterY=rectPreview.centerY();
-
-    if (Surface.ROTATION_90==rotation ||
-      Surface.ROTATION_270==rotation) {
-      rectPreview.offset(viewCenterX-previewCenterX,
-        viewCenterY-previewCenterY);
-
-      txform.setRectToRect(rectView, rectPreview,
-        Matrix.ScaleToFit.FILL);
-
-      float scale=Math.max((float)viewHeight/previewHeight,
-        (float)viewWidth/previewWidth);
-
-      txform.postScale(scale, scale, viewCenterX, viewCenterY);
-      txform.postRotate(90*(rotation-2), viewCenterX,
-        viewCenterY);
-    }
-    else {
-      if (Surface.ROTATION_180==rotation) {
-        txform.postRotate(180, viewCenterX, viewCenterY);
-      }
-    }
-
-    if (mirror) {
-      txform.postScale(-1, 1, viewCenterX, viewCenterY);
-    }
-
-    setTransform(txform);
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ChronoType.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ChronoType.java
deleted file mode 100644
index a833b82..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ChronoType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/***
- Copyright (c) 2016 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-/**
- * Whether there should be a timer shown on the video recording
- * preview screen, and, if so, whether it counts down the remaining
- * time on a time-limited recording or whether it counts up for how
- * long the current recording is.
- */
-public enum ChronoType {
-  NONE,
-  COUNT_DOWN,
-  COUNT_UP
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraConfigurator.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraConfigurator.java
deleted file mode 100644
index 6028f4c..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraConfigurator.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.hardware.Camera;
-import android.media.MediaRecorder;
-
-/**
- * Camera configurator for the ClassicCameraEngine, to be used as
- * part of a CameraPlugin for configuring camera behavior.
- */
-public interface ClassicCameraConfigurator extends CameraConfigurator {
-  /**
-   * Update the Camera.Parameters based on whatever this particular
-   * configurator is set up to do.
-   *
-   * @param info CameraInfo for the camera that we are configuring
-   * @param camera the camera we are configuring
-   * @param params the current camera parameters, as originally
-   *               retrieved from the camera and as modified by
-   *               prior configurators in the chain
-   * @return the same Camera.Parameters as was passed in as params,
-   * just with modified contents
-   */
-  Camera.Parameters configureStillCamera(CameraSession session,
-                                         Camera.CameraInfo info,
-                                         Camera camera,
-                                         Camera.Parameters params);
-
-  void configureRecorder(CameraSession session,
-                         int cameraId,
-                         VideoTransaction xact,
-                         MediaRecorder recorder);
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java
deleted file mode 100644
index ad1a00f..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ClassicCameraEngine.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.content.Context;
-import android.graphics.ImageFormat;
-import android.graphics.Rect;
-import android.graphics.SurfaceTexture;
-import android.graphics.YuvImage;
-import android.hardware.Camera;
-import android.media.MediaRecorder;
-import android.os.Build;
-import android.util.Log;
-import com.commonsware.cwac.cam2.util.Size;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * Implementation of a CameraEngine that supports the
- * original android.hardware.Camera API.
- */
-@SuppressWarnings("deprecation")
-public class ClassicCameraEngine extends CameraEngine
-    implements MediaRecorder.OnInfoListener,
-    Camera.PreviewCallback, Camera.OnZoomChangeListener {
-  private final Context ctxt;
-  private List<Descriptor> descriptors=null;
-  private MediaRecorder recorder;
-  private VideoTransaction xact;
-  private int previewWidth, previewHeight;
-  private int previewFormat;
-
-  public ClassicCameraEngine(Context ctxt) {
-    this.ctxt=ctxt.getApplicationContext();
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public CameraSession.Builder buildSession(Context ctxt, CameraDescriptor descriptor) {
-    return(new SessionBuilder(ctxt, descriptor));
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public void loadCameraDescriptors(final CameraSelectionCriteria criteria) {
-    getThreadPool().execute(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          if (descriptors == null) {
-            int count=Camera.getNumberOfCameras();
-            List<Descriptor> result=new ArrayList<Descriptor>();
-            Camera.CameraInfo info=new Camera.CameraInfo();
-
-            for (int cameraId=0; cameraId<count; cameraId++) {
-              Camera.getCameraInfo(cameraId, info);
-              CameraConstraints constraint=CameraConstraints.get();
-
-              if (constraint!=null) {
-                if (!constraint.supportsFFC() && info.facing==
-                  Camera.CameraInfo.CAMERA_FACING_FRONT) {
-                  break;
-                }
-
-                if (!constraint.supportsRFC() && info.facing==
-                  Camera.CameraInfo.CAMERA_FACING_BACK) {
-                  break;
-                }
-              }
-
-              Descriptor descriptor=new Descriptor(cameraId, info);
-
-              Camera camera=Camera.open(descriptor.getCameraId());
-              Camera.Parameters params=camera.getParameters();
-
-              if (params!=null) {
-                List<Size> sizes=null;
-
-                if (constraint!=null) {
-                  if (info.facing==Camera.CameraInfo.CAMERA_FACING_FRONT) {
-                    sizes=constraint.getPreviewFFCSizeWhitelist();
-                  }
-                  else {
-                    sizes=constraint.getPreviewRFCSizeWhitelist();
-                  }
-                }
-
-                if (sizes==null) {
-                  sizes=new ArrayList<>();
-
-                  for (Camera.Size size : params.getSupportedPreviewSizes()) {
-                    if (size.height<2160 && size.width<2160) {
-                      sizes.add(new Size(size.width, size.height));
-//  Log.e("20161211", String.format("%d %d x %d", info.facing, size.width, size.height));
-                    }
-                  }
-                }
-
-                descriptor.setPreviewSizes(sizes);
-                sizes=null;
-
-                if (constraint!=null) {
-                  if (info.facing==Camera.CameraInfo.CAMERA_FACING_FRONT) {
-                    sizes=constraint.getPictureFFCSizeWhitelist();
-                  }
-                  else {
-                    sizes=constraint.getPictureRFCSizeWhitelist();
-                  }
-                }
-
-                if (sizes==null) {
-                  sizes=new ArrayList<>();
-
-                  for (Camera.Size size : params.getSupportedPictureSizes()) {
-                    if (!"samsung".equals(Build.MANUFACTURER) ||
-                      !"jflteuc".equals(Build.PRODUCT) ||
-                      size.width<2048) {
-                      sizes.add(new Size(size.width, size.height));
-                    }
-                  }
-                }
-
-                descriptor.setPictureSizes(sizes);
-                result.add(descriptor);
-              }
-
-              camera.release();
-            }
-
-            descriptors=result;
-          }
-
-          List<CameraDescriptor> result=
-            new ArrayList<CameraDescriptor>();
-
-          for (Descriptor descriptor : descriptors) {
-            if ((!criteria.getFacingExactMatch() ||
-              descriptor.getScore(criteria)>0) &&
-              !criteria.isVideo() ||
-              (descriptor.facing==Camera.CameraInfo.CAMERA_FACING_FRONT &&
-              CameraConstraints.get().supportsFFCVideo()) ||
-              (descriptor.facing!=Camera.CameraInfo.CAMERA_FACING_FRONT &&
-                CameraConstraints.get().supportsRFCVideo())) {
-              result.add(descriptor);
-            }
-          }
-
-          Collections.sort(result,
-                  (descriptor, t1) -> {
-                    Descriptor lhs=(Descriptor)descriptor;
-                    Descriptor rhs=(Descriptor)t1;
-
-                    // descending, so invert normal side-ness
-
-                    int lhScore=rhs.getScore(criteria);
-                    int rhScore=lhs.getScore(criteria);
-
-                    // from Integer.compare(), which is new to API Level 19
-
-                    return (lhScore<rhScore ? -1 :
-                      (lhScore==rhScore ? 0 : 1));
-                  });
-
-          getBus().post(
-            new CameraEngine.CameraDescriptorsEvent(result));
-        }
-        catch (Exception e) {
-          getBus().post(new DeepImpactEvent(e));
-
-          if (isDebug()) {
-            Log.w(getClass().getSimpleName(), "Exception opening camera", e);
-          }
-        }
-      }
-    });
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void close(final CameraSession session) {
-    Descriptor descriptor=(Descriptor)session.getDescriptor();
-    Camera camera=descriptor.getCamera();
-
-    if (camera != null) {
-      camera.stopPreview();
-      camera.release();
-      descriptor.setCamera(null);
-    }
-
-    session.destroy();
-    getBus().post(new ClosedEvent());
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void takePicture(final CameraSession session, final PictureTransaction xact) {
-    getThreadPool().execute(new Runnable() {
-      @Override
-      public void run() {
-        Descriptor descriptor=(Descriptor)session.getDescriptor();
-        Camera camera=descriptor.getCamera();
-
-        if (savePreviewFile()!=null) {
-          camera.setOneShotPreviewCallback(ClassicCameraEngine.this);
-
-          Camera.Parameters parameters=camera.getParameters();
-
-          previewWidth=parameters.getPreviewSize().width;
-          previewHeight=parameters.getPreviewSize().height;
-          previewFormat=parameters.getPreviewFormat();
-        }
-
-        try {
-          camera.takePicture(() -> {
-            // empty plays a sound -- go figure
-          }, null,
-              new TakePictureTransaction(session.getContext(), xact));
-        }
-        catch (Exception e) {
-          getBus().post(new PictureTakenEvent(e));
-
-          if (isDebug()) {
-            Log.e(getClass().getSimpleName(), "Exception taking picture", e);
-          }
-        }
-      }
-    });
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void open(final CameraSession session,
-                   final SurfaceTexture texture) {
-    getThreadPool().execute(new Runnable() {
-      @Override
-      public void run() {
-        Descriptor descriptor=(Descriptor)session.getDescriptor();
-        Camera camera=descriptor.getCamera();
-
-        if (camera == null) {
-          camera=Camera.open(descriptor.getCameraId());
-          descriptor.setCamera(camera);
-        }
-
-        Camera.Parameters params=camera.getParameters();
-        List<String> rawFlashModes=params.getSupportedFlashModes();
-
-        eligibleFlashModes.clear();
-
-        if (rawFlashModes!=null && preferredFlashModes!=null) {
-          for (FlashMode flashMode : preferredFlashModes) {
-            for (String rawFlashMode : rawFlashModes) {
-              if (rawFlashMode.equals(
-                flashMode.getClassicMode())) {
-                eligibleFlashModes.add(flashMode);
-                break;
-              }
-            }
-          }
-
-          if (eligibleFlashModes.isEmpty()) {
-            for (String rawFlashMode : rawFlashModes) {
-              FlashMode flashMode=
-                FlashMode.lookupClassicMode(rawFlashMode);
-
-              if (flashMode!=null) {
-                eligibleFlashModes.add(flashMode);
-              }
-            }
-          }
-
-          session.setCurrentFlashMode(eligibleFlashModes.get(0));
-        }
-
-        try {
-          camera.setParameters(((Session)session).configureStillCamera(
-            false));
-          camera.setPreviewTexture(texture);
-          camera.startPreview();
-          getBus().post(new OpenedEvent());
-        }
-        catch (Exception e) {
-          camera.release();
-          descriptor.setCamera(null);
-          getBus().post(new OpenedEvent(e));
-
-          if (isDebug()) {
-            Log.e(getClass().getSimpleName(), "Exception opening camera", e);
-          }
-        }
-      }
-    });
-  }
-
-  @Override
-  public void recordVideo(CameraSession session,
-                          VideoTransaction xact) throws Exception {
-    Descriptor descriptor=(Descriptor)session.getDescriptor();
-    Camera camera=descriptor.getCamera();
-
-    if (camera!=null) {
-      camera.stopPreview();
-      camera.unlock();
-
-      try {
-        recorder=new MediaRecorder();
-        recorder.setCamera(camera);
-        recorder.setAudioSource(
-          MediaRecorder.AudioSource.CAMCORDER);
-        recorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
-
-        ((Session)session).configureRecorder(xact, recorder);
-
-        recorder.setOutputFile(xact.getOutputPath().getAbsolutePath());
-        recorder.setMaxFileSize(xact.getSizeLimit());
-        recorder.setMaxDuration(xact.getDurationLimit());
-        recorder.setOnInfoListener(this);
-        recorder.prepare();
-        recorder.start();
-        this.xact=xact;
-      }
-      catch (IOException e) {
-        recorder.release();
-        recorder=null;
-        throw e;
-      }
-    }
-  }
-
-  @Override
-  public void stopVideoRecording(CameraSession session,
-                                 boolean abandon) throws Exception {
-    Descriptor descriptor=(Descriptor)session.getDescriptor();
-    Camera camera=descriptor.getCamera();
-
-    if (camera!=null && recorder!=null) {
-      MediaRecorder tempRecorder=recorder;
-
-      recorder=null;
-
-      tempRecorder.stop();
-      tempRecorder.release();
-
-      if (!abandon) {
-        camera.reconnect();
-        camera.startPreview();
-      }
-    }
-
-    if (!abandon) {
-      getBus().post(new VideoTakenEvent(xact));
-    }
-
-    xact=null;
-  }
-
-/*
-  @Override
-  public boolean shouldSwapPreviewDimensions(CameraSession session) {
-    WindowManager windowManager=
-      (WindowManager)ctxt.getSystemService(Context.WINDOW_SERVICE);
-    Configuration config=ctxt.getResources().getConfiguration();
-    int rotation=windowManager.getDefaultDisplay().getRotation();
-
-    boolean defaultLandscapeAndIsInLandscape = (rotation == Surface.ROTATION_0 ||
-      rotation == Surface.ROTATION_180) &&
-      config.orientation == Configuration.ORIENTATION_LANDSCAPE;
-
-    boolean defaultLandscapeAndIsInPortrait = (rotation == Surface.ROTATION_90 ||
-      rotation == Surface.ROTATION_270) &&
-      config.orientation == Configuration.ORIENTATION_PORTRAIT;
-
-    return(defaultLandscapeAndIsInLandscape ||
-      defaultLandscapeAndIsInPortrait);
-  }
-*/
-
-  @Override
-  public void handleOrientationChange(CameraSession session,
-                                      OrientationChangedEvent event) {
-    if (session!=null) {
-      ((Session)session).configureStillCamera(true);
-    }
-  }
-
-  @Override
-  public void onInfo(MediaRecorder mediaRecorder, int what, int extra) {
-    if (what==MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED ||
-        what==MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED ||
-        what==MediaRecorder.MEDIA_RECORDER_INFO_UNKNOWN) {
-      MediaRecorder tempRecorder=recorder;
-
-      recorder=null;
-
-      if (tempRecorder != null) {
-        tempRecorder.stop();
-        tempRecorder.release();
-      }
-
-      getBus().post(new VideoTakenEvent(xact));
-    }
-  }
-
-  @Override
-  public void onPreviewFrame(final byte[] data, final Camera camera) {
-    new Thread() {
-      @Override
-      public void run() {
-        YuvImage yuv=new YuvImage(data, previewFormat,
-          previewWidth, previewHeight, null);
-
-        try {
-          if (savePreviewFile().exists()) {
-            savePreviewFile().delete();
-          }
-
-          FileOutputStream fos=
-            new FileOutputStream(savePreviewFile());
-
-          yuv.compressToJpeg(new Rect(0, 0, previewWidth, previewHeight),
-            90, fos);
-          fos.flush();
-          fos.getFD().sync();
-          fos.close();
-        }
-        catch (Exception e) {
-          Log.e(getClass().getSimpleName(),
-            "Exception saving preview frame", e);
-        }
-      }
-    }.start();
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public boolean supportsDynamicFlashModes() {
-    return(false);
-  }
-
-  @Override
-  public boolean supportsZoom(CameraSession session) {
-    Descriptor descriptor=(Descriptor)session.getDescriptor();
-    Camera camera=descriptor.getCamera();
-    Camera.Parameters params=camera.getParameters();
-
-    return(params.isZoomSupported());
-  }
-
-  @Override
-  public boolean zoomTo(CameraSession session, int zoomLevel) {
-    Descriptor descriptor=(Descriptor)session.getDescriptor();
-    Camera camera=descriptor.getCamera();
-    Camera.Parameters params=camera.getParameters();
-    int zoom=zoomLevel*params.getMaxZoom()/100;
-    boolean result=false;
-
-    if (params.isSmoothZoomSupported()) {
-      camera.setZoomChangeListener(this);
-      camera.startSmoothZoom(zoom);
-      result=true;
-    }
-    else if (params.isZoomSupported()) {
-      params.setZoom(zoom);
-      camera.setParameters(params);
-    }
-
-    return(result);
-  }
-
-  @Override
-  public void onZoomChange(int zoomValue, boolean stopped,
-                           Camera camera) {
-    if (stopped) {
-      AbstractCameraActivity.BUS.post(new SmoothZoomCompletedEvent());
-    }
-  }
-
-  private class TakePictureTransaction implements Camera.PictureCallback {
-    private final PictureTransaction xact;
-    private final Context ctxt;
-
-    TakePictureTransaction(Context ctxt, PictureTransaction xact) {
-      this.ctxt=ctxt.getApplicationContext();
-      this.xact=xact;
-    }
-
-    @Override
-    public void onPictureTaken(final byte[] bytes, final Camera camera) {
-      getThreadPool().execute(() -> {
-        camera.startPreview();
-        getBus().post(new PictureTakenEvent(xact,
-          xact.process(new ImageContext(ctxt, bytes))));
-      });
-    }
-  }
-
-  static class Descriptor implements CameraDescriptor {
-    private final int cameraId;
-    private Camera camera;
-    private List<Size> pictureSizes;
-    private List<Size> previewSizes;
-    private final int facing;
-
-    private Descriptor(int cameraId, Camera.CameraInfo info) {
-      this.cameraId=cameraId;
-      this.facing=info.facing;
-    }
-
-    public int getCameraId() {
-      return (cameraId);
-    }
-
-    private void setCamera(Camera camera) {
-      this.camera=camera;
-    }
-
-    private Camera getCamera() {
-      return (camera);
-    }
-
-    @Override
-    public List<Size> getPreviewSizes() {
-      return (previewSizes);
-    }
-
-    private void setPreviewSizes(List<Size> sizes) {
-      previewSizes=sizes;
-    }
-
-    @Override
-    public List<Size> getPictureSizes() {
-      return (pictureSizes);
-    }
-
-    @Override
-    public boolean isPictureFormatSupported(int format) {
-      return (ImageFormat.JPEG == format);
-    }
-
-    private void setPictureSizes(List<Size> sizes) {
-      pictureSizes=sizes;
-    }
-
-    private int getScore(CameraSelectionCriteria criteria) {
-      int score=10;
-
-      if (criteria != null) {
-        if ((criteria.getFacing().isFront() &&
-            facing != Camera.CameraInfo.CAMERA_FACING_FRONT) ||
-            (!criteria.getFacing().isFront() &&
-                facing != Camera.CameraInfo.CAMERA_FACING_BACK)) {
-          score=0;
-        }
-      }
-
-      return(score);
-    }
-  }
-
-  private static class Session extends CameraSession {
-    private Session(Context ctxt, CameraDescriptor descriptor) {
-      super(ctxt, descriptor);
-    }
-
-    Camera.Parameters configureStillCamera(boolean noParams) {
-      final Descriptor descriptor=(Descriptor)getDescriptor();
-      final Camera camera=descriptor.getCamera();
-      Camera.Parameters params=null;
-
-      if (camera!=null) {
-        Camera.CameraInfo info=new Camera.CameraInfo();
-
-        if (!noParams) {
-          params=camera.getParameters();
-        }
-
-        Camera.getCameraInfo(descriptor.getCameraId(), info);
-
-        for (CameraPlugin plugin : getPlugins()) {
-          ClassicCameraConfigurator configurator=
-            plugin.buildConfigurator(
-              ClassicCameraConfigurator.class);
-
-          if (configurator!=null) {
-            params=
-              configurator.configureStillCamera(this, info, camera,
-                params);
-          }
-        }
-      }
-
-      return(params);
-    }
-
-    void configureRecorder(VideoTransaction xact,
-                           MediaRecorder recorder) {
-      final Descriptor descriptor=(Descriptor)getDescriptor();
-
-      for (CameraPlugin plugin : getPlugins()) {
-        ClassicCameraConfigurator configurator=
-          plugin.buildConfigurator(ClassicCameraConfigurator.class);
-
-        if (configurator!=null) {
-          configurator.configureRecorder(this, descriptor.getCameraId(),
-            xact, recorder);
-        }
-      }
-    }
-  }
-
-  private static class SessionBuilder extends CameraSession.Builder {
-    private SessionBuilder(Context ctxt, CameraDescriptor descriptor) {
-      super(new Session(ctxt, descriptor));
-    }
-  }
-}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ConfirmationFragment.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ConfirmationFragment.java
deleted file mode 100644
index 52f2f37..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ConfirmationFragment.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.Fragment;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import net.yazeed44.imagepicker.library.R;
-
-public class ConfirmationFragment extends Fragment {
-  private static final String ARG_NORMALIZE_ORIENTATION=
-    "normalizeOrientation";
-  private Float quality;
-
-  public interface Contract {
-    void completeRequest(ImageContext imageContext, boolean isOK);
-    void retakePicture();
-  }
-
-  private ImageView iv;
-  private ImageContext imageContext;
-
-  public static ConfirmationFragment newInstance(boolean normalizeOrientation) {
-    ConfirmationFragment result=new ConfirmationFragment();
-    Bundle args=new Bundle();
-
-    args.putBoolean(ARG_NORMALIZE_ORIENTATION, normalizeOrientation);
-    result.setArguments(args);
-
-    return(result);
-  }
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-
-    setRetainInstance(true);
-    setHasOptionsMenu(true);
-  }
-
-  @Override
-  public void onAttach(Activity activity) {
-    if (!(activity instanceof Contract)) {
-      throw new IllegalStateException("Hosting activity must implement Contract interface");
-    }
-
-    super.onAttach(activity);
-  }
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    iv=new ImageView(getActivity());
-
-    if (imageContext!=null) {
-      loadImage(quality);
-    }
-
-    return(iv);
-  }
-
-  @Override
-  public void onHiddenChanged(boolean isHidden) {
-    super.onHiddenChanged(isHidden);
-
-    if (!isHidden) {
-      ActionBar ab=getActivity().getActionBar();
-
-      if (ab==null) {
-        throw new IllegalStateException("CameraActivity confirmation requires an action bar!");
-      }
-      else {
-        ab.setBackgroundDrawable(getActivity()
-            .getResources()
-            .getDrawable(R.drawable.cwac_cam2_action_bar_bg_translucent));
-        ab.setTitle("");
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-          ab.setDisplayHomeAsUpEnabled(true);
-          ab.setHomeAsUpIndicator(R.drawable.cwac_cam2_ic_close_white);
-        }
-        else {
-          ab.setIcon(R.drawable.cwac_cam2_ic_close_white);
-          ab.setDisplayShowHomeEnabled(true);
-          ab.setHomeButtonEnabled(true);
-        }
-      }
-    }
-  }
-
-  @Override
-  public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-    inflater.inflate(R.menu.cwac_cam2_confirm, menu);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    if (item.getItemId()==android.R.id.home) {
-      getContract().completeRequest(imageContext, false);
-    }
-    else if (item.getItemId()==R.id.cwac_cam2_ok) {
-      getContract().completeRequest(imageContext, true);
-    }
-    else if (item.getItemId()==R.id.cwac_cam2_retry) {
-      getContract().retakePicture();
-    }
-    else {
-      return(super.onOptionsItemSelected(item));
-    }
-
-    return(true);
-  }
-
-  public void setImage(ImageContext imageContext, Float quality) {
-    this.imageContext=imageContext;
-    this.quality=quality;
-
-    if (iv!=null) {
-      loadImage(quality);
-    }
-  }
-
-  private Contract getContract() {
-    return((Contract)getActivity());
-  }
-
-  private void loadImage(Float quality) {
-    iv.setImageBitmap(imageContext.buildPreviewThumbnail(getActivity(),
-      quality, getArguments().getBoolean(ARG_NORMALIZE_ORIENTATION)));
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ErrorConstants.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ErrorConstants.java
deleted file mode 100644
index 71a4c12..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ErrorConstants.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/***
- Copyright (c) 2016 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-/**
- * Constants related to the data passed to the ResultReceiver
- * that you can optionally register via `onError()` with
- * an `IntentBuilder`, to find out about errors that occur
- * inside the Cam2 activities.
- */
-public class ErrorConstants {
-  /**
-   * Key for the Bundle provided to the ResultReceiver,
-   * with the text of the stack trace of the exception that
-   * triggered this callback.
-   */
-  public static final String RESULT_STACK_TRACE="stackTrace";
-
-  /**
-   * resultCode for ResultReceiver, indicating that there was
-   * a problem listing the available cameras
-   */
-  public static final int ERROR_LIST_CAMERAS=3490;
-
-  /**
-   * resultCode for ResultReceiver, indicating that there was
-   * a problem opening a camera
-   */
-  public static final int ERROR_OPEN_CAMERA=
-    ERROR_LIST_CAMERAS+1;
-
-  /**
-   * resultCode for ResultReceiver, indicating that there was
-   * a problem closing a camera
-   */
-  public static final int ERROR_CLOSE_CAMERA=
-    ERROR_LIST_CAMERAS+2;
-
-  /**
-   * resultCode for ResultReceiver, indicating that there was
-   * a problem when trying to complete the act of taking a video
-   */
-  public static final int ERROR_VIDEO_TAKEN=
-    ERROR_LIST_CAMERAS+3;
-
-  /**
-   * resultCode for ResultReceiver, indicating that there was
-   * a problem shutting down the CameraController and engine
-   */
-  public static final int ERROR_STOPPING=
-    ERROR_LIST_CAMERAS+4;
-
-  /**
-   * resultCode for ResultReceiver, indicating that there was
-   * a problem while trying to switch cameras from the FAB
-   */
-  public static final int ERROR_SWITCHING_CAMERAS=
-    ERROR_LIST_CAMERAS+5;
-
-  /**
-   * resultCode for ResultReceiver, indicating that there was
-   * a problem trying to end recording of a video
-   */
-  public static final int ERROR_STOPPING_VIDEO=
-    ERROR_LIST_CAMERAS+6;
-
-  /**
-   * resultCode for ResultReceiver, indicating that there was
-   * some other problem deep in the innards of Cam2
-   */
-  public static final int ERROR_MISC=
-    ERROR_LIST_CAMERAS+7;
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/Facing.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/Facing.java
deleted file mode 100644
index 30595f6..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/Facing.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***
- Copyright (c) 2015-2016 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-/**
- * Possible values for the facing property
- */
-public enum Facing {
-  FRONT, BACK;
-
-  boolean isFront() {
-    return(this==FRONT);
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/FlashMode.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/FlashMode.java
deleted file mode 100644
index 62be180..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/FlashMode.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.hardware.Camera;
-import android.hardware.camera2.CameraCharacteristics;
-
-public enum FlashMode {
-  OFF(Camera.Parameters.FLASH_MODE_OFF,
-    CameraCharacteristics.CONTROL_AE_MODE_ON),
-  TORCH(Camera.Parameters.FLASH_MODE_TORCH,
-    CameraCharacteristics.CONTROL_AE_MODE_ON),
-  ALWAYS(Camera.Parameters.FLASH_MODE_ON,
-    CameraCharacteristics.CONTROL_AE_MODE_ON_ALWAYS_FLASH),
-  AUTO(Camera.Parameters.FLASH_MODE_AUTO,
-    CameraCharacteristics.CONTROL_AE_MODE_ON_AUTO_FLASH),
-  REDEYE(Camera.Parameters.FLASH_MODE_RED_EYE,
-    CameraCharacteristics.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE);
-
-  private final String classicMode;
-  private final int cameraTwoMode;
-
-  static FlashMode lookupClassicMode(String classicMode) {
-    if (classicMode.equals(OFF.getClassicMode())) {
-      return(OFF);
-    }
-    else if (classicMode.equals(ALWAYS.getClassicMode())) {
-      return(ALWAYS);
-    }
-    else if (classicMode.equals(AUTO.getClassicMode())) {
-      return(AUTO);
-    }
-    else if (classicMode.equals(REDEYE.getClassicMode())) {
-      return(REDEYE);
-    }
-
-    return(null);
-  }
-
-  static FlashMode lookupCameraTwoMode(int cameraTwoMode) {
-    if (cameraTwoMode==OFF.getCameraTwoMode()) {
-      return(OFF);
-    }
-    else if (cameraTwoMode==ALWAYS.getCameraTwoMode()) {
-      return(ALWAYS);
-    }
-    else if (cameraTwoMode==AUTO.getCameraTwoMode()) {
-      return(AUTO);
-    }
-    else if (cameraTwoMode==REDEYE.getCameraTwoMode()) {
-      return(REDEYE);
-    }
-
-    return(null);
-  }
-
-  FlashMode(String classicMode, int cameraTwoMode) {
-    this.classicMode=classicMode;
-    this.cameraTwoMode=cameraTwoMode;
-  }
-
-  public String getClassicMode() {
-    return(classicMode);
-  }
-
-  public int getCameraTwoMode() {
-    return(cameraTwoMode);
-  }
-
-  public boolean isTorchMode() {
-    return(Camera.Parameters.FLASH_MODE_TORCH.equals(classicMode));
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/FocusMode.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/FocusMode.java
deleted file mode 100644
index 3d7dcf5..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/FocusMode.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***
- Copyright (c) 2016 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-public enum FocusMode {
-  CONTINUOUS, OFF, EDOF, MACRO
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java
deleted file mode 100644
index 722f86e..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageContext.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
-import com.android.mms.exif.ExifInterface;
-import com.android.mms.exif.ExifTag;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-/**
- * Represents a picture taken by the camera, to be passed through
- * the ImageProcessor chain.
- *
- * The ImageContext should always hold the byte[] representing
- * the JPEG image. If an ImageProcessor needs a Bitmap, it can
- * call getBitmap(true) to force creation of a Bitmap for those
- * JPEG bytes, but this is memory-intensive and should be avoided
- * where possible.
- */
-public class ImageContext {
-  private static final double LOG_2=Math.log(2.0d);
-  private final Context ctxt;
-  private byte[] jpegOriginal;
-  private Bitmap bmp;
-  private Bitmap thumbnail;
-  private ExifInterface exif;
-
-  ImageContext(Context ctxt, byte[] jpeg) {
-    this.ctxt=ctxt.getApplicationContext();
-    setJpeg(jpeg);
-  }
-
-  /**
-   * @return an Android Context suitable for use in cases where
-   * you need filesystem paths and the like
-   */
-  public Context getContext() {
-    return(ctxt);
-  }
-
-  /**
-   * @return the byte[] of JPEG-encoded data for the picture
-   */
-  public byte[] getJpeg() {
-    return(jpegOriginal);
-  }
-
-  /**
-   * Updates the JPEG data, invalidating any previous Bitmap.
-   *
-   * @param jpeg the new JPEG data
-   */
-  public void setJpeg(byte[] jpeg) {
-    this.jpegOriginal=jpeg;
-    this.bmp=null;
-    this.thumbnail=null;
-  }
-
-  public ExifInterface getExifInterface() throws IOException {
-    if (exif==null) {
-      exif=new ExifInterface();
-
-      exif.readExif(jpegOriginal);
-    }
-
-    return(exif);
-  }
-
-  public int getOrientation() throws IOException {
-    ExifTag tag=getExifInterface().getTag(ExifInterface.TAG_ORIENTATION);
-
-    return(tag==null ? -1 : tag.getValueAsInt(-1));
-  }
-
-  public byte[] getJpeg(boolean normalizeOrientation) {
-    if (normalizeOrientation) {
-      try {
-        int orientation=getOrientation();
-
-        if (needsNormalization(orientation)) {
-          try {
-            Bitmap original=
-              BitmapFactory.decodeByteArray(jpegOriginal, 0,
-                jpegOriginal.length);
-            Bitmap rotated=rotateViaMatrix(original, orientation);
-
-            exif.setTagValue(ExifInterface.TAG_ORIENTATION, 1);
-            exif.removeCompressedThumbnail();
-
-            ByteArrayOutputStream baos=new ByteArrayOutputStream();
-
-            exif.writeExif(rotated, baos, 100);
-            jpegOriginal=baos.toByteArray();
-
-            return(jpegOriginal);
-          }
-          catch (OutOfMemoryError e) {
-            AbstractCameraActivity.BUS
-              .post(new CameraEngine.DeepImpactEvent(e));
-          }
-        }
-      }
-      catch (Exception e) {
-        AbstractCameraActivity.BUS
-          .post(new CameraEngine.DeepImpactEvent(e));
-      }
-    }
-
-    return(getJpeg());
-  }
-
-  /**
-   * Retrieve a Bitmap rendition of the picture. Try to avoid
-   * this where possible, as it is memory-intensive.
-   *
-   * @param force true if you want to force creation of a Bitmap
-   *              if there is none, false if you want the Bitmap
-   *              but can live without it if it is unavailable
-   * @return the Bitmap rendition of the picture
-   */
-  public Bitmap getBitmap(boolean force, boolean normalizeOrientation) {
-    if (bmp==null && force) {
-      updateBitmap(normalizeOrientation);
-    }
-
-    return(bmp);
-  }
-
-  public Bitmap buildPreviewThumbnail(Context ctxt, Float quality,
-                                      boolean normalizeOrientation) {
-    // TODO: move this into PictureTransaction work somewhere, so done
-    // on a background thread
-
-    if (thumbnail==null) {
-      int limit=2000000;
-
-      if (quality!=null && quality>0.0f && quality<1.0f) {
-        ActivityManager am=(ActivityManager)ctxt.getSystemService(Context.ACTIVITY_SERVICE);
-        int flags=ctxt.getApplicationInfo().flags;
-        int memoryClass=am.getMemoryClass();
-
-        if ((flags & ApplicationInfo.FLAG_LARGE_HEAP)!=0) {
-          memoryClass=am.getLargeMemoryClass();
-        }
-
-        limit=(int)(1024*1024*memoryClass*quality);
-      }
-
-      thumbnail=createBitmap(null, limit, normalizeOrientation);
-    }
-
-    return(thumbnail);
-  }
-
-  public Bitmap buildResultThumbnail(boolean normalizeOrientation) {
-    // TODO: move this onto background thread
-
-    return(createBitmap(null, 750000, normalizeOrientation));
-  }
-
-  private Bitmap createBitmap(Bitmap inBitmap, int limit,
-                              boolean normalizeOrientation) {
-    double ratio=(double)jpegOriginal.length * 10.0d / (double)limit;
-    int inSampleSize;
-
-    if (ratio > 1.0d) {
-      inSampleSize=1 << (int)(Math.ceil(Math.log(ratio) / LOG_2));
-    } else {
-      inSampleSize=1;
-    }
-
-    return(createBitmap(inSampleSize, inBitmap, limit,
-      normalizeOrientation));
-  }
-
-  private Bitmap createBitmap(int inSampleSize, Bitmap inBitmap,
-                              int limit,
-                              boolean normalizeOrientation) {
-    BitmapFactory.Options opts=new BitmapFactory.Options();
-
-    opts.inSampleSize=inSampleSize;
-    opts.inBitmap=inBitmap;
-
-    Bitmap result;
-
-    try {
-      result=
-         BitmapFactory.decodeByteArray(jpegOriginal, 0, jpegOriginal.length, opts);
-
-      if (limit>0 && result.getByteCount()>limit) {
-        return(createBitmap(inSampleSize+1, inBitmap,
-          limit, normalizeOrientation));
-      }
-    }
-    catch (OutOfMemoryError e) {
-      return(createBitmap(inSampleSize+1, inBitmap,
-        limit, normalizeOrientation));
-    }
-
-    try {
-      if (normalizeOrientation) {
-        int orientation=getOrientation();
-
-        if (needsNormalization(orientation)) {
-          result=rotateViaMatrix(result, orientation);
-        }
-      }
-    }
-    catch (IOException e) {
-      AbstractCameraActivity.BUS.post(
-        new CameraEngine.DeepImpactEvent(e));
-    }
-
-    return(result);
-  }
-
-  private void updateBitmap(boolean normalizeOrientation) {
-    bmp=createBitmap(1, bmp, -1, normalizeOrientation); // no limit other than OOM
-  }
-
-  private boolean needsNormalization(int orientation) {
-    return(orientation==8 || orientation==3 || orientation==6);
-  }
-
-  static private Bitmap rotateViaMatrix(Bitmap original, int orientation) {
-    Matrix matrix=new Matrix();
-
-    matrix.setRotate(degreesForRotation(orientation));
-
-    return(Bitmap.createBitmap(original, 0, 0, original.getWidth(),
-      original.getHeight(), matrix, true));
-  }
-
-  static private int degreesForRotation(int orientation) {
-    int result;
-
-    switch (orientation) {
-      case 8:
-        result=270;
-        break;
-
-      case 3:
-        result=180;
-        break;
-
-      default:
-        result=90;
-    }
-
-    return(result);
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageProcessor.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageProcessor.java
deleted file mode 100644
index a9bb2a6..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ImageProcessor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-/**
- * Interface for class that post-processes a picture. A
- * PictureTransaction holds a chain of these, which collectively
- * will modify the picture as needed and write it wherever it
- * needs writing to.
- */
-public interface ImageProcessor {
-  /**
-   * Manipulate the picture indicated by the ImageContext.
-   * Properties for configuring this particular bit of image
-   * processing can be obtained from the PictureTransaction.
-   *
-   * @param xact the PictureTransaction, containing properties
-   * @param imageContext the picture itself
-   */
-  void process(PictureTransaction xact, ImageContext imageContext);
-
-  /**
-   * @return a unique tag to identify this processor among
-   * any other processors in the chain
-   */
-  String getTag();
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/JPEGWriter.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/JPEGWriter.java
deleted file mode 100644
index 5e679bf..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/JPEGWriter.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.content.Context;
-import android.media.MediaScannerConnection;
-import android.net.Uri;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-
-/**
- * ImageProcessor that writes a JPEG file out to some form
- * of local storage. At present, it supports writing out to a
- * local filesystem path.
- */
-public class JPEGWriter extends AbstractImageProcessor {
-  /**
-   * Property key to identify the Uri where
-   * the image should be written. Look up the value for this
-   * property in the PictureTransaction.
-   */
-  public static final String PROP_OUTPUT="output";
-
-  /**
-   * Property key to identify if the MediaStore should be
-   * updated to reflect the written-out picture (boolean).
-   * Look up the value for this property in the PictureTransaction.
-   * Only relevant if PROP_OUTPUT has a file scheme.
-   */
-  public static final String PROP_UPDATE_MEDIA_STORE="update";
-
-  /**
-   * Property key for boolean indicating if we should skip the
-   * default logic to rotate the image based on the EXIF orientation
-   * tag. Defaults to false (meaning: do the rotation if needed).
-   */
-  public static final String PROP_SKIP_ORIENTATION_NORMALIZATION
-    ="skipOrientationNormalization";
-
-  /**
-   * {@inheritDoc}
-   */
-  public JPEGWriter(Context ctxt) {
-    super(ctxt);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public JPEGWriter(Context ctxt, String tag) {
-    super(ctxt, tag);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void process(PictureTransaction xact, ImageContext imageContext) {
-    Uri output=xact.getProperties().getParcelable(PROP_OUTPUT);
-    boolean updateMediaStore=xact
-        .getProperties()
-        .getBoolean(PROP_UPDATE_MEDIA_STORE, false);
-    byte[] jpeg=imageContext.getJpeg(!xact
-      .getProperties()
-      .getBoolean(PROP_SKIP_ORIENTATION_NORMALIZATION, false));
-
-    if (output!=null) {
-      try {
-        if (output.getScheme().equals("file")) {
-          String path=output.getPath();
-          File f=new File(path);
-
-          f.getParentFile().mkdirs();
-
-          FileOutputStream fos=new FileOutputStream(f);
-
-          fos.write(jpeg);
-          fos.flush();
-          fos.getFD().sync();
-          fos.close();
-
-          if (updateMediaStore) {
-            MediaScannerConnection.scanFile(imageContext.getContext(),
-                new String[]{path}, new String[]{"image/jpeg"},
-                null);
-          }
-        }
-        else {
-          OutputStream out=getContext().getContentResolver().openOutputStream(output);
-
-          out.write(jpeg);
-          out.flush();
-          out.close();
-        }
-      }
-      catch (Exception e) {
-        // throw new UnsupportedOperationException("Exception when trying to write JPEG", e);
-        AbstractCameraActivity.BUS.post(new CameraEngine.DeepImpactEvent(e));
-      }
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/OrientationLockMode.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/OrientationLockMode.java
deleted file mode 100644
index 69f534a..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/OrientationLockMode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/***
- Copyright (c) 2016 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-/**
- * Specifies how the device orientation should be locked while the
- * camera activity is in the foreground. Default, much to your shock
- * and amazement, is DEFAULT.
- */
-public enum OrientationLockMode {
-  /**
-   * Allow the orientation to change in the steady state. Once
-   * video recording has started, or during the act of taking a
-   * picture, the orientation will be locked to whatever the orientation
-   * was at the time (this is still a work in progress).
-   */
-  DEFAULT,
-  /**
-   * Lock the orientation to portrait for preview and actual camera
-   * operation.
-   */
-  PORTRAIT,
-  /**
-   * Lock the orientation to landscape for preview and actual camera
-   * operation.
-   */
-  LANDSCAPE
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java
deleted file mode 100644
index 0b03cd7..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/PictureTransaction.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.content.Context;
-import android.net.Uri;
-import android.os.Bundle;
-import java.io.File;
-import java.util.ArrayList;
-
-/**
- * Class encapsulating the information needed to take a picture
- * using a camera. Use a PictureTransaction.Builder to create
- * an instance. Beyond that, this is an opaque blob to you.
- */
-public class PictureTransaction {
-  private final ArrayList<ImageProcessor> processors=new ArrayList<ImageProcessor>();
-  private final Bundle props=new Bundle();
-
-  private PictureTransaction() {
-    // use the builder, please
-  }
-
-  ImageContext process(ImageContext imageContext) {
-    for (ImageProcessor processor : processors) {
-      processor.process(this, imageContext);
-    }
-
-    return(imageContext);
-  }
-
-  ImageProcessor findProcessorByTag(String tag) {
-    for (ImageProcessor processor : processors) {
-      if (processor.getTag().equals(tag)) {
-        return(processor);
-      }
-    }
-
-    return(null);
-  }
-
-  /**
-   * Accesses a Bundle of properties for use by the chain of
-   * ImageProcessors. This is public for the use by ImageProcessor
-   * implementations. Using these properties in any other fashion
-   * is beyond the scope of the supported API.
-   *
-   * @return the properties Bundle
-   */
-  public Bundle getProperties() {
-    return(props);
-  }
-
-  /**
-   * Builder class to create an instance of a PictureTransaction.
-   */
-  public static class Builder {
-    private final PictureTransaction result=new PictureTransaction();
-
-    /**
-     * @return the PictureTransaction built up by the Builder API
-     */
-    public PictureTransaction build() {
-      return(result);
-    }
-
-    /**
-     * Adds an ImageProcessor to the chain of processors for
-     * manipulating the picture.
-     *
-     * @param processor the ImageProcessor to add to the chain
-     * @return the Builder, for more API calls
-     */
-    public Builder append(ImageProcessor processor) {
-      result.processors.add(processor);
-
-      return(this);
-    }
-
-    /**
-     * Indicates that the picture should be written to the
-     * designated Uri.
-     *
-     * @param ctxt   any Context will do
-     * @param output Uri to which you have write
-     *               access, where the photo should be taken
-     * @param updateMediaStore true if MediaStore should be updated,
-     *                         false otherwise
-     * @return the Builder, for more API calls
-     */
-    public Builder toUri(Context ctxt, Uri output,
-                         boolean updateMediaStore,
-                         boolean skipOrientationNormalization) {
-      JPEGWriter jpeg=(JPEGWriter)result.findProcessorByTag(JPEGWriter.class.getCanonicalName());
-
-      if (jpeg == null) {
-        jpeg=new JPEGWriter(ctxt);
-        append(jpeg);
-      }
-
-      result.getProperties().putParcelable(JPEGWriter.PROP_OUTPUT,
-          output);
-      result
-          .getProperties()
-          .putBoolean(JPEGWriter.PROP_UPDATE_MEDIA_STORE,
-              updateMediaStore);
-      result
-        .getProperties()
-        .putBoolean(JPEGWriter.PROP_SKIP_ORIENTATION_NORMALIZATION,
-          skipOrientationNormalization);
-
-      return (this);
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java
deleted file mode 100644
index 3e7f51f..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ReverseChronometer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/***
-  Copyright (c) 2013 CommonsWare, LLC
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License. You may obtain a copy
-  of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless required
-  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-  OF ANY KIND, either express or implied. See the License for the specific
-  language governing permissions and limitations under the License.
-  
-  From _The Busy Coder's Guide to Android Development_
-    https://commonsware.com/Android
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.content.Context;
-import android.os.SystemClock;
-import android.text.format.DateUtils;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-public class ReverseChronometer extends TextView implements Runnable {
-  interface Listener {
-    void onCountdownCompleted();
-  }
-
-  private long startTime=0L;
-  private long overallDuration=0L;
-  private final StringBuilder sb=new StringBuilder(8);
-  private Listener listener;
-
-  public ReverseChronometer(Context context, AttributeSet attrs) {
-    super(context, attrs);
-
-    reset();
-  }
-
-  @Override
-  public void run() {
-    long elapsedSeconds=
-        (SystemClock.elapsedRealtime() - startTime) / 1000;
-
-    if (elapsedSeconds < overallDuration) {
-      long remainingSeconds=overallDuration - elapsedSeconds;
-
-      setText(DateUtils.formatElapsedTime(sb, remainingSeconds));
-      postDelayed(this, 1000);
-    }
-    else {
-      setText(DateUtils.formatElapsedTime(sb, 0));
-
-      if (listener!=null) {
-        listener.onCountdownCompleted();
-      }
-    }
-  }
-
-  public void reset() {
-    startTime=SystemClock.elapsedRealtime();
-    setText("--:--");
-  }
-
-  public void stop() {
-    removeCallbacks(this);
-  }
-
-  public void setOverallDuration(long overallDuration) {
-    this.overallDuration=overallDuration;
-  }
-
-  public void setListener(Listener listener) {
-    this.listener=listener;
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/RuleOfThirdsOverlay.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/RuleOfThirdsOverlay.java
deleted file mode 100644
index 154ed3d..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/RuleOfThirdsOverlay.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***
- Copyright (c) 2017 CommonsWare, LLC
- Licensed under the Apache License, Version 2.0 (the "License"); you may not
- use this file except in compliance with the License. You may obtain a copy
- of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.view.View;
-
-import net.yazeed44.imagepicker.library.R;
-
-public class RuleOfThirdsOverlay extends View {
-  private Paint paint;
-  private float thickness;
-
-  public RuleOfThirdsOverlay(Context context) {
-    this(context, null);
-  }
-
-  public RuleOfThirdsOverlay(Context context, AttributeSet attrs) {
-    super(context, attrs);
-
-    init();
-  }
-
-  private void init() {
-    thickness=
-      getContext().getResources().getDimension(R.dimen.cwac_cam2_gridline_width);
-
-    paint=new Paint();
-    paint.setColor(Color.WHITE);
-    paint.setAlpha(0x80);
-    paint.setStrokeWidth(thickness);
-  }
-
-  @Override
-  protected void onDraw(Canvas canvas) {
-    super.onDraw(canvas);
-
-    float width=this.getWidth();
-    float height=this.getHeight();
-
-    canvas.drawLine(width/3, 0, width/3, height, paint);
-    canvas.drawLine(width*2/3, 0, width*2/3, height, paint);
-    canvas.drawLine(0, height/3, width, height/3, paint);
-    canvas.drawLine(0, height*2/3, width, height*2/3, paint);
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleCameraTwoConfigurator.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleCameraTwoConfigurator.java
deleted file mode 100644
index 7ed3ec1..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleCameraTwoConfigurator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.commonsware.cwac.cam2;
-
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CaptureRequest;
-import android.media.ImageReader;
-
-/**
- * Stub implementation of CameraTwoConfigurator, to help ease
- * the implementation of this interface. Just extend this class
- * and override the specific methods that your plugin needs.
- */
-public class SimpleCameraTwoConfigurator
-  implements CameraTwoConfigurator {
-  @Override
-  public ImageReader buildImageReader() {
-    return null;
-  }
-
-  @Override
-  public void addToCaptureRequest(CameraSession session,
-                                  CameraCharacteristics cc,
-                                  boolean facingFront,
-                                  CaptureRequest.Builder captureBuilder) {
-
-  }
-
-  @Override
-  public void addToPreviewRequest(CameraSession session,
-                                  CameraCharacteristics cc,
-                                  CaptureRequest.Builder captureBuilder) {
-
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleClassicCameraConfigurator.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleClassicCameraConfigurator.java
deleted file mode 100644
index 220dec9..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/SimpleClassicCameraConfigurator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.commonsware.cwac.cam2;
-
-import android.hardware.Camera;
-import android.media.MediaRecorder;
-
-/**
- * Stub no-op implementation of ClassicCameraConfigurator,
- * to simplify implementing the interface. Just extend this class,
- * then override the particular methods that you need in the plugin.
- */
-public class SimpleClassicCameraConfigurator implements ClassicCameraConfigurator {
-  @Override
-  public Camera.Parameters configureStillCamera(
-    CameraSession session,
-    Camera.CameraInfo info,
-    Camera camera, Camera.Parameters params) {
-    return null;
-  }
-
-  @Override
-  public void configureRecorder(CameraSession session,
-                                int cameraId,
-                                VideoTransaction xact,
-                                MediaRecorder recorder) {
-    // no-op
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoRecorderActivity.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoRecorderActivity.java
deleted file mode 100644
index 3cf942a..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoRecorderActivity.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/***
- Copyright (c) 2015-2016 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.provider.MediaStore;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-/**
- * Activity for recording video. Analogue of CameraActivity.
- * Supports the same protocol, in terms of extras and return data,\
- * as does ACTION_VIDEO_CAPTURE.
- */
-public class VideoRecorderActivity extends AbstractCameraActivity {
-  /**
-   * Whether there should be a timer shown on the video recording
-   * preview screen, and, if so, whether it counts down the remaining
-   * time on a time-limited recording or whether it counts up for how
-   * long the current recording is. Value should be a ChronoType
-   * enum value (NONE, COUNT_DOWN, COUNT_UP). COUNT_DOWN will be
-   * ignored unless you also provide a duration limit.
-   */
-  public static final String EXTRA_CHRONOTYPE=
-    "cwac_cam2_chronotype";
-
-  private static final String[] PERMS={
-    Manifest.permission.CAMERA,
-    Manifest.permission.WRITE_EXTERNAL_STORAGE,
-    Manifest.permission.RECORD_AUDIO};
-
-  @Override
-  protected String[] getNeededPermissions() {
-    return(PERMS);
-  }
-
-  @Override
-  protected boolean needsOverlay() {
-    return(false);
-  }
-
-  @Override
-  protected boolean needsActionBar() {
-    return(false);
-  }
-
-  @Override
-  protected boolean isVideo() {
-    return(true);
-  }
-
-  @Override
-  protected void configEngine(CameraEngine engine) {
-    // no-op
-  }
-
-  @Override
-  protected CameraFragment buildFragment() {
-    return(CameraFragment.newVideoInstance(getOutputUri(),
-        getIntent().getBooleanExtra(EXTRA_UPDATE_MEDIA_STORE, false),
-        getIntent().getIntExtra(MediaStore.EXTRA_VIDEO_QUALITY, 1),
-        getIntent().getIntExtra(MediaStore.EXTRA_SIZE_LIMIT, 0),
-        getIntent().getIntExtra(MediaStore.EXTRA_DURATION_LIMIT, 0),
-        (ZoomStyle)getIntent().getSerializableExtra(EXTRA_ZOOM_STYLE),
-        getIntent().getBooleanExtra(EXTRA_FACING_EXACT_MATCH, false),
-        (ChronoType)getIntent().getSerializableExtra(EXTRA_CHRONOTYPE),
-        getIntent().getBooleanExtra(EXTRA_SHOW_RULE_OF_THIRDS_GRID, false)));
-  }
-
-  @SuppressWarnings("unused")
-  @Subscribe(threadMode = ThreadMode.MAIN)
-  public void onEventMainThread(CameraEngine.VideoTakenEvent event) {
-    if (event.getVideoTransaction()==null) {
-      setResult(RESULT_CANCELED);
-      finish();
-      // TODO: something with the exception
-    }
-    else {
-      findViewById(android.R.id.content).post(() -> {
-       setResult(RESULT_OK, buildResultIntent().setData(getOutputUri()));
-       finish();
-      });
-    }
-  }
-
-  /**
-   * Class to build an Intent used to start the VideoRecorderActivity.
-   * Call setComponent() on the Intent if you are using your
-   * own subclass of VideoRecorderActivity.
-   */
-  public static class IntentBuilder
-    extends AbstractCameraActivity.IntentBuilder<IntentBuilder> {
-    /**
-     * Standard constructor. May throw a runtime exception
-     * if the environment is not set up properly (see
-     * validateEnvironment() on Utils).
-     *
-     * @param ctxt any Context will do
-     */
-    public IntentBuilder(Context ctxt) {
-      super(ctxt, VideoRecorderActivity.class);
-    }
-
-    @Override
-    public Intent buildChooserBaseIntent() {
-      return(new Intent(MediaStore.ACTION_VIDEO_CAPTURE));
-    }
-
-    @Override
-    public Intent build() {
-      forceEngine(CameraEngine.ID.CLASSIC);
-
-      return(super.build());
-    }
-
-    @Override
-    public IntentBuilder to(Uri output) {
-      if (!"file".equals(output.getScheme())) {
-        throw new IllegalArgumentException("must be a file:/// Uri");
-      }
-
-      return(super.to(output));
-    }
-
-    /**
-     * Sets the maximum size of the video file in bytes. Maps
-     * to EXTRA_SIZE_LIMIT.
-     *
-     * @param limit maximum video size in bytes
-     * @return the builder, for chaining
-     */
-    public IntentBuilder sizeLimit(int limit) {
-      result.putExtra(MediaStore.EXTRA_SIZE_LIMIT, limit);
-
-      return(this);
-    }
-
-    /**
-     * Sets the maximum duration of the video file in milliseconds. Maps
-     * to EXTRA_DURATION_LIMIT.
-     *
-     * @param limit maximum video length in milliseconds
-     * @return the builder, for chaining
-     */
-    public IntentBuilder durationLimit(int limit) {
-      result.putExtra(MediaStore.EXTRA_DURATION_LIMIT, limit);
-
-      return(this);
-    }
-
-    /**
-     * Whether there should be a timer shown on the video recording
-     * preview screen, and, if so, whether it counts down the remaining
-     * time on a time-limited recording or whether it counts up for how
-     * long the current recording is. COUNT_DOWN will be
-     * ignored unless you also provide a duration limit.
-     *
-     * @param type NONE, COUNT_DOWN, or COUNT_UP
-     * @return the builder, for chaining
-     */
-    public IntentBuilder chronoType(ChronoType type) {
-      result.putExtra(EXTRA_CHRONOTYPE, type);
-
-      return(this);
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoTransaction.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoTransaction.java
deleted file mode 100644
index 9e64e84..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/VideoTransaction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-import java.io.File;
-
-public class VideoTransaction {
-  File outputPath;
-  int quality=1;
-  int sizeLimit=0;
-  int durationLimit=0;
-
-  private VideoTransaction() {
-    // please use the Builder
-  }
-
-  public File getOutputPath() {
-    return(outputPath);
-  }
-
-  public int getQuality() {
-    return(quality);
-  }
-
-  public int getSizeLimit() {
-    return(sizeLimit);
-  }
-
-  public int getDurationLimit() {
-    return(durationLimit);
-  }
-
-  public static class Builder {
-    VideoTransaction result=new VideoTransaction();
-
-    public VideoTransaction build() {
-      return(result);
-    }
-
-    public Builder to(File outputPath) {
-      result.outputPath=outputPath;
-
-      return(this);
-    }
-
-    public Builder quality(int quality) {
-      result.quality=quality;
-
-      return(this);
-    }
-
-    public Builder sizeLimit(int sizeLimit) {
-      result.sizeLimit=sizeLimit;
-
-      return(this);
-    }
-
-    public Builder durationLimit(int durationLimit) {
-      result.durationLimit=durationLimit;
-
-      return(this);
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ZoomStyle.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/ZoomStyle.java
deleted file mode 100644
index c5bfc75..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/ZoomStyle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***
- Copyright (c) 2016 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2;
-
-public enum ZoomStyle {
-  NONE,
-  PINCH,
-  SEEKBAR
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FlashModePlugin.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FlashModePlugin.java
deleted file mode 100644
index 43813d9..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FlashModePlugin.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2.plugin;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.hardware.Camera;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraMetadata;
-import android.hardware.camera2.CaptureRequest;
-import android.os.Build;
-import android.util.Log;
-import android.view.OrientationEventListener;
-import com.commonsware.cwac.cam2.AbstractCameraActivity;
-import com.commonsware.cwac.cam2.CameraConfigurator;
-import com.commonsware.cwac.cam2.CameraPlugin;
-import com.commonsware.cwac.cam2.CameraSession;
-import com.commonsware.cwac.cam2.ClassicCameraConfigurator;
-import com.commonsware.cwac.cam2.FlashMode;
-import com.commonsware.cwac.cam2.SimpleCameraTwoConfigurator;
-import com.commonsware.cwac.cam2.SimpleClassicCameraConfigurator;
-import java.util.List;
-
-/**
- * Plugin for managing flash modes
- */
-public class FlashModePlugin implements CameraPlugin {
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public <T extends CameraConfigurator> T buildConfigurator(Class<T> type) {
-    if (type == ClassicCameraConfigurator.class) {
-      return (type.cast(new Classic()));
-    }
-
-    return(type.cast(new Two()));
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void validate(CameraSession session) {
-    // no validation required
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void destroy() {
-    // no-op
-  }
-
-  class Classic extends SimpleClassicCameraConfigurator {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Camera.Parameters configureStillCamera(
-      CameraSession session,
-      Camera.CameraInfo info,
-      Camera camera, Camera.Parameters params) {
-      if (params!=null && session.getCurrentFlashMode()!=null) {
-        params.setFlashMode(session.getCurrentFlashMode().getClassicMode());
-      }
-
-      return(params);
-    }
-  }
-
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  class Two extends SimpleCameraTwoConfigurator {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void addToCaptureRequest(CameraSession session,
-                                    CameraCharacteristics cc,
-                                    boolean facingFront,
-                                    CaptureRequest.Builder captureBuilder) {
-      if (session.getCurrentFlashMode()!=null) {
-        captureBuilder.set(CaptureRequest.CONTROL_AE_MODE,
-          session.getCurrentFlashMode().getCameraTwoMode());
-        captureBuilder.set(CaptureRequest.FLASH_MODE,
-          session.getCurrentFlashMode().isTorchMode() ?
-            CameraMetadata.FLASH_MODE_TORCH :
-            CameraMetadata.FLASH_MODE_OFF);
-      }
-    }
-
-    @Override
-    public void addToPreviewRequest(CameraSession session,
-                                    CameraCharacteristics cc,
-                                    CaptureRequest.Builder captureBuilder) {
-      if (session.getCurrentFlashMode()!=null) {
-        captureBuilder.set(CaptureRequest.CONTROL_AE_MODE,
-          session.getCurrentFlashMode().getCameraTwoMode());
-        captureBuilder.set(CaptureRequest.FLASH_MODE,
-          session.getCurrentFlashMode().isTorchMode() ?
-            CameraMetadata.FLASH_MODE_TORCH :
-            CameraMetadata.FLASH_MODE_OFF);
-      }
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FocusModePlugin.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FocusModePlugin.java
deleted file mode 100644
index 1393a8e..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/FocusModePlugin.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2.plugin;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.hardware.Camera;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraMetadata;
-import android.hardware.camera2.CaptureRequest;
-import android.os.Build;
-import android.util.Log;
-import android.view.OrientationEventListener;
-import com.commonsware.cwac.cam2.CameraConfigurator;
-import com.commonsware.cwac.cam2.CameraConstraints;
-import com.commonsware.cwac.cam2.CameraPlugin;
-import com.commonsware.cwac.cam2.CameraSession;
-import com.commonsware.cwac.cam2.ClassicCameraConfigurator;
-import com.commonsware.cwac.cam2.FocusMode;
-import com.commonsware.cwac.cam2.SimpleCameraTwoConfigurator;
-import com.commonsware.cwac.cam2.SimpleClassicCameraConfigurator;
-
-/**
- * Plugin for managing focus modes
- */
-public class FocusModePlugin implements CameraPlugin {
-  private final Context ctxt;
-  private final boolean isVideo;
-  private final FocusMode focusMode;
-  private OrientationEventListener orientationEventListener;
-  private int lastOrientation=OrientationEventListener.ORIENTATION_UNKNOWN;
-
-  public FocusModePlugin(Context ctxt,
-                         FocusMode focusMode,
-                         boolean isVideo) {
-    this.ctxt=ctxt.getApplicationContext();
-    this.focusMode=focusMode;
-    this.isVideo=isVideo;
-
-    orientationEventListener=new OrientationEventListener(ctxt) {
-      @Override
-      public void onOrientationChanged(int orientation) {
-        lastOrientation=orientation;
-      }
-    };
-
-    if (orientationEventListener.canDetectOrientation()) {
-      orientationEventListener.enable();
-    }
-    else {
-      orientationEventListener.disable();
-      orientationEventListener=null;
-    }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public <T extends CameraConfigurator> T buildConfigurator(Class<T> type) {
-    if (type == ClassicCameraConfigurator.class) {
-      return (type.cast(new Classic()));
-    }
-
-    return(type.cast(new Two()));
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void validate(CameraSession session) {
-    // no validation required
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void destroy() {
-    if (orientationEventListener!=null) {
-      orientationEventListener.disable();
-      orientationEventListener=null;
-    }
-  }
-
-  class Classic extends SimpleClassicCameraConfigurator {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Camera.Parameters configureStillCamera(
-      CameraSession session,
-      Camera.CameraInfo info,
-      Camera camera, Camera.Parameters params) {
-      if (params!=null) {
-        String desiredMode=null;
-
-        if (focusMode==FocusMode.OFF) {
-          desiredMode=Camera.Parameters.FOCUS_MODE_FIXED;
-        }
-        else if (focusMode==
-          FocusMode.EDOF) {
-          desiredMode=Camera.Parameters.FOCUS_MODE_EDOF;
-        }
-        else if (focusMode==
-          FocusMode.MACRO) {
-          desiredMode=Camera.Parameters.FOCUS_MODE_MACRO;
-        }
-        else if (isVideo) {
-          desiredMode=
-            Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO;
-        }
-        else {
-          desiredMode=
-            Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE;
-        }
-
-        if (params.getSupportedFocusModes().contains(desiredMode)) {
-          params.setFocusMode(desiredMode);
-        }
-        else {
-          Log.e("CWAC-Cam2",
-            "no support for requested focus mode");
-        }
-      }
-
-      return(params);
-    }
-  }
-
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  class Two extends SimpleCameraTwoConfigurator {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void addToPreviewRequest(CameraSession session,
-                                    CameraCharacteristics cc,
-                                    CaptureRequest.Builder captureBuilder) {
-      int desiredMode=getDesiredFocusMode(cc);
-
-      if (desiredMode!=-1) {
-        captureBuilder.set(CaptureRequest.CONTROL_AF_MODE,
-          desiredMode);
-      }
-      else {
-        Log.e("CWAC-Cam2", "no support for requested focus mode");
-      }
-    }
-
-    @Override
-    public void addToCaptureRequest(CameraSession session,
-                                    CameraCharacteristics cc,
-                                    boolean facingFront,
-                                    CaptureRequest.Builder captureBuilder) {
-      int desiredMode=getDesiredFocusMode(cc);
-
-      if (desiredMode!=-1) {
-        captureBuilder.set(CaptureRequest.CONTROL_AF_MODE,
-          desiredMode);
-      }
-      else {
-        Log.e("CWAC-Cam2", "no support for requested focus mode");
-      }
-    }
-
-    private int getDesiredFocusMode(CameraCharacteristics cc) {
-      int[] availModes=cc.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
-      int desiredMode;
-
-      if (focusMode==FocusMode.OFF) {
-        desiredMode=CameraMetadata.CONTROL_AF_MODE_OFF;
-      }
-      else if (focusMode==FocusMode.EDOF) {
-        desiredMode=CameraMetadata.CONTROL_AF_MODE_EDOF;
-      }
-      else if (focusMode==FocusMode.MACRO) {
-        desiredMode=CameraMetadata.CONTROL_AF_MODE_MACRO;
-      }
-      else if (isVideo) {
-        desiredMode=CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_VIDEO;
-      }
-      else {
-        desiredMode=CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE;
-      }
-
-      CameraConstraints constraints=CameraConstraints.get();
-
-      if (constraints!=null && constraints.getDisableFocusMode()) {
-        desiredMode=CameraMetadata.CONTROL_AF_MODE_OFF;
-      }
-
-      for (int availMode : availModes) {
-        if (availMode==desiredMode) {
-          return(desiredMode);
-        }
-      }
-
-      return(-1);
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/OrientationPlugin.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/OrientationPlugin.java
deleted file mode 100644
index 546aa53..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/OrientationPlugin.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2.plugin;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.hardware.Camera;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CaptureRequest;
-import android.media.MediaRecorder;
-import android.os.Build;
-import android.view.OrientationEventListener;
-import android.view.Surface;
-import android.view.WindowManager;
-import com.commonsware.cwac.cam2.AbstractCameraActivity;
-import com.commonsware.cwac.cam2.CameraConfigurator;
-import com.commonsware.cwac.cam2.CameraConstraints;
-import com.commonsware.cwac.cam2.CameraEngine;
-import com.commonsware.cwac.cam2.CameraPlugin;
-import com.commonsware.cwac.cam2.CameraSession;
-import com.commonsware.cwac.cam2.ClassicCameraConfigurator;
-import com.commonsware.cwac.cam2.SimpleCameraTwoConfigurator;
-import com.commonsware.cwac.cam2.SimpleClassicCameraConfigurator;
-import com.commonsware.cwac.cam2.VideoTransaction;
-
-/**
- * Plugin for managing orientation effects on the previews
- * and pictures.
- */
-public class OrientationPlugin implements CameraPlugin {
-  private final Context ctxt;
-  private OrientationEventListener orientationEventListener;
-  private int lastOrientation=OrientationEventListener.ORIENTATION_UNKNOWN;
-
-  public OrientationPlugin(Context ctxt) {
-    this.ctxt=ctxt.getApplicationContext();
-
-    orientationEventListener=new OrientationEventListener(ctxt) {
-      @Override
-      public void onOrientationChanged(int orientation) {
-        if (lastOrientation!=orientation) {
-          AbstractCameraActivity.BUS
-            .post(new CameraEngine.OrientationChangedEvent());
-        }
-
-        lastOrientation=orientation;
-      }
-    };
-
-    if (orientationEventListener.canDetectOrientation()) {
-      orientationEventListener.enable();
-    }
-    else {
-      orientationEventListener.disable();
-      orientationEventListener=null;
-    }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public <T extends CameraConfigurator> T buildConfigurator(Class<T> type) {
-    if (type == ClassicCameraConfigurator.class) {
-      return (type.cast(new Classic()));
-    }
-
-    return(type.cast(new Two()));
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void validate(CameraSession session) {
-    // no validation required
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void destroy() {
-    if (orientationEventListener!=null) {
-      orientationEventListener.disable();
-      orientationEventListener=null;
-    }
-  }
-
-  class Classic extends SimpleClassicCameraConfigurator {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Camera.Parameters configureStillCamera(
-      CameraSession session,
-      Camera.CameraInfo info,
-      Camera camera, Camera.Parameters params) {
-      int displayOrientation=getDisplayOrientation(info, true);
-      int cameraDisplayOrientation=90;
-
-      CameraConstraints constraints=CameraConstraints.get();
-
-      if (constraints!=null && constraints.getCameraDisplayOrientation()>=0) {
-        cameraDisplayOrientation=constraints.getCameraDisplayOrientation();
-      }
-
-      else if (useAltAlgorithm()) {
-        int degrees=0;
-        int temp=displayOrientation;
-
-        switch (temp) {
-          case Surface.ROTATION_0: degrees = 0; break;
-          case Surface.ROTATION_90: degrees = 90; break;
-          case Surface.ROTATION_180: degrees = 180; break;
-          case Surface.ROTATION_270: degrees = 270; break;
-        }
-
-        if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-          temp = (info.orientation + degrees) % 360;
-          temp = (360 - temp) % 360;  // compensate the mirror
-        } else {  // back-facing
-          temp = (info.orientation - degrees + 360) % 360;
-        }
-
-        cameraDisplayOrientation=temp;
-      }
-      else if (displayOrientation==180) {
-        cameraDisplayOrientation=270;
-      }
-/*
-      else {
-        camera.setDisplayOrientation(90);
-      }
-*/
-
-      camera.setDisplayOrientation(cameraDisplayOrientation);
-
-      if (params!=null) {
-        int outputOrientation;
-
-        if (info.facing==Camera.CameraInfo.CAMERA_FACING_FRONT) {
-          outputOrientation=(360-displayOrientation)%360;
-        }
-        else {
-          outputOrientation=displayOrientation;
-        }
-
-        params.setRotation(outputOrientation);
-      }
-
-      return(params);
-    }
-
-    private boolean useAltAlgorithm() {
-/*
-      if ("Huawei".equals(Build.MANUFACTURER) &&
-        "angler".equals(Build.PRODUCT)) {
-        return(true);
-      }
-
-      if ("LGE".equals(Build.MANUFACTURER) &&
-        "bullhead".equals(Build.PRODUCT)) {
-        return(true);
-      }
-
-      if ("samsung".equals(Build.MANUFACTURER) &&
-        "mprojectlteuc".equals(Build.PRODUCT)) {
-        return(true);
-      }
-
-      return(false);
-*/
-      return(true);
-    }
-
-    @Override
-    public void configureRecorder(CameraSession session,
-                                  int cameraId,
-                                  VideoTransaction xact,
-                                  MediaRecorder recorder) {
-      Camera.CameraInfo info=new Camera.CameraInfo();
-      Camera.getCameraInfo(cameraId, info);
-      int displayOrientation=getDisplayOrientation(info, false);
-
-      recorder.setOrientationHint(displayOrientation);
-    }
-
-    private int getDisplayOrientation(Camera.CameraInfo info,
-                                      boolean isStillCapture) {
-      WindowManager mgr=(WindowManager)ctxt.getSystemService(Context.WINDOW_SERVICE);
-      int rotation=mgr.getDefaultDisplay().getRotation();
-      int degrees=0;
-
-      switch (rotation) {
-        case Surface.ROTATION_0:
-          degrees=0;
-          break;
-        case Surface.ROTATION_90:
-          degrees=90;
-          break;
-        case Surface.ROTATION_180:
-          degrees=180;
-          break;
-        case Surface.ROTATION_270:
-          degrees=270;
-          break;
-      }
-
-      int displayOrientation;
-
-      if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-        displayOrientation=(info.orientation + degrees) % 360;
-        displayOrientation=(360 - displayOrientation) % 360;
-
-        if (!isStillCapture && displayOrientation==90) {
-          displayOrientation=270;
-        }
-
-        if ("Huawei".equals(Build.MANUFACTURER) &&
-          "angler".equals(Build.PRODUCT) && displayOrientation==270) {
-          displayOrientation=90;
-        }
-      }
-      else {
-        displayOrientation=(info.orientation - degrees + 360) % 360;
-      }
-
-      return(displayOrientation);
-    }
-  }
-
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  class Two extends SimpleCameraTwoConfigurator {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void addToCaptureRequest(CameraSession session,
-                                    CameraCharacteristics cc,
-                                    boolean facingFront,
-                                    CaptureRequest.Builder captureBuilder) {
-      // based on https://developer.android.com/reference/android/hardware/camera2/CaptureRequest.html#JPEG_ORIENTATION
-
-      int pictureOrientation=0;
-
-      if (lastOrientation!=android.view.OrientationEventListener.ORIENTATION_UNKNOWN) {
-        int sensorOrientation=cc.get(CameraCharacteristics.SENSOR_ORIENTATION);
-        int deviceOrientation=(lastOrientation + 45) / 90 * 90;
-
-        if (facingFront) {
-          deviceOrientation = -deviceOrientation;
-        }
-
-        pictureOrientation=(sensorOrientation + deviceOrientation + 360) % 360;
-      }
-
-      captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, pictureOrientation);
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/SizeAndFormatPlugin.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/SizeAndFormatPlugin.java
deleted file mode 100644
index 3a1f279..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/plugin/SizeAndFormatPlugin.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * Copyright (c) 2015 CommonsWare, LLC
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2.plugin;
-
-import android.annotation.TargetApi;
-import android.graphics.Point;
-import android.hardware.Camera;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CaptureRequest;
-import android.media.CamcorderProfile;
-import android.media.ImageReader;
-import android.media.MediaRecorder;
-import android.os.Build;
-import com.commonsware.cwac.cam2.CameraConfigurator;
-import com.commonsware.cwac.cam2.CameraConstraints;
-import com.commonsware.cwac.cam2.CameraPlugin;
-import com.commonsware.cwac.cam2.CameraSession;
-import com.commonsware.cwac.cam2.CameraTwoConfigurator;
-import com.commonsware.cwac.cam2.ClassicCameraConfigurator;
-import com.commonsware.cwac.cam2.SimpleCameraTwoConfigurator;
-import com.commonsware.cwac.cam2.SimpleClassicCameraConfigurator;
-import com.commonsware.cwac.cam2.VideoTransaction;
-import com.commonsware.cwac.cam2.util.Size;
-
-/**
- * A plugin that configures the size and format of previews and
- * pictures to be taken by the camera. This, or a plugin like it,
- * needs to be in the plugin chain for the CameraSession.
- */
-public class SizeAndFormatPlugin implements CameraPlugin {
-  final private Size pictureSize;
-  final private Size previewSize;
-  private final int pictureFormat;
-
-  /**
-   * Constructor.
-   *
-   * @param previewSize the size of preview images
-   * @param pictureSize the size of pictures to be taken
-   * @param pictureFormat the format of pictures to be taken, in
-   *                      the form of an ImageFormat constant
-   *                      (e.g., ImageFormat.JPEG)
-   */
-  public SizeAndFormatPlugin(Size previewSize, Size pictureSize, int pictureFormat) {
-    this.previewSize=previewSize;
-    this.pictureSize=pictureSize;
-    this.pictureFormat=pictureFormat;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public <T extends CameraConfigurator> T buildConfigurator(Class<T> type) {
-    if (type == ClassicCameraConfigurator.class) {
-      return (type.cast(new Classic()));
-    }
-
-    return(type.cast(new Two()));
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void validate(CameraSession session) {
-    if (!session.getDescriptor().getPreviewSizes().contains(previewSize)) {
-      throw new IllegalStateException("Requested preview size is not one that the camera supports");
-    }
-
-    if (!session.getDescriptor().getPictureSizes().contains(pictureSize)) {
-      throw new IllegalStateException("Requested picture size is not one that the camera supports");
-    }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void destroy() {
-    // not required
-  }
-
-  class Classic extends SimpleClassicCameraConfigurator {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Camera.Parameters configureStillCamera(
-      CameraSession session,
-      Camera.CameraInfo info,
-      Camera camera, Camera.Parameters params) {
-      if (params!=null) {
-        params.setPreviewSize(previewSize.getWidth(),
-          previewSize.getHeight());
-        params.setPictureSize(pictureSize.getWidth(),
-          pictureSize.getHeight());
-        params.setPictureFormat(pictureFormat);
-      }
-
-      return(params);
-    }
-
-    @Override
-    public void configureRecorder(CameraSession session,
-                                  int cameraId,
-                                  VideoTransaction xact,
-                                  MediaRecorder recorder) {
-      int highProfile=getHigh();
-
-      boolean canGoHigh=CamcorderProfile.hasProfile(cameraId,
-        highProfile);
-      boolean canGoLow=CamcorderProfile.hasProfile(cameraId,
-        CamcorderProfile.QUALITY_LOW);
-
-      if (canGoHigh && (xact.getQuality()==1 || !canGoLow)) {
-        recorder.setProfile(CamcorderProfile.get(cameraId,
-          highProfile));
-      }
-      else if (canGoLow) {
-        recorder.setProfile(CamcorderProfile.get(cameraId,
-          CamcorderProfile.QUALITY_LOW));
-      }
-      else {
-        throw new IllegalStateException(
-          "cannot find valid CamcorderProfile");
-      }
-    }
-
-    private int getHigh() {
-      CameraConstraints constraints=CameraConstraints.get();
-
-      if (constraints!=null) {
-        return(constraints.getHighCamcorderProfile());
-      }
-
-      return(CamcorderProfile.QUALITY_HIGH);
-    }
-  }
-
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  class Two extends SimpleCameraTwoConfigurator {
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public ImageReader buildImageReader() {
-      return(ImageReader.newInstance(pictureSize.getWidth(),
-          pictureSize.getHeight(), pictureFormat, 2));
-    }
-  }
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Size.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Size.java
deleted file mode 100644
index 0a22c82..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Size.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.commonsware.cwac.cam2.util;
-
-// import static com.android.internal.util.Preconditions.checkNotNull;
-
-/**
- * Immutable class for describing width and height dimensions in pixels.
- */
-public final class Size {
-  /**
-   * Create a new immutable Size instance.
-   *
-   * @param width The width of the size, in pixels
-   * @param height The height of the size, in pixels
-   */
-  public Size(int width, int height) {
-    mWidth = width;
-    mHeight = height;
-  }
-
-  /**
-   * Get the width of the size (in pixels).
-   * @return width
-   */
-  public int getWidth() {
-    return mWidth;
-  }
-
-  /**
-   * Get the height of the size (in pixels).
-   * @return height
-   */
-  public int getHeight() {
-    return mHeight;
-  }
-
-  /**
-   * Check if this size is equal to another size.
-   * <p>
-   * Two sizes are equal if and only if both their widths and heights are
-   * equal.
-   * </p>
-   * <p>
-   * A size object is never equal to any other type of object.
-   * </p>
-   *
-   * @return {@code true} if the objects were equal, {@code false} otherwise
-   */
-  @Override
-  public boolean equals(final Object obj) {
-    if (obj == null) {
-      return false;
-    }
-    if (this == obj) {
-      return true;
-    }
-    if (obj instanceof Size) {
-      Size other = (Size) obj;
-      return mWidth == other.mWidth && mHeight == other.mHeight;
-    }
-    return false;
-  }
-
-  /**
-   * Return the size represented as a string with the format {@code "WxH"}
-   *
-   * @return string representation of the size
-   */
-  @Override
-  public String toString() {
-    return mWidth + "x" + mHeight;
-  }
-
-  private static NumberFormatException invalidSize(String s) {
-    throw new NumberFormatException("Invalid Size: \"" + s + "\"");
-  }
-
-  /**
-   * Parses the specified string as a size value.
-   * <p>
-   * The ASCII characters {@code \}{@code u002a} ('*') and
-   * {@code \}{@code u0078} ('x') are recognized as separators between
-   * the width and height.</p>
-   * <p>
-   * For any {@code Size s}: {@code Size.parseSize(s.toString()).equals(s)}.
-   * However, the method also handles sizes expressed in the
-   * following forms:</p>
-   * <p>
-   * "<i>width</i>{@code x}<i>height</i>" or
-   * "<i>width</i>{@code *}<i>height</i>" {@code => new Size(width, height)},
-   * where <i>width</i> and <i>height</i> are string integers potentially
-   * containing a sign, such as "-10", "+7" or "5".</p>
-   *
-   * <pre>{@code
-   * Size.parseSize("3*+6").equals(new Size(3, 6)) == true
-   * Size.parseSize("-3x-6").equals(new Size(-3, -6)) == true
-   * Size.parseSize("4 by 3") => throws NumberFormatException
-   * }</pre>
-   *
-   * @param string the string representation of a size value.
-   * @return the size value represented by {@code string}.
-   *
-   * @throws NumberFormatException if {@code string} cannot be parsed
-   * as a size value.
-   * @throws NullPointerException if {@code string} was {@code null}
-   */
-  public static Size parseSize(String string)
-      throws NumberFormatException {
-//    checkNotNull(string, "string must not be null");
-
-    int sep_ix = string.indexOf('*');
-    if (sep_ix < 0) {
-      sep_ix = string.indexOf('x');
-    }
-    if (sep_ix < 0) {
-      throw invalidSize(string);
-    }
-    try {
-      return new Size(Integer.parseInt(string.substring(0, sep_ix)),
-          Integer.parseInt(string.substring(sep_ix + 1)));
-    } catch (NumberFormatException e) {
-      throw invalidSize(string);
-    }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public int hashCode() {
-    // assuming most sizes are <2^16, doing a rotate will give us perfect hashing
-    return mHeight ^ ((mWidth << (Integer.SIZE / 2)) | (mWidth >>> (Integer.SIZE / 2)));
-  }
-
-  private final int mWidth;
-  private final int mHeight;
-}
diff --git a/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Utils.java b/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Utils.java
deleted file mode 100644
index ae6e121..0000000
--- a/imagepicker/src/main/java/com/commonsware/cwac/cam2/util/Utils.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/***
- Copyright (c) 2015 CommonsWare, LLC
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package com.commonsware.cwac.cam2.util;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Build;
-import android.util.DisplayMetrics;
-import com.commonsware.cwac.cam2.CameraActivity;
-import com.commonsware.cwac.cam2.CameraDescriptor;
-import com.commonsware.cwac.cam2.VideoRecorderActivity;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * Home of static utility methods used by the library and
- * offered to developers in the spirit of togetherness.
- */
-public class Utils {
-  /**
-   * Tests the app and the device to confirm that the code
-   * in this library should work. This is called automatically
-   * by other classes (e.g., CameraActivity), and so you probably
-   * do not need to call it yourself. But, hey, it's a public
-   * method, so call it if you feel like it.
-   *
-   * The method will throw an IllegalStateException if the
-   * environment is unsatisfactory, where the exception message
-   * will tell you what is wrong.
-   *
-   * @param ctxt any Context will do
-   */
-  public static void validateEnvironment(Context ctxt,
-                                         boolean failIfNoPermissions) {
-    if (Build.VERSION.SDK_INT<Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-      throw new IllegalStateException("App is running on device older than API Level 14");
-    }
-
-    PackageManager pm=ctxt.getPackageManager();
-
-    if (!pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY) &&
-        !pm.hasSystemFeature(PackageManager.FEATURE_CAMERA)) {
-      throw new IllegalStateException("App is running on device that lacks a camera");
-    }
-
-    if (ctxt instanceof CameraActivity) {
-      try {
-        ActivityInfo info=pm.getActivityInfo(((CameraActivity)ctxt).getComponentName(), 0);
-
-        if (info.exported) {
-          throw new IllegalStateException("A CameraActivity cannot be exported!");
-        }
-      }
-      catch (PackageManager.NameNotFoundException e) {
-        throw new IllegalStateException("Cannot find this activity!", e);
-      }
-    }
-
-    if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.M && failIfNoPermissions) {
-      if (ctxt.checkSelfPermission(Manifest.permission.CAMERA)!=
-        PackageManager.PERMISSION_GRANTED) {
-        throw new IllegalStateException("We do not have the CAMERA permission");
-      }
-
-      if (ctxt instanceof VideoRecorderActivity) {
-        if (ctxt.checkSelfPermission(Manifest.permission.RECORD_AUDIO)!=
-          PackageManager.PERMISSION_GRANTED) {
-          throw new IllegalStateException("We do not have the RECORD_AUDIO permission");
-        }
-      }
-    }
-  }
-
-  /**
-   * Algorithm for determining if the system bar is on the
-   * bottom or right. Based on implementation of PhoneWindowManager.
-   * Pray that it holds up.
-   *
-   * @param ctxt any Context will do
-   * @return true if the system bar should be on the bottom in
-   * the current configuration, false otherwise
-   */
-  public static boolean isSystemBarOnBottom(Context ctxt) {
-    Resources res=ctxt.getResources();
-    Configuration cfg=res.getConfiguration();
-    DisplayMetrics dm=res.getDisplayMetrics();
-    boolean canMove=(dm.widthPixels != dm.heightPixels &&
-        cfg.smallestScreenWidthDp < 600);
-
-    return(!canMove || dm.widthPixels < dm.heightPixels);
-  }
-
-  public static Size getLargestPictureSize(CameraDescriptor descriptor) {
-    Size result=null;
-
-    for (Size size : descriptor.getPictureSizes()) {
-      if (result == null) {
-        result=size;
-      }
-      else {
-        int resultArea=result.getWidth() * result.getHeight();
-        int newArea=size.getWidth() * size.getHeight();
-
-        if (newArea > resultArea) {
-          result=size;
-        }
-      }
-    }
-
-    return(result);
-  }
-
-  public static Size getSmallestPictureSize(CameraDescriptor descriptor) {
-    Size result=null;
-
-    for (Size size : descriptor.getPictureSizes()) {
-      if (result == null) {
-        result=size;
-      }
-      else {
-        int resultArea=result.getWidth() * result.getHeight();
-        int newArea=size.getWidth() * size.getHeight();
-
-        if (newArea < resultArea) {
-          result=size;
-        }
-      }
-    }
-
-    return(result);
-  }
-
-  // based on https://github.com/googlesamples/android-Camera2Basic/blob/master/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
-
-  /**
-   * Given {@code choices} of {@code Size}s supported by a camera, chooses the smallest one whose
-   * width and height are at least as large as the respective requested values, and whose aspect
-   * ratio matches with the specified value.
-   *
-   * @param choices     The list of sizes that the camera supports for the intended output class
-   * @param width       The minimum desired width
-   * @param height      The minimum desired height
-   * @param aspectRatio The aspect ratio
-   * @return The optimal {@code Size}, or an arbitrary one if none were big enough
-   */
-  public static Size chooseOptimalSize(List<Size> choices, int width, int height, Size aspectRatio) {
-    // Collect the supported resolutions that are at least as big as the preview Surface
-    List<Size> bigEnough = new ArrayList<Size>();
-    int w = aspectRatio.getWidth();
-    int h = aspectRatio.getHeight();
-    for (Size option : choices) {
-      if (option.getHeight() == option.getWidth() * h / w &&
-          option.getWidth() >= width && option.getHeight() >= height) {
-        bigEnough.add(option);
-      }
-    }
-
-    // Pick the smallest of those, assuming we found any
-    if (bigEnough.size() > 0) {
-      return Collections.min(bigEnough, new CompareSizesByArea());
-    } else {
-//      Log.e(TAG, "Couldn't find any suitable preview size");
-      return Collections.max(choices, new CompareSizesByArea());
-    }
-  }
-
-  static class CompareSizesByArea implements Comparator<Size> {
-
-    @Override
-    public int compare(Size lhs, Size rhs) {
-      // We cast here to ensure the multiplications won't overflow
-      return Long.signum((long) lhs.getWidth() * lhs.getHeight() -
-          (long) rhs.getWidth() * rhs.getHeight());
-    }
-
-  }
-}
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
index a0dbbaa..d34034b 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
@@ -49,6 +49,9 @@ public class ImageEntry implements Parcelable {
     private boolean uploaded;
     private int progress;
 
+    public String S3Url;
+    public String genId;
+    public int offset;
 
     private void logException(Throwable e) {
 //        e.printStackTrace();
@@ -627,6 +630,9 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(this.description);
         dest.writeByte(this.uploaded ? (byte) 1 : (byte) 0);
         dest.writeInt(this.progress);
+        dest.writeString(this.genId);
+        dest.writeString(this.S3Url);
+        dest.writeInt(this.offset);
     }
 
     protected ImageEntry(Parcel in) {
@@ -641,6 +647,15 @@ protected ImageEntry(Parcel in) {
         this.description = in.readString();
         this.uploaded = in.readByte() != 0;
         this.progress = in.readInt();
+        this.genId = in.readString();
+        this.S3Url = in.readString();
+        this.offset = in.readInt();
+    }
+
+    @NonNull
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
     }
 
     public static final Creator<ImageEntry> CREATOR = new Creator<ImageEntry>() {
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
index 2f68a3c..45956b8 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
@@ -31,8 +31,11 @@
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.fragment.app.Fragment;
 
+import com.github.florent37.runtimepermission.PermissionResult;
+import com.github.florent37.runtimepermission.RuntimePermission;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.pr.swalert.toast.ToastUtils;
 import com.yalantis.ucrop.UCrop;
 
 import net.yazeed44.imagepicker.data.Events;
@@ -41,6 +44,7 @@
 import net.yazeed44.imagepicker.library.BuildConfig;
 import net.yazeed44.imagepicker.library.R;
 import net.yazeed44.imagepicker.ui.album.AlbumsFragment;
+import net.yazeed44.imagepicker.ui.camera.CameraActivity;
 import net.yazeed44.imagepicker.ui.imagePreview.ImagePreviewActivity;
 import net.yazeed44.imagepicker.ui.photo.ImagesThumbnailFragment;
 import net.yazeed44.imagepicker.ui.photoPager.ImagesPagerFragment;
@@ -61,6 +65,9 @@
 import java.util.List;
 import java.util.Locale;
 
+import java8.util.stream.Collectors;
+import java8.util.stream.StreamSupport;
+
 
 public class PickerActivity extends AppCompatActivity {
     public static final int NO_LIMIT = -1;
@@ -70,6 +77,8 @@ public class PickerActivity extends AppCompatActivity {
     public static final String CAPTURED_IMAGES_DIR = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath();
     private static final int REQUEST_PORTRAIT_RFC = 1337;
     public static final int REQUEST_PORTRAIT_FFC = REQUEST_PORTRAIT_RFC + 1;
+    private static final int REQUEST_VIDEO = 678;
+    private static final int REQUEST_IMAGE = 679;
     public static ArrayList<ImageEntry> sCheckedImages = new ArrayList<>();
     private boolean mShouldShowUp = false;
     private FloatingActionButton mDoneFab;
@@ -112,6 +121,14 @@ protected void onCreate(Bundle savedInstanceState) {
             finish();
             return;
         }
+        if (mPickOptions.limitVideo >= 0 && mPickOptions.limitPhoto >= 0) {
+            mPickOptions.limit = mPickOptions.limitVideo + mPickOptions.limitPhoto;
+        } else if (mPickOptions.limitVideo > 0 && mPickOptions.limitPhoto < 0) {
+            mPickOptions.limit = mPickOptions.limitVideo;
+        } else if (mPickOptions.limitVideo < 0 && mPickOptions.limitPhoto > 0) {
+            mPickOptions.limit = mPickOptions.limitPhoto;
+        }
+
         UIUtil.hideKeyboard(this);
         setContentView(R.layout.activity_pick);
         initTheme();
@@ -325,26 +342,59 @@ public void onCancel() {
     }
 
     public void startCamera() {
-        if (!CameraSupport.isEnabled()) {
-            return;
-        }
+        String[] permissions = new String[2];
+        permissions[0] = Manifest.permission.CAMERA;
+        permissions[1] = Manifest.permission.RECORD_AUDIO;
+
+        RuntimePermission.askPermission(this, permissions)
+                .onDenied(result -> {
+                    StringBuilder denied = getPermissionsString(this, result, result.getDenied());
+                    ToastUtils.alertYesNo(this, String.format(this.getString(R.string.ask_perrmission), denied.toString()), yesButtonConfirmed -> {
+                        if (yesButtonConfirmed) {
+                            result.askAgain();
+                        }
+                    });
+                })
+                .onForeverDenied(result -> {
+                    StringBuilder denied = getPermissionsString(this, result, result.getDenied());
+                    ToastUtils.alertYesNo(this, String.format(this.getString(R.string.ask_perrmission), denied.toString()), yesButtonConfirmed -> {
+                        if (yesButtonConfirmed) {
+                            result.goToSettings();
+                        }
+                    });
+                })
+                .onAccepted(result -> {
+                    if (!mPickOptions.videosEnabled) {
+                        capturePhoto();
+                        return;
+                    }
 
-        if (!mPickOptions.videosEnabled) {
-            capturePhoto();
-            return;
+                    new AlertDialog.Builder(this).setTitle(R.string.dialog_choose_camera_title)
+                            .setItems(new String[]{getResources().getString(R.string.dialog_choose_camera_item_0), getResources().getString(R.string.dialog_choose_camera_item_1)}, (dialog, which) -> {
+                                        if (which == 0) {
+                                            capturePhoto();
+                                        } else {
+                                            captureVideo();
+                                        }
+                                    }
+                            )
+                            .setNegativeButton(android.R.string.cancel, null)
+                            .show();
+                })
+                .ask();
+    }
+
+    private StringBuilder getPermissionsString(Context context, PermissionResult result, List<String> foreverDenied) {
+        StringBuilder denied = new StringBuilder();
+        for (String permission : foreverDenied) {
+            try {
+                denied.append("- ").append(context.getPackageManager().getPermissionInfo(permission, 0).loadLabel(context.getPackageManager()));
+                if (result.getDenied().indexOf(permission) != result.getDenied().size() - 1)
+                    denied.append("\n");
+            } catch (PackageManager.NameNotFoundException e) {
+            }
         }
-
-        new AlertDialog.Builder(this).setTitle(R.string.dialog_choose_camera_title)
-                .setItems(new String[]{getResources().getString(R.string.dialog_choose_camera_item_0), getResources().getString(R.string.dialog_choose_camera_item_1)}, (dialog, which) -> {
-                            if (which == 0) {
-                                capturePhoto();
-                            } else {
-                                captureVideo();
-                            }
-                        }
-                )
-                .setNegativeButton(android.R.string.cancel, null)
-                .show();
+        return denied;
     }
 
     public static final int MY_CAMERA_PERMISSION_CODE = 100;
@@ -370,20 +420,14 @@ public static boolean verifyStoragePermissions(Activity activity) {
     }
 
     public void capturePhoto() {
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
-                != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA},
-                    MY_CAMERA_PERMISSION_CODE);
-        } else {
-            StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
-            StrictMode.setVmPolicy(builder.build());
-            captureImageFile = createTemporaryFileForCapturing(".png");
-            Intent i = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-            i.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(captureImageFile));
-            startActivityForResult(i, REQUEST_PORTRAIT_FFC);
-        }
+        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        startActivityForResult(intent, REQUEST_IMAGE);
+//        Intent photoIntent = new Intent(this, CameraActivity.class);
+//        startActivity(photoIntent);
     }
 
+
+
     public static File createTemporaryFileForCapturing(final String extension) {
         final File captureTempFile = new File(CAPTURED_IMAGES_DIR
                 + "/IMG_"
@@ -403,9 +447,8 @@ private void logException(Throwable e) {
     }
 
     public void captureVideo() {
-        final File captureVideoFile = createTemporaryFileForCapturing(".mp4");
-        CameraSupport.startVideoCaptureActivity(this,
-                captureVideoFile, mPickOptions.videoLengthLimit, REQUEST_PORTRAIT_FFC);
+        Intent intent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
+        startActivityForResult(intent, REQUEST_VIDEO);
     }
 
 
@@ -463,13 +506,11 @@ private boolean shouldShowSelectAll() {
     }
 
     private void initCaptureMenuItem(final Menu menu) {
-        if (CameraSupport.isEnabled()) {
-            getMenuInflater().inflate(R.menu.menu_take_photo, menu);
-            Drawable captureIconDrawable = AppCompatResources.getDrawable(this, R.drawable.ic_action_camera_white);
-            captureIconDrawable = DrawableCompat.wrap(captureIconDrawable);
-            DrawableCompat.setTint(captureIconDrawable, mPickOptions.captureItemIconTintColor);
-            menu.findItem(R.id.action_take_photo).setIcon(captureIconDrawable);
-        }
+        getMenuInflater().inflate(R.menu.menu_take_photo, menu);
+        Drawable captureIconDrawable = AppCompatResources.getDrawable(this, R.drawable.ic_action_camera_white);
+        captureIconDrawable = DrawableCompat.wrap(captureIconDrawable);
+        DrawableCompat.setTint(captureIconDrawable, mPickOptions.captureItemIconTintColor);
+        menu.findItem(R.id.action_take_photo).setIcon(captureIconDrawable);
     }
 
     private void hideDeselectAll() {
@@ -522,7 +563,7 @@ private void selectAllImages() {
             for (final ImageEntry imageEntry : mSelectedAlbum.imageList) {
                 if (mPickOptions.limit != NO_LIMIT && sCheckedImages.size() + 1 > mPickOptions.limit) {
                     //Hit the limit
-                    Toast.makeText(this, R.string.you_cant_check_more_images, Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, R.string.you_cant_check_more_media, Toast.LENGTH_SHORT).show();
                     break;
                 }
 
@@ -616,12 +657,26 @@ private void handleMultipleModeAddition(final ImageEntry imageEntry) {
         }
 
         if (sCheckedImages.size() < mPickOptions.limit || mPickOptions.limit == NO_LIMIT) {
-            imageEntry.isPicked = true;
-            sCheckedImages.add(imageEntry);
+            if (imageEntry.isVideo) {
+                long totalVideos = StreamSupport.stream(sCheckedImages).filter(entry -> entry.isVideo).count();
+                if (totalVideos < mPickOptions.limitVideo || mPickOptions.limitVideo == NO_LIMIT) {
+                    imageEntry.isPicked = true;
+                    sCheckedImages.add(imageEntry);
+                } else {
+                    Toast.makeText(this, String.format(Locale.getDefault(), getString(R.string.can_choose_d_video), mPickOptions.limitVideo), Toast.LENGTH_SHORT).show();
+                }
+            } else {
+                long totalPhotos = StreamSupport.stream(sCheckedImages).filter(entry -> !entry.isVideo).count();
+                if (totalPhotos < mPickOptions.limitPhoto || mPickOptions.limitPhoto == NO_LIMIT) {
+                    imageEntry.isPicked = true;
+                    sCheckedImages.add(imageEntry);
+                } else {
+                    Toast.makeText(this, String.format(Locale.getDefault(), getString(R.string.can_choose_d_image), mPickOptions.limitPhoto), Toast.LENGTH_SHORT).show();
+                }
+            }
         } else {
-
-            Toast.makeText(this, String.format(Locale.getDefault(), getString(R.string.can_choose_d_image), mPickOptions.limit), Toast.LENGTH_SHORT).show();
-            Log.i("onPickImage", "You can't check more images");
+            Toast.makeText(this, getString(R.string.you_cant_check_more_media), Toast.LENGTH_SHORT).show();
+            Log.i("onPickImage", "You can't check more media");
         }
     }
 
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/camera/CameraActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/camera/CameraActivity.java
new file mode 100644
index 0000000..d7de25b
--- /dev/null
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/camera/CameraActivity.java
@@ -0,0 +1,78 @@
+package net.yazeed44.imagepicker.ui.camera;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.camerakit.CameraKitView;
+
+import net.yazeed44.imagepicker.library.R;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+
+public class CameraActivity extends AppCompatActivity {
+
+    private CameraKitView cameraKitView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+//        requestWindowFeature(Window.FEATURE_NO_TITLE);
+//        this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        setContentView(R.layout.activity_camera);
+        View decorView = getWindow().getDecorView();
+        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE
+                | View.SYSTEM_UI_FLAG_FULLSCREEN
+                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
+        cameraKitView = findViewById(R.id.camera);
+        cameraKitView.captureImage((cameraKitView, bytes) -> {
+            String pathFile = String.format("%s/KO_%s.jpg", Environment.DIRECTORY_PICTURES, System.currentTimeMillis());
+            File outputFile = new File(pathFile);
+            if (!outputFile.exists()) {
+                try {
+                    outputFile.createNewFile();
+                    FileOutputStream outputStream = new FileOutputStream(outputFile);
+                    outputStream.write(bytes);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        cameraKitView.onStart();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        cameraKitView.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        cameraKitView.onPause();
+        super.onPause();
+    }
+
+    @Override
+    protected void onStop() {
+        cameraKitView.onStop();
+        super.onStop();
+    }
+
+}
\ No newline at end of file
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CameraSupport.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CameraSupport.java
index eca359d..95bbdfd 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CameraSupport.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/CameraSupport.java
@@ -3,8 +3,6 @@
 import android.app.Activity;
 import android.content.Intent;
 
-import com.commonsware.cwac.cam2.CameraActivity;
-
 import java.io.File;
 
 /**
@@ -31,21 +29,10 @@ public static boolean isEnabled() {
     }
 
     public static void startPhotoCaptureActivity(Activity parent, File file, int requestCode) {
-        final Intent captureIntent = new CameraActivity.IntentBuilder(parent)
-                .skipConfirm()
-                .debug()
-                .to(file)
-                .build();
 
-        parent.startActivityForResult(captureIntent, requestCode);
     }
 
     public static void startVideoCaptureActivity(Activity parent, File file, int videoLengthLimit, int requestCode) {
-        final Intent captureIntent = new com.commonsware.cwac.cam2.VideoRecorderActivity.IntentBuilder(parent)
-                .durationLimit(videoLengthLimit)
-                .debug()
-                .to(file)
-                .build();
-        parent.startActivityForResult(captureIntent, requestCode);
+
     }
 }
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
index 72ede86..22f166d 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
@@ -37,7 +37,9 @@
  */
 public class Picker {
 
-    public final int limit;
+    public int limit;
+    public final int limitPhoto;
+    public final int limitVideo;
     public final WeakReference<Context> context;
     public final int fabBackgroundColor;
     public final int fabBackgroundColorWhenPressed;
@@ -87,11 +89,12 @@ protected Picker(final Builder builder) {
         videoThumbnailOverlayColor = builder.mVideoThumbnailOverlayColor;
         videoIconTintColor = builder.mVideoIconTintColor;
         backBtnInMainActivity = builder.mBackBtnInMainActivity;
-
+        limitPhoto = builder.mLimitPhoto;
+        limitVideo = builder.mLimitVideo;
     }
 
     public void startActivity() {
-        if (limit <= 0 && pickMode == PickMode.MULTIPLE_IMAGES) {
+        if (limit <= 0 && pickMode == PickMode.MULTIPLE_IMAGES && limitPhoto <= 0 && limitVideo <= 0) {
             ToastUtils.showToastWarning(context.get(), R.string.you_picked_max_photo);
             return;
         }
@@ -162,6 +165,8 @@ public static class Builder {
         private final PickListener mPickListener;
         private final int mThemeResId;
         private int mLimit = PickerActivity.NO_LIMIT;
+        public int mLimitPhoto = PickerActivity.NO_LIMIT;
+        public int mLimitVideo = PickerActivity.NO_LIMIT;
         private int mFabBackgroundColor;
         @ColorInt
         private int mFabBackgroundColorWhenPressed;
@@ -206,8 +211,6 @@ public Builder(final Context context, final PickListener listener) {
             mContext.setTheme(mThemeResId);
             mPickListener = listener;
             init();
-
-
         }
 
         public Builder(Builder other) {
@@ -237,6 +240,8 @@ public Builder(Builder other) {
             this.mBackBtnInMainActivity = other.mBackBtnInMainActivity;
             this.singleBuilder = other.singleBuilder;
             this.multipleBuilder = other.multipleBuilder;
+            this.mLimitPhoto = other.mLimitPhoto;
+            this.mLimitVideo = other.mLimitVideo;
         }
 
         public Builder(@NonNull final Context context, @NonNull final PickListener listener, @StyleRes final int themeResId) {
@@ -350,7 +355,7 @@ public MultiplePicker.MultipleBuilder multipleImage() {
             return multipleBuilder;
         }
 
-        private Picker.Builder setPickMode(final PickMode pickMode) {
+        public Picker.Builder setPickMode(final PickMode pickMode) {
             mPickMode = pickMode;
             return this;
         }
@@ -405,6 +410,15 @@ public Picker.Builder setVideoIconTintColor(@ColorInt final int color) {
             return this;
         }
 
+        public Builder setLimitPhoto(int mLimitPhoto) {
+            this.mLimitPhoto = mLimitPhoto;
+            return this;
+        }
+
+        public Builder setLimitVideo(int mLimitVideo) {
+            this.mLimitVideo = mLimitVideo;
+            return this;
+        }
 
         public Picker build() {
             return new Picker(this);
diff --git a/imagepicker/src/main/res/drawable-hdpi/ic_video.png b/imagepicker/src/main/res/drawable-hdpi/ic_video.png
deleted file mode 100644
index f82b13d24f24e673610967428e51b57b004bb6ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 368
zcmV-$0gwKPP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003uNkl<Zc-rll
z%?g4*6ouXQ^8^u8&`Y$aMVoR{xQ|{dsTQ?~9-*awD7bOq`*bvoQT!ta=hi)N5eAj>
zIY-C2io#;CSS;2r$S{nVZQB>ivK}qf)p4BpN9JAE9at~<EtlhY-l)!R7=~Ru?8$oo
z7p^2Q9~Y9asWKk~K?mk_oTrNMQDp&uIjzS0ApxZYAetu!kYrxZMU4hPn)!lvMSg&M
zY)AnV#fA((S!_rEU^U*A#fAg`%51pcNekdJ00S@p1GHDBY1*U#u!!wZC&~aCjy=r8
znJhrEPw!VjkocXBW&(923y?w-%>=0}Wl@~SZR(?$5Wh|&+bSYN1^@$Vi8eIbnl54-
zr#!&0=?eJm)*^h28?-_rh-qdJ0}I^X)>d;D(YV9IlH2So7K_FDD?I^-n@4LtT}K=M
O0000<MNUMnLSTZ{XqQ+3

diff --git a/imagepicker/src/main/res/drawable-mdpi/ic_video.png b/imagepicker/src/main/res/drawable-mdpi/ic_video.png
deleted file mode 100644
index a83e91fe795b4c5d257862377c628d45c7b71463..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 270
zcmV+p0rCEcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002hNkl<Zc-muN
z7zLwX6ac}|qetBiA3nSdNFSgUK62#9zC(u&)va2!iW!@o|NsAIf^&e1Hv#b(T412Z
z^wBLpbLI>yP_7c$0lR4E0COyscY*Ary90pH!3MSb4BZ`o<nuFhcL18t>FWR>w!vaK
z{Tu+ylIwBE(Jchdj5=V%J7Cj*I^f{JgLXi=Z@?UYR1ozIm;;dNfxZEA02W8=8j$K3
z$q~DdTSS{_SQHzeH%LH^06MG&IRrd`0z0VOB-;<fO}Lt54Gj%UqmAKFFbY5b05GP;
UCOGLh5&!@I07*qoM6N<$f;*gRegFUf

diff --git a/imagepicker/src/main/res/drawable-xhdpi/ic_video.png b/imagepicker/src/main/res/drawable-xhdpi/ic_video.png
deleted file mode 100644
index e7c5c1956674f26f3fa69466cd3e9b8b67199264..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004yNkl<Zc-rln
zJx;?w5QS4A3Pb}Da0d#+K`1x~bd(enG)U>V0SRHNAX2Vm$v?6s-1<Jem0VcPI`Kvn
z*_rpGX}lh5=kxApe`YeFD2k#eilQh=y^5l^&hvZ*Tfx?cYUrndJy~nd{yX>-R>xxK
z^P*{*lh9a=F-IE@@xiy4g74T}NbqTzPT}*i(U4`?XN&;Q?}w1!-Kc@z(l-K@kpg%e
z6MT{+=XihK`so7Tg2$i#==kXY&>8l%Isk3Ln|u7^189f+V!%%}fL_AW1z<$*asdn^
zJRJbGBs}>5b|gI60NlF1x5!Zk;CBxnQ2=TJAOHd&00JNY0^mYOD}Yznms$XBGi0s3
zaJNNj0kj7pmjMuD9*6`$kb5NNro)JwAp1~s1O)lV;yV(fj*F2kIYH0W*Z>4wm!qDX
zpznITmlH$*7+oOInGRk6vq<*>_kkrcS8o5{E0VfFLl#+)l&PxfG_*(xBjMQFP?qH_
zKKc&(Ipi`q*f;Fi&1)7nQWQl|6h%=KwU7P)FExm+3WWUd00000NkvXXu0mjfZ&1dv

diff --git a/imagepicker/src/main/res/drawable-xxhdpi/ic_video.png b/imagepicker/src/main/res/drawable-xxhdpi/ic_video.png
deleted file mode 100644
index 273cdc310ba162d86edba64763d7ba6179e53893..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 708
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VCwdCaSW-r^>)r~uOkj34x(E&
zYz%PO_<{S%q41^kN*ZQO9sd&&SN3LThADMCU}j!@(Ba#`rk~5do-@)el)w4HM(LT%
zjw4EG=HGqN-Wko5lw<@N4F?*si4uO-v$oE)=sW-V>#yEFwb5+>-?a)aW|(|aVc*=U
z62I@jqMDi2o&23kmMnbtH!$gJ_NS#s&xfqOx?4znpY=SIXSvUI+|2Py<Gi8v(spCM
z^2fDd*&&nm>s+^%tC+OqU$D?W+bc5!TrbY(ed1lmyz^da*#COZOZ(eZ-g>b;<vg6X
zd~S`d2%{bAi$!W4wt*ZUR2}~1d#?L<>FQF&1MLiVKgIv*(c~!5b=dmHZ+<^RKU2`s
zv<ZQsiU(R7N>*AfS>xKk%~(09pTV7Jm$xrVg~)~VS6mv@8JoR)SuDgREWhR0pv+jg
zT9(B^C}C0!iv-sN=DdU=Tb4gT4N?WZQFcr`EJq6We7u~+&iL(7sC!exf5W4l3@i!^
zj2sROOacw)%zER*g);XA10J;W$ZS{9;?OAY3hG;Jrj{m<V4%5v+S*xO4h@YAU;QS`
zldp4iXw*-e>EY0@G+bCU{Pq5c4Gi7-&tEm}Y-(VN_rK0u%*x2Bcj1R;XBUIJ_moe4
zoE!x^JoNobTNsX?4r%vvXn5Ru%ggDSei}=~tyKvDKxO^2OTTCb3O=aZE%jGrkK%#@
zyt6N<W-Vi|eAu((`?s5(lX_<7MP6Ik*JjJOTV=00UvBQL<tiS1{%rF^TrbY4dBE)X
z|5e?UMSECh-wyLCH#5z7e?fHPm!5`iMOV%`m7Sl;KTrHOdzI6#Z7GGi-)mELKV^m|
d6d+^DWPkS?TVLm_wEYMY_H^}gS?83{1OTVACPV-L

diff --git a/imagepicker/src/main/res/layout/activity_camera.xml b/imagepicker/src/main/res/layout/activity_camera.xml
new file mode 100644
index 0000000..dddacee
--- /dev/null
+++ b/imagepicker/src/main/res/layout/activity_camera.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="net.yazeed44.imagepicker.ui.camera.CameraActivity">
+
+    <com.camerakit.CameraKitView
+        android:id="@+id/camera"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:adjustViewBounds="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+    </com.camerakit.CameraKitView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/imagepicker/src/main/res/values-en/strings.xml b/imagepicker/src/main/res/values-en/strings.xml
index 6b5171f..2e08559 100644
--- a/imagepicker/src/main/res/values-en/strings.xml
+++ b/imagepicker/src/main/res/values-en/strings.xml
@@ -37,5 +37,7 @@
     <string name="all_videos">All videos</string>
     <string name="take_video">Take video</string>
     <string name="add_description">Add description</string>
+    <string name="can_choose_d_video">You can only select %d video</string>
+    <string name="you_cant_check_more_media">You can not add media</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values-vi/strings.xml b/imagepicker/src/main/res/values-vi/strings.xml
index 51a16a6..f189754 100644
--- a/imagepicker/src/main/res/values-vi/strings.xml
+++ b/imagepicker/src/main/res/values-vi/strings.xml
@@ -50,5 +50,6 @@
     <string name="ucrop_scale">Thu phóng</string>
     <string name="ucrop_crop">Cắt</string>
     <string name="ask_perrmission">Ứng dụng cần các quyền sau để hoạt động bình thường:\n%s.\nĐồng ý cấp quyền cho Ứng dụng?</string>
+    <string name="can_choose_d_video">Chỉ được chọn %d video</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values/strings.xml b/imagepicker/src/main/res/values/strings.xml
index c65ff8e..e71da1f 100644
--- a/imagepicker/src/main/res/values/strings.xml
+++ b/imagepicker/src/main/res/values/strings.xml
@@ -40,5 +40,7 @@
     <string name="add_description">Thêm mô tả</string>
     <string name="ask_perrmission">Application needs following permissions to work normally: %s. Allow application to use those permissions?</string>
     <string name="you_picked_max_photo">Bạn đã chọn tối đa số ảnh cho phép</string>
+    <string name="can_choose_d_video">Chỉ được chọn %d video</string>
+    <string name="you_cant_check_more_media">Bạn không thể chọn thêm media</string>
 
 </resources>

From 4762ae1fcaf6a2591095e1938587a458e763e7de Mon Sep 17 00:00:00 2001
From: TrungNK <trungnk@omt.com.vn>
Date: Mon, 8 Feb 2021 13:58:35 +0700
Subject: [PATCH 12/16] =?UTF-8?q?fix=20ng=C3=B4n=20ng=E1=BB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/yazeed44/imagepicker/ui/PickerActivity.java    | 6 ++++--
 imagepicker/src/main/res/values-vi/strings.xml              | 4 ++--
 imagepicker/src/main/res/values/strings.xml                 | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
index 45956b8..bcd1430 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
@@ -427,7 +427,6 @@ public void capturePhoto() {
     }
 
 
-
     public static File createTemporaryFileForCapturing(final String extension) {
         final File captureTempFile = new File(CAPTURED_IMAGES_DIR
                 + "/IMG_"
@@ -538,7 +537,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
             startCamera();
         } else if (itemId == R.id.action_select_all) {
             selectAllImages();
-
         } else if (itemId == R.id.action_deselect_all) {
             deselectAllImages();
         }
@@ -655,6 +653,10 @@ private void handleMultipleModeAddition(final ImageEntry imageEntry) {
         if (mPickOptions.pickMode != Picker.PickMode.MULTIPLE_IMAGES) {
             return;
         }
+        File file = new File(imageEntry.path);
+        if (file.length() <= 0 || !file.canRead()) {
+            return;
+        }
 
         if (sCheckedImages.size() < mPickOptions.limit || mPickOptions.limit == NO_LIMIT) {
             if (imageEntry.isVideo) {
diff --git a/imagepicker/src/main/res/values-vi/strings.xml b/imagepicker/src/main/res/values-vi/strings.xml
index f189754..4532016 100644
--- a/imagepicker/src/main/res/values-vi/strings.xml
+++ b/imagepicker/src/main/res/values-vi/strings.xml
@@ -4,7 +4,7 @@
     <string name="album_thumbnail">Album Thumbnail</string>
     <string name="image_thumbnail">Image thumbnail</string>
     <string name="action_take_photo">Chụp ảnh</string>
-    <string name="all_photos">Tất cả ảnh</string>
+    <string name="all_photos">Tất cả</string>
     <string name="image_check">Chọn ảnh</string>
     <string name="albums_title">Album</string>
     <string name="you_cant_check_more_images">Không thể chọn thêm ảnh</string>
@@ -22,7 +22,7 @@
 
 
     <string name="picture">Ảnh</string>
-    <string name="all_image">Tất cả ảnh</string>
+    <string name="all_image">Tất cả</string>
     <string name="take_picture">Chụp ảnh</string>
     <string name="preview">Xem trước</string>
     <string name="preview_num">Xem trước (%1$d)</string>
diff --git a/imagepicker/src/main/res/values/strings.xml b/imagepicker/src/main/res/values/strings.xml
index e71da1f..4e9dbcc 100644
--- a/imagepicker/src/main/res/values/strings.xml
+++ b/imagepicker/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="album_thumbnail">Album Thumbnail</string>
     <string name="image_thumbnail">Image thumbnail</string>
     <string name="action_take_photo">Chụp ảnh</string>
-    <string name="all_photos">Tất cả ảnh</string>
+    <string name="all_photos">Tất cả</string>
     <string name="image_check">Chọn ảnh</string>
     <string name="albums_title">Album</string>
     <string name="you_cant_check_more_images">Không thể chọn thêm ảnh</string>
@@ -23,7 +23,7 @@
 
 
     <string name="picture">Ảnh</string>
-    <string name="all_image">Tất cả ảnh</string>
+    <string name="all_image">Tất cả</string>
     <string name="take_picture">Chụp ảnh</string>
     <string name="preview">Xem trước</string>
     <string name="preview_num">Xem trước (%1$d)</string>

From 5be38352d9ad81b0246b73c15ae5c66a76ad9231 Mon Sep 17 00:00:00 2001
From: TrungNK <trungnk@omt.com.vn>
Date: Tue, 9 Feb 2021 10:10:44 +0700
Subject: [PATCH 13/16] =?UTF-8?q?fix=20gi=E1=BB=9Bi=20h=E1=BA=A1n=20k?=
 =?UTF-8?q?=C3=ADch=20th=C6=B0=E1=BB=9Bc=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 imagepicker/build.gradle                      | 19 ++++++------
 .../imagepicker/ui/PickerActivity.java        | 29 +++++++++++++++----
 .../imagepicker/ui/SpacesItemDecoration.java  |  1 +
 .../net/yazeed44/imagepicker/util/Picker.java |  9 ++++++
 4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index 2076b6c..3970115 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -53,11 +53,12 @@ repositories {
 }
 
 dependencies {
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0-rc01'
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
     implementation('com.octo.android.robospice:robospice:1.4.14') {
         exclude group: 'org.apache.commons', module: 'commons-io'
     }
@@ -72,18 +73,18 @@ dependencies {
     //camera
     implementation 'com.camerakit:camerakit:1.0.0-beta3.11'
     implementation 'com.camerakit:jpegkit:0.1.0'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.30'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2-native-mt'
 
     //Rx Java
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.20'
     implementation 'com.squareup.retrofit2:adapter-rxjava:2.9.0'
     implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
     //Dagger
-    implementation 'com.google.dagger:dagger:2.29.1'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.29.1'
-    implementation 'net.sourceforge.streamsupport:streamsupport:1.7.2'
+    implementation 'com.google.dagger:dagger:2.31.2'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.31.2'
+    implementation 'net.sourceforge.streamsupport:streamsupport:1.7.3'
     implementation 'com.jaeger.statusbarutil:library:1.5.1'
     implementation 'com.github.florent37:runtime-permission:1.1.1'
     implementation 'com.github.trantuananh1996:sweetAlert:1.0.2'
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
index bcd1430..f6339b8 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
@@ -15,6 +15,7 @@
 import android.os.Environment;
 import android.os.StrictMode;
 import android.provider.MediaStore;
+import android.text.format.Formatter;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -559,17 +560,29 @@ private void selectAllImages() {
         }
         if (sCheckedImages.size() < mPickOptions.limit || mPickOptions.limit == NO_LIMIT) {
             for (final ImageEntry imageEntry : mSelectedAlbum.imageList) {
+
                 if (mPickOptions.limit != NO_LIMIT && sCheckedImages.size() + 1 > mPickOptions.limit) {
                     //Hit the limit
                     Toast.makeText(this, R.string.you_cant_check_more_media, Toast.LENGTH_SHORT).show();
                     break;
-                }
+                } else {
+                    File file = new File(imageEntry.path);
+                    if (file.length() <= 0 || !file.canRead()) {
+                        continue;
+                    }
 
-                if (!imageEntry.isPicked) {
-                    //To avoid repeated images
-                    sCheckedImages.add(imageEntry);
-                    imageEntry.isPicked = true;
+                    if (file.length() > mPickOptions.maxSizeFile && mPickOptions.maxSizeFile > 0) {
+                        continue;
+                    }
+
+                    if (!imageEntry.isPicked) {
+                        //To avoid repeated images
+                        sCheckedImages.add(imageEntry);
+                        imageEntry.isPicked = true;
+                    }
                 }
+
+
             }
         }
         EventBus.getDefault().post(new Events.OnUpdateImagesThumbnailEvent());
@@ -658,6 +671,12 @@ private void handleMultipleModeAddition(final ImageEntry imageEntry) {
             return;
         }
 
+
+        if (file.length() > mPickOptions.maxSizeFile && mPickOptions.maxSizeFile > 0) {
+            Toast.makeText(this, String.format(Locale.getDefault(), "File của bạn vượt quá %s", Formatter.formatFileSize(this, mPickOptions.maxSizeFile)), Toast.LENGTH_SHORT).show();
+            return;
+        }
+
         if (sCheckedImages.size() < mPickOptions.limit || mPickOptions.limit == NO_LIMIT) {
             if (imageEntry.isVideo) {
                 long totalVideos = StreamSupport.stream(sCheckedImages).filter(entry -> entry.isVideo).count();
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SpacesItemDecoration.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SpacesItemDecoration.java
index 6c698b7..f17a3d6 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SpacesItemDecoration.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/SpacesItemDecoration.java
@@ -3,6 +3,7 @@
 import android.graphics.Rect;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.View;
 
 /**
diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
index 22f166d..a63a26e 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/util/Picker.java
@@ -63,6 +63,7 @@ public class Picker {
     public final int videoThumbnailOverlayColor;
     public final int videoIconTintColor;
     public final boolean backBtnInMainActivity;
+    public long maxSizeFile;
 
     protected Picker(final Builder builder) {
         context = new WeakReference<>(builder.mContext);
@@ -91,6 +92,7 @@ protected Picker(final Builder builder) {
         backBtnInMainActivity = builder.mBackBtnInMainActivity;
         limitPhoto = builder.mLimitPhoto;
         limitVideo = builder.mLimitVideo;
+        maxSizeFile = builder.maxSizeFile;
     }
 
     public void startActivity() {
@@ -200,6 +202,7 @@ public static class Builder {
         @ColorInt
         private int mVideoIconTintColor;
         private boolean mBackBtnInMainActivity = true;
+        private long maxSizeFile = -1;
 
 
         private SinglePicker.SingleBuilder singleBuilder;
@@ -242,6 +245,7 @@ public Builder(Builder other) {
             this.multipleBuilder = other.multipleBuilder;
             this.mLimitPhoto = other.mLimitPhoto;
             this.mLimitVideo = other.mLimitVideo;
+            this.maxSizeFile = other.maxSizeFile;
         }
 
         public Builder(@NonNull final Context context, @NonNull final PickListener listener, @StyleRes final int themeResId) {
@@ -349,6 +353,11 @@ public SinglePicker.SingleBuilder singleImage() {
             return singleBuilder;
         }
 
+        public Builder setMaxSizeFile(long maxSizeFile) {
+            this.maxSizeFile = maxSizeFile;
+            return this;
+        }
+
         public MultiplePicker.MultipleBuilder multipleImage() {
             setPickMode(PickMode.MULTIPLE_IMAGES);
             if (multipleBuilder == null) multipleBuilder = new MultiplePicker.MultipleBuilder(this);

From bf0236bedcb70985cbb79e587b49d00cb31e308b Mon Sep 17 00:00:00 2001
From: TrungNK <trungnk@omt.com.vn>
Date: Tue, 9 Feb 2021 11:07:57 +0700
Subject: [PATCH 14/16] =?UTF-8?q?T=E1=BA=A1m=20=E1=BA=A9n=20t=C3=ADnh=20n?=
 =?UTF-8?q?=C4=83ng=20camera?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/yazeed44/imagepicker/ui/PickerActivity.java  | 8 ++++----
 imagepicker/src/main/res/values-en/strings.xml            | 1 +
 imagepicker/src/main/res/values/strings.xml               | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
index f6339b8..27db415 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/ui/PickerActivity.java
@@ -474,9 +474,9 @@ private void reloadAlbums() {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
-        if (mPickOptions.shouldShowCaptureMenuItem) {
-            initCaptureMenuItem(menu);
-        }
+//        if (mPickOptions.shouldShowCaptureMenuItem) {
+//            initCaptureMenuItem(menu);
+//        }
 
         getMenuInflater().inflate(R.menu.menu_select_all, menu);
         getMenuInflater().inflate(R.menu.menu_deselect_all, menu);
@@ -673,7 +673,7 @@ private void handleMultipleModeAddition(final ImageEntry imageEntry) {
 
 
         if (file.length() > mPickOptions.maxSizeFile && mPickOptions.maxSizeFile > 0) {
-            Toast.makeText(this, String.format(Locale.getDefault(), "File của bạn vượt quá %s", Formatter.formatFileSize(this, mPickOptions.maxSizeFile)), Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, String.format(Locale.getDefault(), getString(R.string.limt_size_file), Formatter.formatShortFileSize(this, mPickOptions.maxSizeFile)), Toast.LENGTH_SHORT).show();
             return;
         }
 
diff --git a/imagepicker/src/main/res/values-en/strings.xml b/imagepicker/src/main/res/values-en/strings.xml
index 2e08559..27e0bd0 100644
--- a/imagepicker/src/main/res/values-en/strings.xml
+++ b/imagepicker/src/main/res/values-en/strings.xml
@@ -39,5 +39,6 @@
     <string name="add_description">Add description</string>
     <string name="can_choose_d_video">You can only select %d video</string>
     <string name="you_cant_check_more_media">You can not add media</string>
+    <string name="limt_size_file">Your file is exceeded %s</string>
 
 </resources>
diff --git a/imagepicker/src/main/res/values/strings.xml b/imagepicker/src/main/res/values/strings.xml
index 4e9dbcc..7382b65 100644
--- a/imagepicker/src/main/res/values/strings.xml
+++ b/imagepicker/src/main/res/values/strings.xml
@@ -42,5 +42,6 @@
     <string name="you_picked_max_photo">Bạn đã chọn tối đa số ảnh cho phép</string>
     <string name="can_choose_d_video">Chỉ được chọn %d video</string>
     <string name="you_cant_check_more_media">Bạn không thể chọn thêm media</string>
+    <string name="limt_size_file">File của bạn vượt quá %s</string>
 
 </resources>

From ba1b011567eed8ff8a68e6bf14affc6158787cf9 Mon Sep 17 00:00:00 2001
From: TrungNK <trungnk@omt.com.vn>
Date: Fri, 26 Feb 2021 16:57:34 +0700
Subject: [PATCH 15/16] update build.gradle

---
 build.gradle                             | 6 +++---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 imagepicker/build.gradle                 | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8412f5d..37a82f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,10 +19,10 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
-        classpath 'com.google.gms:google-services:4.3.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.google.gms:google-services:4.3.5'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
 
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1574413..3ab5bc9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 02 10:38:14 ICT 2019
+#Wed Feb 17 15:10:53 ICT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index 3970115..99e08d6 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -93,7 +93,5 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui:2.3.3'
     implementation 'androidx.navigation:navigation-runtime:2.3.3'
 }
-
-
 //apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
 //apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
\ No newline at end of file

From f805f6455eb0de53367bbb174e6aa7c303d1a452 Mon Sep 17 00:00:00 2001
From: TrungNK <trungnk@omt.com.vn>
Date: Fri, 26 Feb 2021 17:50:10 +0700
Subject: [PATCH 16/16] set path ImageEntry

---
 .../java/net/yazeed44/imagepicker/data/model/ImageEntry.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
index d34034b..7a33c24 100644
--- a/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
+++ b/imagepicker/src/main/java/net/yazeed44/imagepicker/data/model/ImageEntry.java
@@ -34,7 +34,7 @@
  */
 public class ImageEntry implements Parcelable {
     public final int imageId;
-    public final String path;
+    public String path;
     public final long dateAdded;
     public boolean isPicked = false;
     public boolean isVideo = false;