From 6b9f3cfe09f40190cb60571ab52d27d558d73ffb Mon Sep 17 00:00:00 2001
From: brodeurlv <brodeur.levrai@gmail.com>
Date: Sun, 2 May 2021 20:54:46 +0200
Subject: [PATCH] Fixed camera crash

---
 app/src/main/AndroidManifest.xml                       | 4 ++--
 app/src/main/java/com/easyfitness/ProfileFragment.java | 1 +
 app/src/main/java/com/easyfitness/utils/ImageUtil.java | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d2c55603..adb762aa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,9 +4,9 @@
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACTION_HEADSET_PLUG" />
-    <uses-permission android:name="android.permission.CAMERA" />
+    <!--<uses-permission android:name="android.permission.CAMERA" />-->
 
     <uses-feature
         android:name="android.hardware.camera"
diff --git a/app/src/main/java/com/easyfitness/ProfileFragment.java b/app/src/main/java/com/easyfitness/ProfileFragment.java
index 54197cc1..312987d4 100644
--- a/app/src/main/java/com/easyfitness/ProfileFragment.java
+++ b/app/src/main/java/com/easyfitness/ProfileFragment.java
@@ -332,6 +332,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 if (resultCode == Activity.RESULT_OK) {
                     profileViMo.setPhoto(imgUtil.getFilePath());
                     requestForSave();
+                    mCurrentPhotoPath = imgUtil.getFilePath();
                     ImageUtil.setPic(roundProfile, mCurrentPhotoPath);
                     ImageUtil.saveThumb(mCurrentPhotoPath);
                     imgUtil.galleryAddPic(this, mCurrentPhotoPath);
diff --git a/app/src/main/java/com/easyfitness/utils/ImageUtil.java b/app/src/main/java/com/easyfitness/utils/ImageUtil.java
index db2ad69f..0ed2147f 100644
--- a/app/src/main/java/com/easyfitness/utils/ImageUtil.java
+++ b/app/src/main/java/com/easyfitness/utils/ImageUtil.java
@@ -229,9 +229,9 @@ public boolean CreatePhotoSourceDialog(Fragment pF) {
                 // Camera
                 case 0:
                     dispatchTakePictureIntent(pF);
-                    /* CropImage.activity()
+                    /*CropImage.activity()
                             .setGuidelines(CropImageView.Guidelines.ON)
-                            .start(pF.getContext(), pF); */
+                            .start(pF.getContext(), pF);*/
                     break;
                 case 2: // Delete picture
                     if (mDeleteImageListener != null)