Skip to content

address #348 #377

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

Merged
TomTasche merged 2 commits into from
Oct 30, 2024
Merged

address #348 #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ed7339
address #348
TomTasche Oct 30, 2024
7dc06e7
raise version
TomTasche Oct 30, 2024
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
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="auto"
android:versionCode="185"
android:versionName="3.31"
android:versionCode="186"
android:versionName="3.32"
tools:ignore="GoogleAppIndexingWarning">

<uses-permission android:name="android.permission.INTERNET" />
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/java/at/tomtasche/reader/background/CoreWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,20 +107,20 @@ public static class CoreResult {
public String extension;
}

public class CoreCouldNotOpenException extends RuntimeException {}
public static class CoreCouldNotOpenException extends RuntimeException {}

public class CoreEncryptedException extends RuntimeException {}
public static class CoreEncryptedException extends RuntimeException {}

public class CoreCouldNotTranslateException extends RuntimeException {}
public static class CoreCouldNotTranslateException extends RuntimeException {}

public class CoreUnexpectedFormatException extends RuntimeException {}
public static class CoreUnexpectedFormatException extends RuntimeException {}

public class CoreUnexpectedErrorCodeException extends RuntimeException {}
public static class CoreUnexpectedErrorCodeException extends RuntimeException {}

public class CoreUnknownErrorException extends RuntimeException {}
public static class CoreUnknownErrorException extends RuntimeException {}

public class CoreCouldNotEditException extends RuntimeException {}
public static class CoreCouldNotEditException extends RuntimeException {}

public class CoreCouldNotSaveException extends RuntimeException {}
public static class CoreCouldNotSaveException extends RuntimeException {}

}
8 changes: 6 additions & 2 deletions app/src/main/java/at/tomtasche/reader/background/OdfLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,12 @@ private void translate(Options options, Result result) throws Exception {
CoreWrapper.CoreResult coreResult = lastCore.parse(coreOptions);

String coreExtension = coreResult.extension;
// "unnamed" refers to default of Meta::typeToString
if (coreExtension != null && !coreExtension.equals("unnamed")) {
if (coreResult.exception == null && "pdf".equals(coreExtension)) {
// some PDFs do not cause an error in the core
// https://github.com/opendocument-app/OpenDocument.droid/issues/348#issuecomment-2446888981
throw new CoreWrapper.CoreCouldNotTranslateException();
} else if (!"unnamed".equals(coreExtension)) {
// "unnamed" refers to default of Meta::typeToString
options.fileExtension = coreExtension;

String fileType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(coreExtension);
Expand Down