@capacitor/android 2.2.1 → 2.4.2

package/capacitor/build.gradle

@@ -4,6 +4,7 @@ ext {
     androidxMaterialVersion =  project.hasProperty('androidxMaterialVersion') ? rootProject.ext.androidxMaterialVersion : '1.1.0-rc02'
     androidxBrowserVersion =  project.hasProperty('androidxBrowserVersion') ? rootProject.ext.androidxBrowserVersion : '1.2.0'
     androidxLocalbroadcastmanagerVersion =  project.hasProperty('androidxLocalbroadcastmanagerVersion') ? rootProject.ext.androidxLocalbroadcastmanagerVersion : '1.0.0'
+    androidxExifInterfaceVersion =  project.hasProperty('androidxExifInterfaceVersion') ? rootProject.ext.androidxExifInterfaceVersion : '1.2.0'
     firebaseMessagingVersion =  project.hasProperty('firebaseMessagingVersion') ? rootProject.ext.firebaseMessagingVersion : '20.1.2'
     playServicesLocationVersion =  project.hasProperty('playServicesLocationVersion') ? rootProject.ext.playServicesLocationVersion : '17.0.0'
     junitVersion =  project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.12'
@@ -64,6 +65,7 @@ dependencies {
     implementation "com.google.android.material:material:$androidxMaterialVersion"
     implementation "androidx.browser:browser:$androidxBrowserVersion"
     implementation "androidx.localbroadcastmanager:localbroadcastmanager:$androidxLocalbroadcastmanagerVersion"
+    implementation "androidx.exifinterface:exifinterface:$androidxExifInterfaceVersion"
     implementation "com.google.firebase:firebase-messaging:$firebaseMessagingVersion"
     implementation "com.google.android.gms:play-services-location:$playServicesLocationVersion"
     testImplementation "junit:junit:$junitVersion"
@@ -71,5 +73,6 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation "org.apache.cordova:framework:$cordovaAndroidVersion"
     testImplementation 'org.json:json:20140107'
-    testImplementation 'org.mockito:mockito-inline:2.13.0'
+    testImplementation 'org.mockito:mockito-inline:2.25.1'
 }
+

package/capacitor/src/main/AndroidManifest.xml

@@ -14,5 +14,15 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
+        <receiver android:name="com.getcapacitor.plugin.notification.LocalNotificationRestoreReceiver" android:directBootAware="true" android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+            </intent-filter>
+        </receiver>
     </application>
+
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 </manifest>

package/capacitor/src/main/java/com/getcapacitor/Bridge.java

@@ -152,6 +152,11 @@ public class Bridge {
     this.config = new CapConfig(getActivity().getAssets(), config);
     Logger.init(this.config);
 
+    // Display splash screen if configured
+    if (context instanceof BridgeActivity) {
+      Splash.showOnLaunch((BridgeActivity) context, this.config);
+    }
+
     // Initialize web view and message handler for it
     this.initWebView();
     this.msgHandler = new MessageHandler(this, webView, pluginManager);

package/capacitor/src/main/java/com/getcapacitor/BridgeActivity.java

@@ -82,8 +82,6 @@ public class BridgeActivity extends AppCompatActivity {
     cordovaInterface.onCordovaInit(pluginManager);
     bridge = new Bridge(this, webView, initialPlugins, cordovaInterface, pluginManager, preferences, this.config);
 
-    Splash.showOnLaunch(this, bridge.getConfig());
-
     if (savedInstanceState != null) {
       bridge.restoreInstanceState(savedInstanceState);
     }

package/capacitor/src/main/java/com/getcapacitor/BridgeFragment.java

@@ -3,195 +3,161 @@ package com.getcapacitor;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
-
 import androidx.fragment.app.Fragment;
-
 import com.getcapacitor.android.R;
 import com.getcapacitor.cordova.MockCordovaInterfaceImpl;
 import com.getcapacitor.cordova.MockCordovaWebViewImpl;
-
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.cordova.ConfigXmlParser;
 import org.apache.cordova.CordovaPreferences;
 import org.apache.cordova.PluginEntry;
 import org.apache.cordova.PluginManager;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A simple {@link Fragment} subclass.
- * Activities that contain this fragment must implement the
- * {@link BridgeFragment.OnFragmentInteractionListener} interface
- * to handle interaction events.
  * Use the {@link BridgeFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
 public class BridgeFragment extends Fragment {
-  private static final String ARG_START_DIR = "startDir";
-
-  private String startDir;
-
-  private OnFragmentInteractionListener mListener;
-
-  private WebView webView;
-  protected Bridge bridge;
-  protected MockCordovaInterfaceImpl cordovaInterface;
-  protected boolean keepRunning = true;
-  private ArrayList<PluginEntry> pluginEntries;
-  private PluginManager pluginManager;
-  private CordovaPreferences preferences;
-  private MockCordovaWebViewImpl mockWebView;
-  private int activityDepth = 0;
-  private String bridgeStartDir;
-
-  private String lastActivityPlugin;
-
-  private List<Class<? extends Plugin>> initialPlugins = new ArrayList<>();
-  private JSONObject config = new JSONObject();
-
-  public BridgeFragment() {
-    // Required empty public constructor
-  }
-
-  /**
-   * Use this factory method to create a new instance of
-   * this fragment using the provided parameters.
-   *
-   * @param startDir the directory to serve content from
-   * @return A new instance of fragment BridgeFragment.
-   */
-  public static BridgeFragment newInstance(String startDir) {
-    BridgeFragment fragment = new BridgeFragment();
-    Bundle args = new Bundle();
-    args.putString(ARG_START_DIR, startDir);
-    fragment.setArguments(args);
-    return fragment;
-  }
-
-  protected void init(Bundle savedInstanceState) {
-    loadConfig(this.getActivity().getApplicationContext(), this.getActivity());
-  }
-
-  /**
-   * Load the WebView and create the Bridge
-   */
-  protected void load(Bundle savedInstanceState) {
-    Logger.debug("Starting BridgeActivity");
-
-    Bundle args = getArguments();
-    String startDir = null;
-
-    if (args != null) {
-      startDir = getArguments().getString(ARG_START_DIR);
+    private static final String ARG_START_DIR = "startDir";
+
+    private WebView webView;
+    protected Bridge bridge;
+    protected MockCordovaInterfaceImpl cordovaInterface;
+    protected boolean keepRunning = true;
+    private ArrayList<PluginEntry> pluginEntries;
+    private PluginManager pluginManager;
+    private CordovaPreferences preferences;
+    private MockCordovaWebViewImpl mockWebView;
+
+    private List<Class<? extends Plugin>> initialPlugins = new ArrayList<>();
+    private JSONObject config = new JSONObject();
+
+    public BridgeFragment() {
+        // Required empty public constructor
+    }
+
+    /**
+     * Use this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @param startDir the directory to serve content from
+     * @return A new instance of fragment BridgeFragment.
+     */
+    public static BridgeFragment newInstance(String startDir) {
+        BridgeFragment fragment = new BridgeFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_START_DIR, startDir);
+        fragment.setArguments(args);
+        return fragment;
     }
 
-    webView = getView().findViewById(R.id.webview);
-    cordovaInterface = new MockCordovaInterfaceImpl(this.getActivity());
-    if (savedInstanceState != null) {
-      cordovaInterface.restoreInstanceState(savedInstanceState);
+    protected void init(Bundle savedInstanceState) {
+        loadConfig(this.getActivity().getApplicationContext(), this.getActivity());
     }
 
-    mockWebView = new MockCordovaWebViewImpl(getActivity().getApplicationContext());
-    mockWebView.init(cordovaInterface, pluginEntries, preferences, webView);
+    public void addPlugin(Class<? extends Plugin> plugin) {
+        this.initialPlugins.add(plugin);
+    }
+
+    /**
+     * Load the WebView and create the Bridge
+     */
+    protected void load(Bundle savedInstanceState) {
+        Logger.debug("Starting BridgeActivity");
+
+        Bundle args = getArguments();
+        String startDir = null;
 
-    pluginManager = mockWebView.getPluginManager();
-    cordovaInterface.onCordovaInit(pluginManager);
+        if (args != null) {
+            startDir = getArguments().getString(ARG_START_DIR);
+        }
 
-    if (preferences == null) {
-      preferences = new CordovaPreferences();
+        webView = getView().findViewById(R.id.webview);
+        cordovaInterface = new MockCordovaInterfaceImpl(this.getActivity());
+        if (savedInstanceState != null) {
+            cordovaInterface.restoreInstanceState(savedInstanceState);
+        }
+
+        mockWebView = new MockCordovaWebViewImpl(getActivity().getApplicationContext());
+        mockWebView.init(cordovaInterface, pluginEntries, preferences, webView);
+
+        pluginManager = mockWebView.getPluginManager();
+        cordovaInterface.onCordovaInit(pluginManager);
+
+        if (preferences == null) {
+            preferences = new CordovaPreferences();
+        }
+
+        bridge = new Bridge(this.getActivity(), webView, initialPlugins, cordovaInterface, pluginManager, preferences, config);
+
+        if (startDir != null) {
+            bridge.setServerAssetPath(startDir);
+        }
+
+        if (savedInstanceState != null) {
+            bridge.restoreInstanceState(savedInstanceState);
+        }
+        this.keepRunning = preferences.getBoolean("KeepRunning", true);
     }
 
-    bridge = new Bridge(this.getActivity(), webView, initialPlugins, cordovaInterface, pluginManager, preferences, config);
+    public void loadConfig(Context context, Activity activity) {
+        ConfigXmlParser parser = new ConfigXmlParser();
+        parser.parse(context);
+        preferences = parser.getPreferences();
+        preferences.setPreferencesBundle(activity.getIntent().getExtras());
+        pluginEntries = parser.getPluginEntries();
+    }
 
-    if (startDir != null) {
-      bridge.setServerAssetPath(startDir);
+    @Override
+    public void onInflate(Context context, AttributeSet attrs, Bundle savedInstanceState) {
+        super.onInflate(context, attrs, savedInstanceState);
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.bridge_fragment);
+        CharSequence c = a.getString(R.styleable.bridge_fragment_start_dir);
+
+        if (c != null) {
+            String startDir = c.toString();
+            Bundle args = new Bundle();
+            args.putString(ARG_START_DIR, startDir);
+            setArguments(args);
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
     }
 
-    if (savedInstanceState != null) {
-      bridge.restoreInstanceState(savedInstanceState);
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_bridge, container, false);
     }
-    this.keepRunning = preferences.getBoolean("KeepRunning", true);
-  }
-
-  public void loadConfig(Context context, Activity activity) {
-    ConfigXmlParser parser = new ConfigXmlParser();
-    parser.parse(context);
-    preferences = parser.getPreferences();
-    preferences.setPreferencesBundle(activity.getIntent().getExtras());
-    pluginEntries = parser.getPluginEntries();
-  }
-
-
-  @Override
-  public void onInflate(Context context, AttributeSet attrs, Bundle savedInstanceState) {
-    super.onInflate(context, attrs, savedInstanceState);
-
-    TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.bridge_fragment);
-    CharSequence c = a.getString(R.styleable.bridge_fragment_start_dir);
-
-    if (c != null) {
-      String startDir = c.toString();
-      Bundle args = new Bundle();
-      args.putString(ARG_START_DIR, startDir);
-      setArguments(args);
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        this.init(savedInstanceState);
+        this.load(savedInstanceState);
     }
-  }
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-  }
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                           Bundle savedInstanceState) {
-    // Inflate the layout for this fragment
-    return inflater.inflate(R.layout.fragment_bridge, container, false);
-  }
-
-  @Override
-  public void onActivityCreated(Bundle savedInstanceState) {
-    super.onActivityCreated(savedInstanceState);
-    this.init(savedInstanceState);
-    this.load(savedInstanceState);
-  }
-
-  @Override
-  public void onAttach(Context context) {
-    super.onAttach(context);
-    if (context instanceof OnFragmentInteractionListener) {
-      mListener = (OnFragmentInteractionListener) context;
-    } else {
-      throw new RuntimeException(context.toString()
-        + " must implement OnFragmentInteractionListener");
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (this.bridge != null) {
+            this.bridge.onDestroy();
+        }
+        if (this.mockWebView != null) {
+            mockWebView.handleDestroy();
+        }
     }
-  }
-
-  @Override
-  public void onDetach() {
-    super.onDetach();
-    mListener = null;
-  }
-
-  /**
-   * This interface must be implemented by activities that contain this
-   * fragment to allow an interaction in this fragment to be communicated
-   * to the activity and potentially other fragments contained in that
-   * activity.
-   * <p>
-   * See the Android Training lesson <a href=
-   * "http://developer.android.com/training/basics/fragments/communicating.html"
-   * >Communicating with Other Fragments</a> for more information.
-   */
-  public interface OnFragmentInteractionListener {
-    void onFragmentInteraction(Uri uri);
-  }
 }

package/capacitor/src/main/java/com/getcapacitor/Splash.java

@@ -9,6 +9,7 @@ import android.graphics.Color;
 import android.graphics.PixelFormat;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
 import android.os.Handler;
 import android.view.Gravity;
 import android.view.View;
@@ -60,6 +61,18 @@ public class Splash {
         ((Animatable) splash).start();
       }
 
+      if(splash instanceof LayerDrawable){
+        LayerDrawable layeredSplash = (LayerDrawable) splash;
+
+        for(int i = 0; i < layeredSplash.getNumberOfLayers(); i++){
+          Drawable layerDrawable = layeredSplash.getDrawable(i);
+
+          if(layerDrawable instanceof  Animatable) {
+            ((Animatable) layerDrawable).start();
+          }
+        }
+      }
+
       splashImage = new ImageView(c);
 
       splashImage.setFitsSystemWindows(true);
@@ -224,6 +237,7 @@ public class Splash {
     buildViews(a, config);
 
     if (isVisible) {
+      splashListener.completed();
       return;
     }
 

package/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java

@@ -356,7 +356,7 @@ public class WebViewLocalServer {
   private int getStatusCode(InputStream stream, int defaultCode) {
     int finalStatusCode = defaultCode;
     try {
-      if (stream.available() == 0) {
+      if (stream.available() == -1) {
         finalStatusCode = 404;
       }
     } catch (IOException e) {
@@ -492,7 +492,7 @@ public class WebViewLocalServer {
     @Override
     public int available() throws IOException {
       InputStream is = getInputStream();
-      return (is != null) ? is.available() : 0;
+      return (is != null) ? is.available() : -1;
     }
 
     @Override

package/capacitor/src/main/java/com/getcapacitor/plugin/Camera.java

@@ -182,6 +182,7 @@ public class Camera extends Plugin {
     settings.setHeight(call.getInt("height", 0));
     settings.setShouldResize(settings.getWidth() > 0 || settings.getHeight() > 0);
     settings.setShouldCorrectOrientation(call.getBoolean("correctOrientation", CameraSettings.DEFAULT_CORRECT_ORIENTATION));
+    settings.setPreserveAspectRatio(call.getBoolean("preserveAspectRatio", false));
     try {
       settings.setSource(CameraSource.valueOf(call.getString("source", CameraSource.PROMPT.getSource())));
     } catch (IllegalArgumentException ex) {
@@ -340,8 +341,9 @@ public class Camera extends Plugin {
     boolean saveToGallery = call.getBoolean("saveToGallery", CameraSettings.DEFAULT_SAVE_IMAGE_TO_GALLERY);
     if (saveToGallery && (imageEditedFileSavePath != null || imageFileSavePath != null)) {
       try {
-        String fileToSave = imageEditedFileSavePath != null ? imageEditedFileSavePath : imageFileSavePath;
-        MediaStore.Images.Media.insertImage(getActivity().getContentResolver(), fileToSave, "", "");
+        String fileToSavePath = imageEditedFileSavePath != null ? imageEditedFileSavePath : imageFileSavePath;
+        File fileToSave = new File(fileToSavePath);
+        MediaStore.Images.Media.insertImage(getActivity().getContentResolver(), fileToSavePath, fileToSave.getName(), "");
       } catch (FileNotFoundException e) {
         Logger.error(getLogTag(), IMAGE_GALLERY_SAVE_ERROR, e);
       }
@@ -410,7 +412,12 @@ public class Camera extends Plugin {
     }
 
     if (settings.isShouldResize()) {
-      final Bitmap newBitmap = ImageUtils.resize(bitmap, settings.getWidth(), settings.getHeight());
+      final Bitmap newBitmap = ImageUtils.resize(
+          bitmap,
+          settings.getWidth(),
+          settings.getHeight(),
+          settings.getPreserveAspectRatio()
+      );
       bitmap = replaceBitmap(bitmap, newBitmap);
     }
     return bitmap;

package/capacitor/src/main/java/com/getcapacitor/plugin/Device.java

@@ -3,6 +3,7 @@ package com.getcapacitor.plugin;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
+import android.content.pm.ApplicationInfo;
 import android.os.BatteryManager;
 import android.os.Environment;
 import android.os.StatFs;
@@ -32,6 +33,8 @@ public class Device extends Plugin {
     r.put("osVersion", android.os.Build.VERSION.RELEASE);
     r.put("appVersion", getAppVersion());
     r.put("appBuild", getAppBuild());
+    r.put("appId", getAppBundleId());
+    r.put("appName", getAppName());
     r.put("platform", getPlatform());
     r.put("manufacturer", android.os.Build.MANUFACTURER);
     r.put("uuid", getUuid());
@@ -91,6 +94,25 @@ public class Device extends Plugin {
     }
   }
 
+  private String getAppBundleId() {
+    try {
+      PackageInfo pinfo = getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), 0);
+      return pinfo.packageName;
+    } catch(Exception ex) {
+      return "";
+    }
+  }
+
+  private String getAppName() {
+    try {
+      ApplicationInfo applicationInfo = getContext().getApplicationInfo();
+      int stringId = applicationInfo.labelRes;
+      return stringId == 0 ? applicationInfo.nonLocalizedLabel.toString() : getContext().getString(stringId);
+    } catch(Exception ex) {
+      return "";
+    }
+  }
+
   private String getPlatform() {
     return "android";
   }

package/capacitor/src/main/java/com/getcapacitor/plugin/Filesystem.java

@@ -579,23 +579,22 @@ public class Filesystem extends Plugin {
     toObject.delete();
 
     assert fromObject != null;
-    boolean modified = false;
 
     if (doRename) {
-      modified = fromObject.renameTo(toObject);
+      boolean modified = fromObject.renameTo(toObject);
+      if (!modified) {
+        call.error("Unable to rename, unknown reason");
+        return;
+      }
     } else {
       try {
         copyRecursively(fromObject, toObject);
-        modified = true;
-      } catch (IOException ignored) {
+      } catch (IOException e) {
+        call.error("Unable to perform action: " + e.getLocalizedMessage());
+        return;
       }
     }
 
-    if (!modified) {
-      call.error("Unable to perform action, unknown reason");
-      return;
-    }
-
     call.success();
   }
 

package/capacitor/src/main/java/com/getcapacitor/plugin/LocalNotifications.java

@@ -74,7 +74,7 @@ public class LocalNotifications extends Plugin {
     }
     JSONArray ids = manager.schedule(call, localNotifications);
     if (ids != null) {
-      notificationStorage.appendNotificationIds(localNotifications);
+      notificationStorage.appendNotifications(localNotifications);
       JSObject result = new JSObject();
       JSArray jsArray = new JSArray();
       for (int i=0; i < ids.length(); i++) {

package/capacitor/src/main/java/com/getcapacitor/plugin/Share.java

@@ -27,27 +27,29 @@ public class Share extends Plugin {
       call.error("Must provide a URL or Message");
       return;
     }
+
+    if(url != null && !isFileUrl(url) && !isHttpUrl(url)) {
+      call.error("Unsupported url");
+      return;
+    }
+
     Intent intent = new Intent(Intent.ACTION_SEND);
+
     if (text != null) {
       // If they supplied both fields, concat em
-      if (url != null && url.startsWith("http")) {
-        text = text + " " + url;
-      }
+      if (url != null && isHttpUrl(url)) text = text + " " + url;
       intent.putExtra(Intent.EXTRA_TEXT, text);
       intent.setTypeAndNormalize("text/plain");
-    } else if (url != null) {
-      if (url.startsWith("http")) {
-        intent.putExtra(Intent.EXTRA_TEXT, url);
-        intent.setTypeAndNormalize("text/plain");
-      } else if (url.startsWith("file:")) {
-        String type = getMimeType(url);
-        intent.setType(type);
-        Uri fileUrl = FileProvider.getUriForFile(getActivity(), getContext().getPackageName() + ".fileprovider", new File(Uri.parse(url).getPath()));
-        intent.putExtra(Intent.EXTRA_STREAM, fileUrl);
-      } else {
-        call.error("Unsupported url");
-        return;
-      }
+    }
+
+    if(url != null && isHttpUrl(url) && text == null) {
+      intent.putExtra(Intent.EXTRA_TEXT, url);
+      intent.setTypeAndNormalize("text/plain");
+    } else if (url != null && isFileUrl(url)) {
+      String type = getMimeType(url);
+      intent.setType(type);
+      Uri fileUrl = FileProvider.getUriForFile(getActivity(), getContext().getPackageName() + ".fileprovider", new File(Uri.parse(url).getPath()));
+      intent.putExtra(Intent.EXTRA_STREAM, fileUrl);
     }
 
     if (title != null) {
@@ -69,4 +71,12 @@ public class Share extends Plugin {
     }
     return type;
   }
+
+  private boolean isFileUrl(String url) {
+    return url.startsWith("file:");
+  }
+
+  private boolean isHttpUrl(String url) {
+    return url.startsWith("http");
+  }
 }

package/capacitor/src/main/java/com/getcapacitor/plugin/camera/CameraSettings.java

@@ -15,6 +15,7 @@ public class CameraSettings {
     private int width = 0;
     private int height = 0;
     private CameraSource source = CameraSource.PROMPT;
+    private boolean preserveAspectRatio = false;
 
     public CameraResultType getResultType() {
         return resultType;
@@ -83,4 +84,12 @@ public class CameraSettings {
     public void setSource(CameraSource source) {
         this.source = source;
     }
+
+    public void setPreserveAspectRatio(boolean preserveAspectRatio) {
+        this.preserveAspectRatio = preserveAspectRatio;
+    }
+
+    public boolean getPreserveAspectRatio() {
+        return this.preserveAspectRatio;
+    }
 }

package/capacitor/src/main/java/com/getcapacitor/plugin/camera/ExifWrapper.java

@@ -1,8 +1,8 @@
 package com.getcapacitor.plugin.camera;
 
-import android.media.ExifInterface;
+import androidx.exifinterface.media.ExifInterface;
 
-import static android.media.ExifInterface.*;
+import static androidx.exifinterface.media.ExifInterface.*;
 
 import com.getcapacitor.JSObject;
 
@@ -22,7 +22,7 @@ public class ExifWrapper {
 
     // Commented fields are for API 24. Left in to save someone the wrist damage later
 
-    p(ret, TAG_APERTURE);
+    p(ret, TAG_APERTURE_VALUE);
     /*
     p(ret, TAG_ARTIST);
     p(ret, TAG_BITS_PER_SAMPLE);
@@ -105,7 +105,7 @@ public class ExifWrapper {
     p(ret, TAG_IMAGE_LENGTH);
     // p(ret, TAG_IMAGE_UNIQUE_ID);
     p(ret, TAG_IMAGE_WIDTH);
-    p(ret, TAG_ISO);
+    p(ret, TAG_ISO_SPEED);
     /*
     p(ret, TAG_INTEROPERABILITY_INDEX);
     p(ret, TAG_ISO_SPEED_RATINGS);

package/capacitor/src/main/java/com/getcapacitor/plugin/camera/ImageUtils.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.media.ExifInterface;
+import androidx.exifinterface.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
@@ -17,6 +17,32 @@ import java.io.InputStream;
 
 public class ImageUtils {
 
+  /**
+   * Resize an image to the given width and height.
+   * @param bitmap
+   * @param width
+   * @param height
+   * @return a new, scaled Bitmap
+   */
+  public static Bitmap resize(Bitmap bitmap, final int width, final int height) {
+    return ImageUtils.resize(bitmap, width, height, false);
+  }
+
+  /**
+   * Resize an image to the given width and height considering the preserveAspectRatio flag.
+   * @param bitmap
+   * @param width
+   * @param height
+   * @param preserveAspectRatio
+   * @return a new, scaled Bitmap
+   */
+  public static Bitmap resize(Bitmap bitmap, final int width, final int height, final boolean preserveAspectRatio) {
+    if (preserveAspectRatio) {
+        return ImageUtils.resizePreservingAspectRatio(bitmap, width, height);
+    }
+    return ImageUtils.resizeImageWithoutPreservingAspectRatio(bitmap, width, height);
+  }
+
   /**
    * Resize an image to the given width and height. Leave one dimension 0 to
    * perform an aspect-ratio scale on the provided dimension.
@@ -25,7 +51,7 @@ public class ImageUtils {
    * @param height
    * @return a new, scaled Bitmap
    */
-  public static Bitmap resize(Bitmap bitmap, final int width, final int height) {
+  private static Bitmap resizeImageWithoutPreservingAspectRatio(Bitmap bitmap, final int width, final int height) {
     float aspect = bitmap.getWidth() / (float) bitmap.getHeight();
     if (width > 0 && height > 0) {
       return Bitmap.createScaledBitmap(bitmap, width, height, false);
@@ -38,6 +64,33 @@ public class ImageUtils {
     return bitmap;
   }
 
+  /**
+   * Resize an image to the given max width and max height. Constraint can be put
+   * on one dimension, or both. Resize will always preserve aspect ratio.
+   * @param bitmap
+   * @param desiredMaxWidth
+   * @param desiredMaxHeight
+   * @return a new, scaled Bitmap
+   */
+  private static Bitmap resizePreservingAspectRatio(Bitmap bitmap, final int desiredMaxWidth, final int desiredMaxHeight) {
+    int width = bitmap.getWidth();
+    int height = bitmap.getHeight();
+
+    // 0 is treated as 'no restriction'
+    int maxHeight = desiredMaxHeight == 0 ? height : desiredMaxHeight;
+    int maxWidth = desiredMaxWidth == 0 ? width : desiredMaxWidth;
+
+    // resize with preserved aspect ratio
+    float newWidth = Math.min(width, maxWidth);
+    float newHeight = (height * newWidth) / width;
+
+    if (newHeight > maxHeight) {
+        newWidth = (width * maxHeight) / height;
+        newHeight = maxHeight;
+    }
+    return Bitmap.createScaledBitmap(bitmap, Math.round(newWidth), Math.round(newHeight), false);
+  }
+
   /**
    * Transform an image with the given matrix
    * @param bitmap

package/capacitor/src/main/java/com/getcapacitor/plugin/notification/DateMatch.java

@@ -73,6 +73,8 @@ public class DateMatch {
   private Calendar buildCalendar(Date date) {
     Calendar cal = Calendar.getInstance();
     cal.setTime(date);
+    cal.set(Calendar.MILLISECOND, 0);
+    cal.set(Calendar.SECOND, 0);
     return cal;
   }
 
@@ -92,46 +94,46 @@ public class DateMatch {
    * Postpone trigger if first schedule matches the past
    */
   private long postponeTriggerIfNeeded(Calendar current, Calendar next) {
-    int currentYear = current.get(Calendar.YEAR);
-    if (matchesUnit(Calendar.YEAR, current, next)) {
-      next.set(Calendar.YEAR, currentYear + 1);
-      this.unit = Calendar.YEAR;
-    } else if (matchesUnit(Calendar.MONTH, current, next)) {
-      next.set(Calendar.YEAR, currentYear + 1);
-      this.unit = Calendar.MONTH;
-    } else if (matchesUnit(Calendar.DAY_OF_MONTH, current, next)) {
-      next.set(Calendar.MONTH, current.get(Calendar.MONTH) + 1);
-      this.unit = Calendar.DAY_OF_MONTH;
-    } else if (matchesUnit(Calendar.HOUR_OF_DAY, current, next)) {
-      next.set(Calendar.DAY_OF_MONTH, current.get(Calendar.DAY_OF_MONTH) + 1);
-      this.unit = Calendar.DAY_OF_MONTH;
-    } else if (matchesUnit(Calendar.MINUTE, current, next)) {
-      next.set(Calendar.HOUR_OF_DAY, current.get(Calendar.HOUR_OF_DAY) + 1);
-      this.unit = Calendar.MINUTE;
+    if (next.getTimeInMillis() <= current.getTimeInMillis() && unit != -1) {
+      Integer incrementUnit = -1;
+      if (unit == Calendar.YEAR || unit == Calendar.MONTH) {
+        incrementUnit = Calendar.YEAR;
+      } else if (unit == Calendar.DAY_OF_MONTH) {
+        incrementUnit = Calendar.MONTH;
+      } else if (unit == Calendar.HOUR_OF_DAY) {
+        incrementUnit = Calendar.DAY_OF_MONTH;
+      } else if (unit == Calendar.MINUTE) {
+        incrementUnit = Calendar.HOUR_OF_DAY;
+      }
+
+      if (incrementUnit != -1) {
+        next.set(incrementUnit, next.get(incrementUnit) + 1);
+      }
     }
     return next.getTimeInMillis();
   }
 
-  private boolean matchesUnit(Integer unit, Calendar current, Calendar next) {
-    return next.get(unit) < current.get(unit);
-  }
-
   private Calendar buildNextTriggerTime(Date date) {
     Calendar next = buildCalendar(date);
     if (year != null) {
       next.set(Calendar.YEAR, year);
+      if (unit == -1) unit = Calendar.YEAR;
     }
     if (month != null) {
       next.set(Calendar.MONTH, month);
+      if (unit == -1) unit = Calendar.MONTH;
     }
     if (day != null) {
       next.set(Calendar.DAY_OF_MONTH, day);
+      if (unit == -1) unit = Calendar.DAY_OF_MONTH;
     }
     if (hour != null) {
       next.set(Calendar.HOUR_OF_DAY, hour);
+      if (unit == -1) unit = Calendar.HOUR_OF_DAY;
     }
     if (minute != null) {
       next.set(Calendar.MINUTE, minute);
+      if (unit == -1) unit = Calendar.MINUTE;
     }
     return next;
   }

package/capacitor/src/main/java/com/getcapacitor/plugin/notification/LocalNotification.java

@@ -33,6 +33,8 @@ public class LocalNotification {
   private String actionTypeId;
   private String group;
   private boolean groupSummary;
+  private boolean ongoing;
+  private boolean autoCancel;
   private JSObject extra;
   private List<LocalNotificationAttachment> attachments;
   private LocalNotificationSchedule schedule;
@@ -152,6 +154,22 @@ public class LocalNotification {
     this.groupSummary = groupSummary;
   }
 
+  public boolean isOngoing() {
+    return ongoing;
+  }
+
+  public void setOngoing(boolean ongoing) {
+    this.ongoing = ongoing;
+  }
+
+  public boolean isAutoCancel() {
+    return autoCancel;
+  }
+
+  public void setAutoCancel(boolean autoCancel) {
+    this.autoCancel = autoCancel;
+  }
+
   public String getChannelId() {
     return channelId;
   }
@@ -186,31 +204,39 @@ public class LocalNotification {
         call.error("Invalid JSON object sent to NotificationPlugin", e);
         return null;
       }
-      LocalNotification activeLocalNotification = new LocalNotification();
-      activeLocalNotification.setSource(notification.toString());
-      activeLocalNotification.setId(notification.getInteger("id"));
-      activeLocalNotification.setBody(notification.getString("body"));
-      activeLocalNotification.setActionTypeId(notification.getString("actionTypeId"));
-      activeLocalNotification.setGroup(notification.getString("group"));
-      activeLocalNotification.setSound(notification.getString("sound"));
-      activeLocalNotification.setTitle(notification.getString("title"));
-      activeLocalNotification.setSmallIcon(notification.getString("smallIcon"));
-      activeLocalNotification.setIconColor(notification.getString("iconColor"));
-      activeLocalNotification.setAttachments(LocalNotificationAttachment.getAttachments(notification));
-      activeLocalNotification.setGroupSummary(notification.getBoolean("groupSummary", false));
-      activeLocalNotification.setChannelId(notification.getString("channelId"));
+      
       try {
-        activeLocalNotification.setSchedule(new LocalNotificationSchedule(notification));
+          LocalNotification activeLocalNotification = buildNotificationFromJSObject(notification);
+          resultLocalNotifications.add(activeLocalNotification);
       } catch (ParseException e) {
         call.error("Invalid date format sent to Notification plugin", e);
         return null;
       }
-      activeLocalNotification.setExtra(notification.getJSObject("extra"));
-      resultLocalNotifications.add(activeLocalNotification);
     }
     return resultLocalNotifications;
   }
 
+  public static LocalNotification buildNotificationFromJSObject(JSObject jsonObject) throws ParseException {
+      LocalNotification localNotification = new LocalNotification();
+      localNotification.setSource(jsonObject.toString());
+      localNotification.setId(jsonObject.getInteger("id"));
+      localNotification.setBody(jsonObject.getString("body"));
+      localNotification.setActionTypeId(jsonObject.getString("actionTypeId"));
+      localNotification.setGroup(jsonObject.getString("group"));
+      localNotification.setSound(jsonObject.getString("sound"));
+      localNotification.setTitle(jsonObject.getString("title"));
+      localNotification.setSmallIcon(jsonObject.getString("smallIcon"));
+      localNotification.setIconColor(jsonObject.getString("iconColor"));
+      localNotification.setAttachments(LocalNotificationAttachment.getAttachments(jsonObject));
+      localNotification.setGroupSummary(jsonObject.getBoolean("groupSummary", false));
+      localNotification.setChannelId(jsonObject.getString("channelId"));
+      localNotification.setSchedule(new LocalNotificationSchedule(jsonObject));
+      localNotification.setExtra(jsonObject.getJSObject("extra"));
+      localNotification.setOngoing(jsonObject.getBoolean("ongoing", false));
+      localNotification.setAutoCancel(jsonObject.getBoolean("autoCancel", true));
+
+      return localNotification;
+  }
 
   public static List<Integer> getLocalNotificationPendingList(PluginCall call) {
     List<JSONObject> notifications = null;
@@ -282,6 +308,8 @@ public class LocalNotification {
             ", attachments=" + attachments +
             ", schedule=" + schedule +
             ", groupSummary=" + groupSummary +
+            ", ongoing=" + ongoing +
+            ", autoCancel=" + autoCancel +
             '}';
   }
 
@@ -305,6 +333,8 @@ public class LocalNotification {
     if (attachments != null ? !attachments.equals(that.attachments) : that.attachments != null)
       return false;
     if (groupSummary != that.groupSummary) return false;
+    if( ongoing != that.ongoing ) return false;
+    if( autoCancel != that.autoCancel ) return false;
     return schedule != null ? schedule.equals(that.schedule) : that.schedule == null;
   }
 
@@ -319,6 +349,8 @@ public class LocalNotification {
     result = 31 * result + (actionTypeId != null ? actionTypeId.hashCode() : 0);
     result = 31 * result + (group != null ? group.hashCode() : 0);
     result = 31 * result + Boolean.hashCode(groupSummary);
+    result = 31 * result + Boolean.hashCode( ongoing );
+    result = 31 * result + Boolean.hashCode( autoCancel );
     result = 31 * result + (extra != null ? extra.hashCode() : 0);
     result = 31 * result + (attachments != null ? attachments.hashCode() : 0);
     result = 31 * result + (schedule != null ? schedule.hashCode() : 0);

package/capacitor/src/main/java/com/getcapacitor/plugin/notification/LocalNotificationManager.java

@@ -32,6 +32,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -137,13 +138,17 @@ public class LocalNotificationManager {
 
     boolean notificationsEnabled = notificationManager.areNotificationsEnabled();
     if (!notificationsEnabled) {
-      call.error("Notifications not enabled on this device");
+      if(call != null){
+        call.error("Notifications not enabled on this device");
+      }
       return null;
     }
     for (LocalNotification localNotification : localNotifications) {
       Integer id = localNotification.getId();
       if (localNotification.getId() == null) {
-        call.error("LocalNotification missing identifier");
+        if(call != null) {
+          call.error("LocalNotification missing identifier");
+        }
         return null;
       }
       dismissVisibleNotification(id);
@@ -170,8 +175,8 @@ public class LocalNotificationManager {
     NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(this.context, channelId)
             .setContentTitle(localNotification.getTitle())
             .setContentText(localNotification.getBody())
-            .setAutoCancel(true)
-            .setOngoing(false)
+            .setAutoCancel( localNotification.isAutoCancel( ) )
+            .setOngoing( localNotification.isOngoing( ) )
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setGroupSummary(localNotification.isGroupSummary());
 
@@ -214,7 +219,9 @@ public class LocalNotificationManager {
       try {
         mBuilder.setColor(Color.parseColor(iconColor));
       } catch (IllegalArgumentException ex) {
-        call.error("Invalid color provided. Must be a hex string (ex: #ff0000");
+        if(call != null) {
+            call.error("Invalid color provided. Must be a hex string (ex: #ff0000");
+        }
         return;
       }
     }
@@ -294,7 +301,6 @@ public class LocalNotificationManager {
    * on a certain date "shape" (such as every first of the month)
    */
   // TODO support different AlarmManager.RTC modes depending on priority
-  // TODO restore alarm on device shutdown (requires persistence)
   private void triggerScheduledNotification(Notification notification, LocalNotification request) {
     AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
     LocalNotificationSchedule schedule = request.getSchedule();
@@ -333,9 +339,12 @@ public class LocalNotificationManager {
     // Cron like scheduler
     DateMatch on = schedule.getOn();
     if (on != null) {
+      long trigger = on.nextTrigger(new Date());
       notificationIntent.putExtra(TimedNotificationPublisher.CRON_KEY, on.toMatchString());
       pendingIntent = PendingIntent.getBroadcast(context, request.getId(), notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
-      alarmManager.setExact(AlarmManager.RTC, on.nextTrigger(new Date()), pendingIntent);
+      alarmManager.setExact(AlarmManager.RTC, trigger, pendingIntent);
+      SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+      Logger.debug(Logger.tags("LN"), "notification " + request.getId() + " will next fire at " + sdf.format(new Date(trigger)));
     }
   }
 

package/capacitor/src/main/java/com/getcapacitor/plugin/notification/LocalNotificationRestoreReceiver.java

@@ -0,0 +1,60 @@
+package com.getcapacitor.plugin.notification;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserManager;
+
+import com.getcapacitor.CapConfig;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static android.os.Build.VERSION.SDK_INT;
+
+public class LocalNotificationRestoreReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (SDK_INT >= 24) {
+            UserManager um = context.getSystemService(UserManager.class);
+            if (um == null || !um.isUserUnlocked()) return;
+        }
+
+        NotificationStorage storage = new NotificationStorage(context);
+        List<String> ids = storage.getSavedNotificationIds();
+
+        ArrayList<LocalNotification> notifications = new ArrayList<>(ids.size());
+        ArrayList<LocalNotification> updatedNotifications = new ArrayList<>();
+        for (String id : ids) {
+            LocalNotification notification = storage.getSavedNotification(id);
+            if(notification == null) {
+                continue;
+            }
+
+            LocalNotificationSchedule schedule = notification.getSchedule();
+            if(schedule != null) {
+                Date at = schedule.getAt();
+                if(at != null && at.before(new Date())) {
+                    // modify the scheduled date in order to show notifications that would have been delivered while device was off.
+                    long newDateTime = new Date().getTime() + 15 * 1000;
+                    schedule.setAt(new Date(newDateTime));
+                    notification.setSchedule(schedule);
+                    updatedNotifications.add(notification);
+                }
+            }
+
+            notifications.add(notification);
+        }
+
+        if(updatedNotifications.size() > 0){
+            storage.appendNotifications(updatedNotifications);
+        }
+
+        CapConfig config = new CapConfig(context.getAssets(), null);
+        LocalNotificationManager localNotificationManager = new LocalNotificationManager(storage, null, context, config);
+
+        localNotificationManager.schedule(null, notifications);
+    }
+}

package/capacitor/src/main/java/com/getcapacitor/plugin/notification/NotificationChannelManager.java

@@ -82,7 +82,7 @@ public class NotificationChannelManager {
                 }
                 AudioAttributes audioAttributes = new AudioAttributes.Builder()
                         .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                        .setUsage(AudioAttributes.USAGE_ALARM).build();
+                        .setUsage(AudioAttributes.USAGE_NOTIFICATION).build();
                 Uri soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.getPackageName() + "/raw/" + sound);
                 notificationChannel.setSound(soundUri, audioAttributes);
             }

package/capacitor/src/main/java/com/getcapacitor/plugin/notification/NotificationStorage.java

@@ -3,7 +3,14 @@ package com.getcapacitor.plugin.notification;
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import com.getcapacitor.JSObject;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -31,13 +38,12 @@ public class NotificationStorage {
   /**
    * Persist the id of currently scheduled notification
    */
-  public void appendNotificationIds(List<LocalNotification> localNotifications) {
+  public void appendNotifications(List<LocalNotification> localNotifications) {
     SharedPreferences storage = getStorage(NOTIFICATION_STORE_ID);
     SharedPreferences.Editor editor = storage.edit();
-    long creationTime = new Date().getTime();
     for (LocalNotification request : localNotifications) {
       String key = request.getId().toString();
-      editor.putLong(key, creationTime);
+      editor.putString(key, request.getSource());
     }
     editor.apply();
   }
@@ -51,6 +57,40 @@ public class NotificationStorage {
     return new ArrayList<>();
   }
 
+  public JSObject getSavedNotificationAsJSObject(String key) {
+    SharedPreferences storage = getStorage(NOTIFICATION_STORE_ID);
+    String notificationString = storage.getString(key, null);
+
+    if(notificationString == null){
+        return null;
+    }
+
+    JSObject jsNotification;
+    try {
+        jsNotification  = new JSObject(notificationString);
+    } catch (JSONException ex) {
+        return  null;
+    }
+
+    return jsNotification;
+  }
+
+  public LocalNotification getSavedNotification(String key) {
+    JSObject jsNotification = getSavedNotificationAsJSObject(key);
+    if(jsNotification == null) {
+        return null;
+    }
+
+    LocalNotification notification;
+    try {
+       notification = LocalNotification.buildNotificationFromJSObject(jsNotification);
+    } catch (ParseException ex) {
+       return  null;
+    }
+
+    return  notification;
+  }
+
   /**
    * Remove the stored notifications
    */

package/capacitor/src/main/java/com/getcapacitor/plugin/notification/TimedNotificationPublisher.java

@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import com.getcapacitor.Logger;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -42,8 +43,10 @@ public class TimedNotificationPublisher extends BroadcastReceiver {
       long trigger = date.nextTrigger(new Date());
       Intent clone = (Intent) intent.clone();
       PendingIntent pendingIntent = PendingIntent.getBroadcast(context, id, clone, PendingIntent.FLAG_CANCEL_CURRENT);
-      alarmManager.set(AlarmManager.RTC, trigger, pendingIntent);
+      alarmManager.setExact(AlarmManager.RTC, trigger, pendingIntent);
+      SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+      Logger.debug(Logger.tags("LN"), "notification " + id + " will next fire at " + sdf.format(new Date(trigger)));
     }
   }
-
+  
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "2.2.1",
+  "version": "2.4.2",
   "description": "Capacitor: cross-platform mobile apps with the web",
   "homepage": "https://capacitor.ionicframework.com/",
   "author": "Ionic Team <hi@ionic.io> (https://ionicframework.com) ",
@@ -16,7 +16,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@capacitor/core": "~2.2.0"
+    "@capacitor/core": "~2.4.0"
   },
   "gitHead": "844c0feba4a801ee5041429a82d0f805c9e665b0"
 }