Skip to content

Commit

Permalink
#6: More debug-log to find rotation problem
Browse files Browse the repository at this point in the history
  • Loading branch information
@k3b
k3b committed May 14, 2019
1 parent 3883d1c commit aeba600
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 15 deletions.
53 changes: 38 additions & 15 deletions app/src/main/java/de/k3b/android/lossless_jpg_crop/CropAreasChooseActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import android.os.Bundle;
import androidx.core.app.ActivityCompat;
import androidx.core.content.FileProvider;

import android.provider.DocumentsContract;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -27,6 +29,8 @@
import java.nio.charset.StandardCharsets;

public class CropAreasChooseActivity extends BaseActivity {
private static int lastInstanceNo = 0;
private int instanceNo = 0;
private static final String TAG = "llCrop";
private static final int REQUEST_GET_PICTURE = 1;
protected static final int REQUEST_GET_PICTURE_PERMISSION = 101;
Expand All @@ -41,6 +45,7 @@ public class CropAreasChooseActivity extends BaseActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
instanceNo = ++lastInstanceNo;
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);

Expand All @@ -49,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
Uri uri = getIntent().getData();

if (uri == null) {
Log.d(TAG, "Intent.data has not initial image uri. Opening Image Picker");
Log.d(TAG, getInstanceNo() + "Intent.data has not initial image uri. Opening Image Picker");
// must be called with image uri
pickFromGallery();
} else {
Expand All @@ -64,25 +69,34 @@ protected void onCreate(Bundle savedInstanceState) {
*/
uCropView.setImageUriAsync(uri);

Rect crop = (Rect) ((savedInstanceState == null)
final boolean noPreviousInstanceState = savedInstanceState == null;
Rect crop = (Rect) (noPreviousInstanceState
? null
: savedInstanceState.getParcelable(CURRENT_CROP_AREA));

Log.d(TAG, getInstanceNo() + "onCreate(savedInstanceState:" + !noPreviousInstanceState +
"): crop=" + crop);

uCropView.setCropRect(crop);
} catch (Exception e) {
final String msg = "setImageUri '" + uri + "' ";
final String msg = getInstanceNo() + "setImageUri '" + uri + "' ";
Log.e(TAG, msg, e);
Toast.makeText(this, msg + e.getMessage(), Toast.LENGTH_LONG).show();
}
}

}

private String getInstanceNo() {
return "#" + instanceNo + ":";
}

@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

Rect crop = getCropRect();
Log.d(TAG, getInstanceNo() + "onSaveInstanceState : crop=" + crop);
outState.putParcelable(CURRENT_CROP_AREA, crop);
}

Expand Down Expand Up @@ -160,9 +174,11 @@ private void pickFromGallery() {
getString(R.string.permission_read_storage_rationale),
REQUEST_GET_PICTURE_PERMISSION);
} else {
Log.d(TAG, "Opening Image Picker");
Log.d(TAG, getInstanceNo() + "Opening Image Picker");
Intent intent = new Intent(Intent.ACTION_GET_CONTENT)
.setType(IMAGE_JPEG_MIME)
.putExtra(Intent.EXTRA_TITLE, getString(R.string.label_select_picture))
.putExtra(DocumentsContract.EXTRA_PROMPT, getString(R.string.label_select_picture))
.addCategory(Intent.CATEGORY_OPENABLE)
;

Expand All @@ -173,7 +189,7 @@ private void onGetPictureResult(int resultCode, Intent data) {
if (resultCode == RESULT_OK) {
final Uri selectedUri = (data == null) ? null : data.getData();
if (selectedUri != null) {
Log.d(TAG, "Restarting with uri '" + selectedUri + "'");
Log.d(TAG, getInstanceNo() + "Restarting with uri '" + selectedUri + "'");

Intent intent = new Intent(Intent.ACTION_VIEW, selectedUri, this, CropAreasChooseActivity.class);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
Expand All @@ -183,7 +199,7 @@ private void onGetPictureResult(int resultCode, Intent data) {
return;
}
}
Log.d(TAG, this.getString(R.string.toast_cannot_retrieve_selected_image));
Log.d(TAG,getInstanceNo() + this.getString(R.string.toast_cannot_retrieve_selected_image));
Toast.makeText(this, R.string.toast_cannot_retrieve_selected_image, Toast.LENGTH_SHORT).show();
finish();
return;
Expand All @@ -205,17 +221,21 @@ private boolean openPublicOutputUriPicker(int folderpickerCode) {
Uri inUri = getIntent().getData();
String originalFileName = (inUri == null) ? "" : inUri.getLastPathSegment();
String proposedFileName = replaceExtension(originalFileName, "_llcrop.jpg");
// String proposedOutPath = inUri.getP new Uri() replaceExtension(originalFileName, "_llcrop.jpg");


// DocumentsContract#EXTRA_INITIAL_URI
Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT)
.setType(IMAGE_JPEG_MIME)
.addCategory(Intent.CATEGORY_OPENABLE)
.putExtra(Intent.EXTRA_TITLE, proposedFileName)
.putExtra(DocumentsContract.EXTRA_PROMPT, getString(R.string.label_save_as))
.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION
| Intent.FLAG_GRANT_WRITE_URI_PERMISSION
| Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
;

Log.d(TAG, "openPublicOutputUriPicker '" + proposedFileName + "'");
Log.d(TAG, getInstanceNo() + "openPublicOutputUriPicker '" + proposedFileName + "'");

startActivityForResult(intent, folderpickerCode);
return true;
Expand All @@ -230,7 +250,7 @@ private void onOpenPublicOutputUriPickerResult(int resultCode, Uri outUri) {
InputStream inStream = null;
OutputStream outStream = null;

final String context_message = "Cropping '" + inUri + "'(" + rect + ") => '"
final String context_message = getInstanceNo() + "Cropping '" + inUri + "'(" + rect + ") => '"
+ outUri + "' ('" + toString(outUri) + "')";
Log.i(TAG, context_message);

Expand All @@ -253,7 +273,7 @@ private void onOpenPublicOutputUriPickerResult(int resultCode, Uri outUri) {
}
} else {
// uri==null or error
Log.i(TAG, "onOpenPublicOutputUriPickerResult(null): No output url, not saved.");
Log.i(TAG, getInstanceNo() + "onOpenPublicOutputUriPickerResult(null): No output url, not saved.");
}
}

Expand All @@ -264,17 +284,17 @@ private String toString(Uri outUri) {
return URLDecoder.decode(outUri.toString(), StandardCharsets.UTF_8.toString());
} catch (Exception e) {
//!!! UnsupportedEncodingException, IllegalCharsetNameException
Log.e(TAG, "err cannot convert uri to string('" + outUri.toString() + "').", e);
Log.e(TAG, getInstanceNo() + "err cannot convert uri to string('" + outUri.toString() + "').", e);
return outUri.toString();
}
}

private static void close(Closeable stream, Object source) {
private void close(Closeable stream, Object source) {
if (stream != null) {
try {
stream.close();
} catch (IOException e) {
Log.w(TAG, "Error closing " + source, e);
Log.w(TAG, getInstanceNo() + "Error closing " + source, e);
}
}
}
Expand All @@ -287,7 +307,10 @@ private static String replaceExtension(String path, String extension) {
}

private Rect getCropRect() {
if (uCropView == null) return null;
if (uCropView == null) {
Log.e(TAG, getInstanceNo() + "ups: no cropView");
return null;
}
return uCropView.getCropRect();
}

Expand Down Expand Up @@ -335,7 +358,7 @@ private Uri __delete_saveAsPrivate() {
InputStream inStream = null;
OutputStream outStream = null;

final String context_message = "Cropping '" + inUri + "'(" + rect + ")";
final String context_message = getInstanceNo() + "Cropping '" + inUri + "'(" + rect + ")";
Log.d(TAG, context_message);

try {
Expand Down Expand Up @@ -370,7 +393,7 @@ private Uri createPrivateOutUriOrNull() {
return sharedFileUri;

} catch (Exception e) {
Log.e(TAG, e.getMessage(), e);
Log.e(TAG, getInstanceNo() + e.getMessage(), e);
return null;
}

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<string name="app_name">llCrop (Verlustfrei schneiden)</string>

<string name="label_select_picture">Wähle Photo</string>
<string name="label_save_as">Speichern als</string>

<string name="permission_title_rationale">Berechtigung erforderlich</string>
<string name="permission_read_storage_rationale">Benötige Datei-Leserechte um ein Photo zu laden.</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<string name="app_name">llCrop (Loss Less)</string>

<string name="label_select_picture">Select Picture</string>
<string name="label_save_as">Save as</string>

<string name="permission_title_rationale">Permission needed</string>
<string name="permission_read_storage_rationale">Storage read permission is needed to pick files.</string>
Expand Down

0 comments on commit aeba600

Please sign in to comment.