Skip to content

Commit 972f8dd

Browse files
andiwandandiwand
committed
nuke android pdf2htmlex
1 parent 83c09e5 commit 972f8dd

File tree

6 files changed

+22
-142
lines changed

6 files changed

+22
-142
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tasks.register('conanProfile', Copy) {
2323
deployer.set('conandeployer.py')
2424
deployerFolder.set(outputDirectory.get().asFile.toString() + "/assets/core")
2525
dependsOn(tasks.named('conanProfile'))
26-
conanExecutable.set('/Users/andreas/odr/venv/bin/conan')
26+
conanExecutable.set('conan')
2727
}
2828
}
2929

@@ -148,7 +148,6 @@ dependencies {
148148
implementation 'com.google.android.material:material:1.12.0'
149149
implementation 'androidx.webkit:webkit:1.11.0'
150150

151-
implementation 'app.opendocument:pdf2htmlex-android:0.18.26'
152151
implementation 'app.opendocument:wvware-android:1.2.11'
153152
implementation 'com.github.huzongyao:AndroidMagic:v1.1.2'
154153
implementation 'com.viliussutkus89:assetextractor-android:1.3.3'

‎app/src/main/java/at/tomtasche/reader/background/CoreWrapper.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ public static class GlobalParams {
2525
public static native void setGlobalParams(GlobalParams params);
2626

2727
public static void initialize(Context context) {
28-
File assetsDirectory = new File(context.getFilesDir(), "assets/core");
28+
File assetsDirectory = new File(context.getFilesDir(), "assets");
2929
File odrCoreDataDirectory = new File(assetsDirectory, "odrcore");
3030
File fontconfigDataDirectory = new File(assetsDirectory, "fontconfig");
3131
File popplerDataDirectory = new File(assetsDirectory, "poppler");
3232
File pdf2htmlexDataDirectory = new File(assetsDirectory, "pdf2htmlex");
3333

3434
AssetExtractor ae = new AssetExtractor(context.getAssets());
3535
ae.setOverwrite();
36-
ae.extract(assetsDirectory, "core/odrcore");
37-
ae.extract(assetsDirectory, "core/fontconfig");
38-
ae.extract(assetsDirectory, "core/poppler");
39-
ae.extract(assetsDirectory, "core/pdf2htmlex");
36+
ae.extract(assetsDirectory, "odrcore");
37+
ae.extract(assetsDirectory, "fontconfig");
38+
ae.extract(assetsDirectory, "poppler");
39+
ae.extract(assetsDirectory, "pdf2htmlex");
4040

4141
CoreWrapper.GlobalParams globalParams = new CoreWrapper.GlobalParams();
4242
globalParams.coreDataPath = odrCoreDataDirectory.getAbsolutePath();

‎app/src/main/java/at/tomtasche/reader/background/FileLoader.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public abstract class FileLoader {
2020
public enum LoaderType {
2121
CORE,
2222
WVWARE,
23-
PDF2HTMLEX,
2423
ONLINE,
2524
RAW,
2625
METADATA

‎app/src/main/java/at/tomtasche/reader/background/LoaderService.java‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class LoaderService extends Service implements FileLoader.FileLoaderListe
3535

3636
private MetadataLoader metadataLoader;
3737
private CoreLoader coreLoader;
38-
private Pdf2htmlExLoader pdf2htmlExLoader;
3938
private WvwareDocLoader wvwareDocLoader;
4039
private RawLoader rawLoader;
4140
private OnlineLoader onlineLoader;
@@ -63,9 +62,6 @@ public synchronized void onCreate() {
6362
coreLoader = new CoreLoader(context, configManager, true, true);
6463
coreLoader.initialize(this, mainHandler, backgroundHandler, analyticsManager, crashManager);
6564

66-
pdf2htmlExLoader = new Pdf2htmlExLoader(context);
67-
pdf2htmlExLoader.initialize(this, mainHandler, backgroundHandler, analyticsManager, crashManager);
68-
6965
wvwareDocLoader = new WvwareDocLoader(context);
7066
wvwareDocLoader.initialize(this, mainHandler, backgroundHandler, analyticsManager, crashManager);
7167

@@ -123,9 +119,6 @@ public synchronized void loadWithType(FileLoader.LoaderType loaderType, FileLoad
123119
case WVWARE:
124120
loader = wvwareDocLoader;
125121
break;
126-
case PDF2HTMLEX:
127-
loader = pdf2htmlExLoader;
128-
break;
129122
case ONLINE:
130123
loader = onlineLoader;
131124
break;
@@ -183,9 +176,7 @@ public void onError(FileLoader.Result result, Throwable error) {
183176
if (result.loaderType == FileLoader.LoaderType.CORE) {
184177
analyticsManager.report("load_odf_error", FirebaseAnalytics.Param.CONTENT_TYPE, options.fileType);
185178

186-
if (pdf2htmlExLoader.isSupported(options)) {
187-
loadWithType(FileLoader.LoaderType.PDF2HTMLEX, options);
188-
} else if (wvwareDocLoader.isSupported(options)) {
179+
if (wvwareDocLoader.isSupported(options)) {
189180
loadWithType(FileLoader.LoaderType.WVWARE, options);
190181
} else if (rawLoader.isSupported(options)) {
191182
loadWithType(FileLoader.LoaderType.RAW, options);
@@ -277,10 +268,6 @@ public void onDestroy() {
277268
coreLoader.close();
278269
}
279270

280-
if (pdf2htmlExLoader != null) {
281-
pdf2htmlExLoader.close();
282-
}
283-
284271
if (wvwareDocLoader != null) {
285272
wvwareDocLoader.close();
286273
}

‎app/src/main/java/at/tomtasche/reader/background/Pdf2htmlExLoader.java‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎app/src/main/java/at/tomtasche/reader/ui/activity/DocumentFragment.java‎

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater)
166166

167167
// the other menu items are dynamically enabled based on the loaded document
168168
if (lastResult != null) {
169-
prepareMenu(lastResult.loaderType);
169+
// TODO
170+
toggleDocumentMenu(true, true);
170171
}
171172
}
172173

@@ -361,25 +362,6 @@ private boolean isActivityReadyForResult(FileLoader.Result result) {
361362
return true;
362363
}
363364

364-
private void prepareMenu(FileLoader.LoaderType loaderType) {
365-
boolean isEditEnabled = false;
366-
boolean isDarkModeSupported = true;
367-
368-
switch (loaderType) {
369-
case CORE:
370-
isEditEnabled = true;
371-
break;
372-
case PDF2HTMLEX:
373-
isDarkModeSupported = false;
374-
break;
375-
default:
376-
break;
377-
}
378-
379-
toggleDocumentMenu(true, isEditEnabled);
380-
pageView.toggleDarkMode(isDarkModeSupported);
381-
}
382-
383365
@Override
384366
public void onLoadSuccess(FileLoader.Result result) {
385367
if (!isActivityReadyForResult(result)) {
@@ -420,7 +402,7 @@ public void onLoadSuccess(FileLoader.Result result) {
420402

421403
if (result.loaderType == FileLoader.LoaderType.RAW || result.loaderType == FileLoader.LoaderType.ONLINE) {
422404
offerReopen(activity, options, R.string.toast_hint_unsupported_file, false);
423-
} else if (result.loaderType == FileLoader.LoaderType.CORE || result.loaderType == FileLoader.LoaderType.WVWARE || result.loaderType == FileLoader.LoaderType.PDF2HTMLEX) {
405+
} else if (result.loaderType == FileLoader.LoaderType.CORE || result.loaderType == FileLoader.LoaderType.WVWARE) {
424406
offerUpload(activity, options, false);
425407
}
426408

@@ -486,25 +468,18 @@ public void onEncrypted(FileLoader.Result result) {
486468
builder.setView(input);
487469

488470
builder.setPositiveButton(getString(android.R.string.ok),
489-
new DialogInterface.OnClickListener() {
471+
(dialog, whichButton) -> {
472+
options.password = input.getText().toString();
490473

491-
@Override
492-
public void onClick(DialogInterface dialog,
493-
int whichButton) {
494-
options.password = input.getText().toString();
495-
496-
// close dialog before progress is shown again
497-
dialog.dismiss();
498-
499-
if (result.loaderType == FileLoader.LoaderType.CORE) {
500-
loadWithType(FileLoader.LoaderType.CORE, options);
501-
} else if (result.loaderType == FileLoader.LoaderType.WVWARE) {
502-
loadWithType(FileLoader.LoaderType.WVWARE, options);
503-
} else if (result.loaderType == FileLoader.LoaderType.PDF2HTMLEX) {
504-
loadWithType(FileLoader.LoaderType.PDF2HTMLEX, options);
505-
} else {
506-
throw new RuntimeException("encryption not supported for type: " + result.loaderType);
507-
}
474+
// close dialog before progress is shown again
475+
dialog.dismiss();
476+
477+
if (result.loaderType == FileLoader.LoaderType.CORE) {
478+
loadWithType(FileLoader.LoaderType.CORE, options);
479+
} else if (result.loaderType == FileLoader.LoaderType.WVWARE) {
480+
loadWithType(FileLoader.LoaderType.WVWARE, options);
481+
} else {
482+
throw new RuntimeException("encryption not supported for type: " + result.loaderType);
508483
}
509484
});
510485
builder.setNegativeButton(getString(android.R.string.cancel), null);
@@ -529,7 +504,7 @@ public void onUnsupported(FileLoader.Result result) {
529504
} else {
530505
offerReopen(activity, options, R.string.toast_error_illegal_file_reopen, true);
531506
}
532-
} else if (result.loaderType == FileLoader.LoaderType.PDF2HTMLEX || result.loaderType == FileLoader.LoaderType.WVWARE) {
507+
} else if (result.loaderType == FileLoader.LoaderType.WVWARE) {
533508
offerUpload(activity, options, true);
534509
} else if (result.loaderType == FileLoader.LoaderType.ONLINE) {
535510
offerReopen(activity, options, R.string.toast_error_illegal_file_reopen, true);

0 commit comments

Comments
 (0)