Cherry picks

[jcesarmobile]

Platforms affected

android

What does this PR do?

cherry-picks #539 and #540 fixes on 7.1.x branch

What testing has been done on this change?

Checklist

• Reported an issue in the JIRA database
• Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected.
• Added automated test coverage as appropriate for this change.

[brodybits]

In general I am not so happy that the unit test updates from PR #542 were not included in this cherry-pick proposal. The unit tests are there to help us ensure that it doesn't get broken in the future.

[brodybits]

I would downvote this change in a patch release, due to the potential to cause an upgrade issue. I would make a much simpler change here:

@@ -34,7 +34,7 @@ var handlers = {
             // a later plugins release.  This is for legacy plugins to work with Cordova.
 
             if (options && options.android_studio === true) {
-                dest = studioPathRemap(obj);
+                dest = getInstallDestination(obj);
             }
 
             if (options && options.force) {

[brodybits]

Same comment as I made on line 31. Here is a much simpler change:

@@ -47,7 +47,7 @@ var handlers = {
             var dest = path.join(obj.targetDir, path.basename(obj.src));
 
             if (options && options.android_studio === true) {
-                dest = studioPathRemap(obj);
+                dest = getInstallDestination(obj);
             }
 
             // TODO: Add Koltin extension to uninstall, since they are handled like Java files

[jcesarmobile]

if (options && options.android_studio === true) is going to be true always, so there is no point on keeping it

[brodybits]

Thanks @jcesarmobile for your efforts. I am actually in the process of raising another PR to resolve GH-547, and I have already unit-tested a rebase of my fixes (GH-540 and GH-547) on 7.1.x. I would be happy to raise the rebase as a WIP PR for discussion and review.