Fix/update unavailable dependency PhotoView

plugin.xml

@@ -19,8 +19,9 @@
 
 		<config-file parent="/manifest" target="AndroidManifest.xml">
 			<uses-permission android:name="android.permission.INTERNET" />
-			<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    		<uses-permission  android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 			<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+      <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" android:minSdkVersion="33" />
 		</config-file>
 
 		<source-file src="src/android/PhotoViewer.java" target-dir="src/com/sarriaroman/PhotoViewer" />

src/android/PhotoViewer.java

@@ -3,6 +3,7 @@
 import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.os.Build;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
@@ -22,6 +23,7 @@ public class PhotoViewer extends CordovaPlugin {
 
     public static final String WRITE = Manifest.permission.WRITE_EXTERNAL_STORAGE;
     public static final String READ = Manifest.permission.READ_EXTERNAL_STORAGE;
+    public static final String READ_IMAGES = Manifest.permission.READ_MEDIA_IMAGES;
 
     public static final int REQ_CODE = 0;
 
@@ -33,19 +35,30 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
         if (action.equals("show")) {
             this.args = args;
             this.callbackContext = callbackContext;
-
-            if (cordova.hasPermission(READ) && cordova.hasPermission(WRITE)) {
-                this.launchActivity();
+            if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                if (cordova.hasPermission(READ_IMAGES)) {
+                    this.launchActivity();
+                } else {
+                    this.getPermission();
+                }
             } else {
-                this.getPermission();
+                if (cordova.hasPermission(READ) && cordova.hasPermission(WRITE)) {
+                    this.launchActivity();
+                } else {
+                    this.getPermission();
+                }
             }
             return true;
         }
         return false;
     }
 
     protected void getPermission() {
-        cordova.requestPermissions(this, REQ_CODE, new String[]{WRITE, READ});
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            cordova.requestPermissions(this, REQ_CODE, new String[]{READ_IMAGES});
+        } else {
+            cordova.requestPermissions(this, REQ_CODE, new String[]{WRITE, READ});
+        }
     }
 
     //

src/android/photoviewer.gradle

@@ -1,9 +1,10 @@
 repositories{
   jcenter()
+  maven { url "https://www.jitpack.io" }
 }
 
 dependencies {
-   implementation 'com.commit451:PhotoView:1.2.4'
+   implementation 'com.github.chrisbanes:PhotoView:v1.2.4'
    implementation 'com.squareup.picasso:picasso:2.71828'
 }
 

src/ios/PhotoViewer.m

@@ -83,7 +83,7 @@ - (void)show:(CDVInvokedUrlCommand*)command
         showCloseBtn = [[command.arguments objectAtIndex:3] boolValue];
         copyToReference = [[command.arguments objectAtIndex:4] boolValue];
         headers = [self headers:[command.arguments objectAtIndex:5]];
-        
+
         if ([url rangeOfString:@"http"].location == 0) {
             copyToReference = true;
         }
@@ -140,9 +140,8 @@ - (void)show:(CDVInvokedUrlCommand*)command
 
 - (NSURL *)localFileURLForImage:(NSString *)image
 {
-    Boolean isFirebase = [image rangeOfString:@"firebase"].length > 0;
     NSString* webStringURL = image;
-    if (!isFirebase) {
+    if (![self isUrlAlreadyEncoded:webStringURL]) {
       webStringURL = [image stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]];
     }
     NSURL* fileURL = [NSURL URLWithString:webStringURL];
@@ -157,7 +156,6 @@ - (NSURL *)localFileURLForImage:(NSString *)image
         }
         if (error)
             return nil;
-
         if( data ) {
             // save this image to a temp folder
             NSURL *tmpDirURL = [NSURL fileURLWithPath:NSTemporaryDirectory() isDirectory:YES];
@@ -247,20 +245,20 @@ - (void)showFullScreen:(NSURL *)url andTitle:(NSString *)title {
         [closeBtn setBackgroundColor:[UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.6]];
         [closeBtn addTarget:self action:@selector(closeButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
         [self.viewController.view addSubview:closeBtn];
-        
+
         imageLabel = [[UILabel alloc] initWithFrame:CGRectMake(60, viewHeight - 50, viewWidth - 120, 50)];
         imageLabel.numberOfLines = 0;
         imageLabel.lineBreakMode = NSLineBreakByWordWrapping;
         imageLabel.minimumScaleFactor = 0.5;
         imageLabel.adjustsFontSizeToFitWidth = YES;
-        
+
         [imageLabel setTextAlignment:NSTextAlignmentCenter];
         [imageLabel setTextColor:[UIColor whiteColor]];
         [imageLabel setBackgroundColor:[UIColor clearColor]];
         [imageLabel setFont:[UIFont fontWithName: @"San Fransisco" size: 14.0f]];
         [imageLabel setText:title];
         [self.viewController.view addSubview:imageLabel];
-        
+
     } else {
         UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(fullimagetapped:)];
         singleTap.numberOfTapsRequired = 1;
@@ -277,7 +275,7 @@ - (void)fullimagetapped:(UIGestureRecognizer *)gestureRecognizer {
 - (void)closeButtonPressed:(UIButton *)button {
     [closeBtn removeFromSuperview];
     [imageLabel removeFromSuperview];
-    
+
     closeBtn = nil;
     imageLabel = nil;
     [self closeImage];
@@ -340,7 +338,6 @@ - (NSDictionary *)headers:(NSString *)headerString {
     if (headerString == nil || [headerString length] == 0) {
         return nil;
     }
-
     NSData *jsonData = [headerString dataUsingEncoding:NSUTF8StringEncoding];
     //    Note that JSONObjectWithData will return either an NSDictionary or an NSArray, depending whether your JSON string represents an a dictionary or an array.
     NSDictionary *jsonDictionary = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:nil];
@@ -351,17 +348,24 @@ - (NSDictionary *)headers:(NSString *)headerString {
 - (NSData *)imageDataFromURLWithHeaders:(NSString *)urlString {
     NSURL *url = [NSURL URLWithString:urlString];
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
-
     for(NSString *key in headers) {
         NSString *value = [headers objectForKey:key];
         [request setValue:value forHTTPHeaderField:key];
     }
-
     NSData *data = [NSURLConnection sendSynchronousRequest:request
                                          returningResponse:nil
                                                      error:nil];
     return data;
 }
 
+- (Boolean)isUrlAlreadyEncoded:(NSString *)url {
+    NSError *error = NULL;
+    NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"%[2-9A-F][0-9A-F]"
+                                                                           options:NSRegularExpressionCaseInsensitive
+                                                                             error:&error];
+    NSUInteger numMatches = [regex numberOfMatchesInString:url options:0 range:NSMakeRange(0, [url length])];
+    return numMatches > 0;
+}
+
 @end