Skip to content

PAINTROID-781: Fix crash on image import/export in PocketCode #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ayush-Patel-56 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

PAINTROID-781: Fix crash on image import/export in PocketCode #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 31 additions & 14 deletions Paintroid/src/main/java/org/catrobat/paintroid/FileIO.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,26 +349,43 @@ object FileIO {
}

fun parseFileName(uri: Uri, resolver: ContentResolver) {
var fileName = "image"
val cursor = resolver.query(
uri,
arrayOf(MediaStore.Images.ImageColumns.DISPLAY_NAME),
null, null, null
)
cursor?.use {
if (cursor.moveToFirst()) {
fileName =
cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.ImageColumns.DISPLAY_NAME))
var fileName: String? = null
if (uri.scheme == ContentResolver.SCHEME_CONTENT) {
try {
val cursor = resolver.query(
uri,
arrayOf(MediaStore.Images.ImageColumns.DISPLAY_NAME),
null, null, null
)
cursor?.use {
if (cursor.moveToFirst()) {
val columnIndex =
cursor.getColumnIndex(MediaStore.Images.ImageColumns.DISPLAY_NAME)
if (columnIndex != -1) {
fileName = cursor.getString(columnIndex)
}
}
}
} catch (e: Exception) {
Log.e("FileIO", "Failed to query filename from URI", e)
}
}
if (fileName.endsWith(FileType.JPG.toExtension()) || fileName.endsWith(".jpeg")) {
if (fileName == null) {
fileName = uri.lastPathSegment
}
if (fileName == null) {
fileName = "image"
}
if (fileName!!.endsWith(FileType.JPG.toExtension()) || fileName!!.endsWith(".jpeg")) {
fileType = FileType.JPG
compressFormat = CompressFormat.JPEG
filename = fileName.substring(0, fileName.length - fileType.toExtension().length)
} else if (fileName.endsWith(".png")) {
filename = fileName!!.substring(0, fileName!!.length - fileType.toExtension().length)
} else if (fileName!!.endsWith(".png")) {
fileType = FileType.PNG
compressFormat = CompressFormat.PNG
filename = fileName.substring(0, fileName.length - fileType.toExtension().length)
filename = fileName!!.substring(0, fileName!!.length - fileType.toExtension().length)
} else {
filename = fileName!!
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-XX:MaxPermSize=1024m -Xmx4096m
org.gradle.jvmargs=-Xmx4096m
android.disableAutomaticComponentCreation=true