Skip to content

use core wvware #425

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
andiwand merged 2 commits into from
Aug 6, 2025
Merged

use core wvware #425

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
9130d75
use core wvware
andiwand Aug 5, 2025
0fcd623
Merge branch 'main' into use-core-wvware
andiwand Aug 6, 2025
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
2 changes: 1 addition & 1 deletion app/conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ CMakeDeps
[options]
odrcore/*:shared=False
odrcore/*:with_pdf2htmlEX=True
odrcore/*:with_wvWare=False
odrcore/*:with_wvWare=True
1 change: 0 additions & 1 deletion app/src/main/java/at/tomtasche/reader/background/FileLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public abstract class FileLoader {

public enum LoaderType {
CORE,
WVWARE,
ONLINE,
RAW,
METADATA
Expand Down
15 changes: 1 addition & 14 deletions app/src/main/java/at/tomtasche/reader/background/LoaderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ public class LoaderService extends Service implements FileLoader.FileLoaderListe

private MetadataLoader metadataLoader;
private CoreLoader coreLoader;
private WvwareDocLoader wvwareDocLoader;
private RawLoader rawLoader;
private OnlineLoader onlineLoader;

Expand All @@ -62,9 +61,6 @@ public synchronized void onCreate() {
coreLoader = new CoreLoader(context, configManager, true, true);
coreLoader.initialize(this, mainHandler, backgroundHandler, analyticsManager, crashManager);

wvwareDocLoader = new WvwareDocLoader(context);
wvwareDocLoader.initialize(this, mainHandler, backgroundHandler, analyticsManager, crashManager);

rawLoader = new RawLoader(context);
rawLoader.initialize(this, mainHandler, backgroundHandler, analyticsManager, crashManager);

Expand Down Expand Up @@ -116,9 +112,6 @@ public synchronized void loadWithType(FileLoader.LoaderType loaderType, FileLoad
case CORE:
loader = coreLoader;
break;
case WVWARE:
loader = wvwareDocLoader;
break;
case ONLINE:
loader = onlineLoader;
break;
Expand Down Expand Up @@ -176,9 +169,7 @@ public void onError(FileLoader.Result result, Throwable error) {
if (result.loaderType == FileLoader.LoaderType.CORE) {
analyticsManager.report("load_odf_error", FirebaseAnalytics.Param.CONTENT_TYPE, options.fileType);

if (wvwareDocLoader.isSupported(options)) {
loadWithType(FileLoader.LoaderType.WVWARE, options);
} else if (rawLoader.isSupported(options)) {
if (rawLoader.isSupported(options)) {
loadWithType(FileLoader.LoaderType.RAW, options);
} else {
if (currentListener != null) {
Expand Down Expand Up @@ -268,10 +259,6 @@ public void onDestroy() {
coreLoader.close();
}

if (wvwareDocLoader != null) {
wvwareDocLoader.close();
}

if (rawLoader != null) {
rawLoader.close();
}
Expand Down
60 changes: 0 additions & 60 deletions app/src/main/java/at/tomtasche/reader/background/WvwareDocLoader.java
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions app/src/main/java/at/tomtasche/reader/ui/activity/DocumentFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ public void onLoadSuccess(FileLoader.Result result) {

if (result.loaderType == FileLoader.LoaderType.RAW || result.loaderType == FileLoader.LoaderType.ONLINE) {
offerReopen(activity, options, R.string.toast_hint_unsupported_file, false);
} else if (result.loaderType == FileLoader.LoaderType.CORE || result.loaderType == FileLoader.LoaderType.WVWARE) {
} else if (result.loaderType == FileLoader.LoaderType.CORE) {
offerUpload(activity, options, false);
}

Expand Down Expand Up @@ -476,8 +476,6 @@ public void onEncrypted(FileLoader.Result result) {

if (result.loaderType == FileLoader.LoaderType.CORE) {
loadWithType(FileLoader.LoaderType.CORE, options);
} else if (result.loaderType == FileLoader.LoaderType.WVWARE) {
loadWithType(FileLoader.LoaderType.WVWARE, options);
} else {
throw new RuntimeException("encryption not supported for type: " + result.loaderType);
}
Expand All @@ -504,8 +502,6 @@ public void onUnsupported(FileLoader.Result result) {
} else {
offerReopen(activity, options, R.string.toast_error_illegal_file_reopen, true);
}
} else if (result.loaderType == FileLoader.LoaderType.WVWARE) {
offerUpload(activity, options, true);
} else if (result.loaderType == FileLoader.LoaderType.ONLINE) {
offerReopen(activity, options, R.string.toast_error_illegal_file_reopen, true);
}
Expand Down
Loading