use core wvware (#425)

Author: andiwand

app/conanfile.txt

@@ -8,4 +8,4 @@ CMakeDeps
 [options]
 odrcore/*:shared=False
 odrcore/*:with_pdf2htmlEX=True
-odrcore/*:with_wvWare=False
+odrcore/*:with_wvWare=True

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

@@ -19,7 +19,6 @@ public abstract class FileLoader {
 
     public enum LoaderType {
         CORE,
-        WVWARE,
         ONLINE,
         RAW,
         METADATA

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

@@ -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;
 
@@ -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);
 
@@ -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;
@@ -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) {
@@ -268,10 +259,6 @@ public void onDestroy() {
             coreLoader.close();
         }
 
-        if (wvwareDocLoader != null) {
-            wvwareDocLoader.close();
-        }
-
         if (rawLoader != null) {
             rawLoader.close();
         }

app/src/main/java/at/tomtasche/reader/background/WvwareDocLoader.java

@@ -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);
         }
 
@@ -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);
                     }
@@ -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);
         }