Fix build failures

Author: VishalNehra

app/src/main/java/com/artifex/mupdf/viewer/app/LibraryActivity.java

@@ -2,12 +2,8 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 
-import android.util.Log;
-
-import com.artifex.mupdf.fitz.Document; /* for file name recognition */
 import com.artifex.mupdf.viewer.DocumentActivity;
 
 public class LibraryActivity extends Activity

build.gradle

@@ -1,4 +1,4 @@
 plugins {
 	id 'com.android.application' version '7.3.1' apply false
 	id 'com.android.library' version '7.3.1' apply false
-}
+}/**/

gradle.properties

@@ -1,2 +1,3 @@
 android.useAndroidX=true
 #android.disableAutomaticComponentCreation=true
+#org.gradle.java.home=/Applications/Android Studio.app/Contents/jre/Contents/Home

jni

@@ -7,10 +7,7 @@ version = '1.21.0a'
 dependencies {
 	implementation 'androidx.appcompat:appcompat:1.3.1'
 	implementation 'com.google.android.material:material:1.6.1'
-    if (file('../jni/build.gradle').isFile())
-		api project(':jni')
-	else
-		api 'com.artifex.mupdf:fitz:1.21.0'
+	compile 'com.artifex.mupdf:fitz:1.21.0'
 }
 
 android {

lib/build.gradle

@@ -25,7 +25,10 @@
 				<data android:mimeType="application/x-fictionbook" />
 				<data android:mimeType="application/x-mobipocket-ebook" />
 				<!-- list application/octet-stream to catch the ones android doesn't recognize -->
-				<data android:mimeType="application/octet-stream" />
+				<data android:mimeType="application/octet-stream"
+					android:scheme="content" />
+				<data android:mimeType="application/octet-stream"
+					android:scheme="file" />
 			</intent-filter>
 		</activity>
 		<activity

lib/src/main/AndroidManifest.xml

@@ -1,20 +1,9 @@
 package com.artifex.mupdf.viewer;
 
-import com.artifex.mupdf.fitz.Cookie;
-import com.artifex.mupdf.fitz.Link;
-import com.artifex.mupdf.fitz.Quad;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import android.annotation.TargetApi;
-import android.app.AlertDialog;
-import android.content.ClipData;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Bitmap.Config;
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorMatrix;
@@ -27,24 +16,25 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Build;
-import android.os.FileUriExposedException;
 import android.os.Handler;
-import android.text.method.PasswordTransformationMethod;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.Toast;
-import android.os.AsyncTask;
+
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.widget.ImageViewCompat;
+
+import com.artifex.mupdf.fitz.Cookie;
+import com.artifex.mupdf.fitz.Link;
+import com.artifex.mupdf.fitz.Quad;
 
 // Make our ImageViews opaque to optimize redraw
-class OpaqueImageView extends ImageView {
+class OpaqueImageView extends AppCompatImageView {
 
 	public OpaqueImageView(Context context) {
 		super(context);
@@ -624,9 +614,6 @@ public int hitLink(Link link) {
 			intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); // API>=21: FLAG_ACTIVITY_NEW_DOCUMENT
 			try {
 				mContext.startActivity(intent);
-			} catch (FileUriExposedException x) {
-				Log.e(APP, x.toString());
-				Toast.makeText(getContext(), "Android does not allow following file:// link: " + link.getURI(), Toast.LENGTH_LONG).show();
 			} catch (Throwable x) {
 				Log.e(APP, x.toString());
 				Toast.makeText(getContext(), x.getMessage(), Toast.LENGTH_LONG).show();

lib/src/main/java/com/artifex/mupdf/viewer/PageView.java

@@ -28,6 +28,5 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "com.artifex.mupdf.viewer"
-include ':jni'
 include ':lib'
 include ':app'