Change decrypter search path for Android #601

glennguy · 2021-02-09T02:51:25Z

As requested this one-liner will direct inputstream.adaptive to search in the user addons folder instead of packaged folder for libssd_wv.so

Now installations and updates from the official repo will function correctly, myself and @matthuisman have verified using a parallel installation with a different add-on id.

One potential issue that I haven't investigated and don't have immediate time for is how things work when upgrading from an Android installation of Kodi packaged with IA to a package without - will the packaged IA libraries and other add-on files remain and cause conflict? Or are they removed? If this is an unfamiliar scenario I'll find time in the next few days to setup and test it.

matthuisman · 2021-02-09T03:10:24Z

@glennguy
looking at the code, isn't searchPaths[1] = kodi::GetAddonInfo("path"); after the #ifdef actually adding the add-ons path to to be searched anyway? (no hard-coded addon id as well)

inputstream.adaptive/src/main.cpp

Line 2147 in ef78a57

searchPaths[1] = kodi::GetAddonInfo("path");

If so, this change shouldn't actually be needed?
It'll just search xbmcbinaddons and then the add-on path.
So as long as the .so is removed from xbmcbinaddons, it'll pick up the version in IA's folder.

If anything, maybe the order needs to be reversed.
Addon path first, then xbmcbinaddons 2nd as fallback?

Or, if there are no versions that use xbmcbinaddons anymore, then can get rid of the whole ifdef else
And just std::vectorstd::string searchPaths(1); searchPaths[0] = kodi::GetAddonInfo("path");

(I suspect we needed this change for IA Testings to stop it picking up IA's files)

glennguy · 2021-02-09T03:26:57Z

@matthuisman you're correct, I'll push the changes soon if I get a chance, otherwise tonight.
Best to take out searching any place where it doesn't need to, whether we expect to see a file there or not.
Not sure myself if xbmcbinaddons is pointing to somewhere different on non-android platforms, I assume it's there for a reason...

matthuisman · 2021-02-09T03:44:59Z

i suspect a path still needs to be added?
Otherwise will the searchPaths[1] = line fail if there is no searchPaths[0] ?
Maybe the other xbmcbinaddons is for UWP?

So, maybe

searchPaths[0] = kodi::vfs::TranslateSpecialProtocol("special://xbmcbinaddons/inputstream.adaptive/");
searchPaths[1] = kodi::GetAddonInfo("path");

for all platforms?

or

searchPaths[0] = kodi::GetAddonInfo("path");
#ifndef ANDROID
  searchPaths[1] = kodi::vfs::TranslateSpecialProtocol("special://xbmcbinaddons/inputstream.adaptive/");
#endif

glennguy · 2021-02-09T03:53:39Z

was just thinking

  std::vector<std::string> searchPaths(2);
  searchPaths[0] =
      kodi::vfs::TranslateSpecialProtocol("special://xbmcbinaddons/inputstream.adaptive/");
  searchPaths[1] = kodi::GetAddonInfo("path");

glennguy · 2021-02-09T05:20:24Z

Thanks for the suggestion, much cleaner and no redundancy now.
The potential issue I mention above is more about the inputstream.adaptive shared library itself as the fear is the addon db might still be looking at the baked-in version... but I'm just speculating without any proper knowledge of how it actually works.

matthuisman · 2021-02-09T23:06:54Z

just trying to think through the rollout of moving IA to repo

If this PR is merged, a new version of IA with this PR included in kodi android will actually fail as it wont find the .so.
If IA is put into the repo without this PR, then IA will keep picking up the old built-in .so.

So, once this is merged - the next version of IA must be in repo.

I think this could happen after 19 is released... as long as a built-in binary add-on can be replaced / updated by a repo version?
@howie-f may know if that should be fine?

The built-in .so will remain, but IA will no longer search for it there.

howie-f · 2021-02-10T10:32:47Z

without having tested it (and not using android at all) i think the packaged version will strand in xbmcbinaddons; the update installed from the repo in the user addon folder which is mapped to home.
the built-in is not replaced until a new kodi version is deployed.
so the two .so-versions might co-exist. does kodi need to checkout both versions and pick the higher in this case? honestly i don't know

matthuisman · 2021-04-08T20:44:23Z

@glennguy
i just clicked about this PR for android path... I've been thinking its fixing the path to find the inpustreamadaptive.so...
I'm so dumb - obviously the code running is in inpustreamadaptive.so. HAHA. It's just for the ssd_wv
Now I see your concern about what inpustreamadaptive.so kodi will choose...
The in-built one or the the one in the add-on itself

Doing some tests now to find out

My idea to test is:

Install Kodi 18.9 on Android
Install build from this PR: [Leia] Backport Matrix bug fixes #634 which includes your PR
Get a stream that doesn't work on IA 2.4.6
Confirm it doesn't work
Install the new zip and then check it works

glennguy · 2021-04-08T20:48:23Z

Yeah that's right and with search path I think we might need to change to special://home
You can see which ssdwv.so is being loaded in debug log, it will 'cache' it first time around.

matthuisman · 2021-04-08T23:50:33Z

Test Results

Kodi 18.9
Success!
you can install a new version and it'll correctly use the new libinputstream.adaptive.so from the add-on directory and still use the old libssd_wv.so which hasn't had any changes - so is fine.
Note: If IA has been used before update - you need to restart Kodi otherwise it keeps using the old .so

Kodi 19
Success!
No reboot needed.

Here is the log
kodi.log.txt

Boot Kodi 19
Try to play add-on that needs latest fix - error (https://codeload.github.com/luivit/plugin.video.rivedila7/zip/refs/heads/master)
Install latest zip with above PR (https://jenkins.kodi.tv/job/xbmc/job/inputstream.adaptive/job/PR-636/1/artifact/cmake/addons/build/zips/inputstream.adaptive+android-aarch64/inputstream.adaptive-2.6.11.zip)
Try to play add-on - works

From the log:

Loading: /data/app/org.xbmc.kodi-kHmUamwIh-bXF2AKco5lSQ==/lib/arm64/libinputstream.adaptive.so
Found decrypter: /data/app/org.xbmc.kodi-kHmUamwIh-bXF2AKco5lSQ==/lib/arm64/libssd_wv.so

changes to

caching /storage/emulated/0/Android/data/org.xbmc.kodi/files/.kodi/addons/inputstream.adaptive/libinputstream.adaptive.so to /data/user/0/org.xbmc.kodi/cache/lib/libinputstream.adaptive.so
Loading: /data/user/0/org.xbmc.kodi/cache/lib/libinputstream.adaptive.so

Caching '/storage/emulated/0/Android/data/org.xbmc.kodi/files/.kodi/addons/inputstream.adaptive/libssd_wv.so' to '/data/user/0/org.xbmc.kodi/cache/lib/libssd_wv.so'
Found decrypter: /storage/emulated/0/Android/data/org.xbmc.kodi/files/.kodi/addons/inputstream.adaptive/libssd_wv.so

So using the correct libinputstream.adaptive.so and libssd_wv.so without any reboot needed

@glennguy interesting that libssd_wv.so automatically gets cached but we don't use the cached version...
Unless we are just not logging the cached path and it actually uses /data/user/0/org.xbmc.kodi/cache/lib/libssd_wv.so

Plan of attack
Kodi 18 doesn't need this PR
As it's not going into the Repo for Android - users can manually install it on Android if required

Kodi 19

Merge this PR with a version bump and android builds added to https://github.com/xbmc/inputstream.adaptive/blob/Matrix/Jenkinsfile
(pretty sure it just needs changing to buildPlugin(version: "Matrix") - same as PVR simple)
That should get it into the Matrix Repo and Android Kodi 19 should pull the update and work fine
Make sure Inputstream Adaptive is removed from being included in Android Kodi builds

glennguy · 2021-04-09T12:12:13Z

Thanks heaps for testing

Unless we are just not logging the cached path and it actually uses /data/user/0/org.xbmc.kodi/cache/lib/libssd_wv.so

I think that's the case, DllHelper logging where it's moved to and IA is just logging the path the decrypter was found in.

matthuisman · 2021-04-10T02:35:45Z

did up a test repo:

Start with stock Kodi 19
Enable debug logging
Install https://f.mjh.nz/test/plugin.video.rivedila7-Matrix.zip (test add-on)
Try to play "LA7 Live" - won't work
Install repo: https://f.mjh.nz/test/repository.inputstream.adaptive.0.0.1.zip
Update Inputstream Adaptive to 2.6.12
(@howie-f - I noticed it wouldn't auto-update or show in updates even with Update official add-ons from Any repositories.
It does show via Select version though - maybe because binary add-on. I'm just using stock 19 from playstore)
Try to play "LA7 Live" - will work
Confirm in log that IA correctly loads
/data/user/0/org.xbmc.kodi/cache/lib/libinputstream.adaptive.so&
/storage/emulated/0/Android/data/org.xbmc.kodi/files/.kodi/addons/inputstream.adaptive/libssd_wv.so

Here is my log:
kodi.log.txt

Conclusion - this PR looks good once @howie-f can confirm what may be happening with the update
hopefully if it's in the official repo it will detect update

howie-f · 2021-04-10T04:05:55Z

what may be happening with the update ?

update should be detected when the add-on hits the official repo. as system add-ons and manually installed are bound to official repo update checks.

glennguy · 2021-04-10T12:15:04Z

As @matthuisman pointed out above:

Kodi 19

Merge this PR with a version bump and android builds added to https://github.com/xbmc/inputstream.adaptive/blob/Matrix/Jenkinsfile
(pretty sure it just needs changing to buildPlugin(version: "Matrix") - same as PVR simple)

That should get it into the Matrix Repo and Android Kodi 19 should pull the update and work fine

Make sure Inputstream Adaptive is removed from being included in Android Kodi builds

Point 1 is solved in this PR
Point 2 has been tested as far as "work fine" goes, and @howie-f has pointed out that the new add-on system for 19 will allow auto updating the built-in/system add-on if from the official repo
Point 3 should be then taken care of after merge and confirmation that we don't have any unforeseen issues (🤞 ). I've looked but haven't found anything on github/xbmc that controls which binary add-ons are included in Android build/packaging... Apart from this we are ready to go.

phunkyfish · 2021-04-10T12:38:22Z

So this is ready to merge and release?

glennguy · 2021-04-10T12:39:33Z

yes ready to go

phunkyfish · 2021-04-10T13:11:32Z

Ok I’ll merge and release 2.6.12 shortly.

phunkyfish · 2021-04-10T13:14:35Z

Do you want to add to the changelog that this make adaptive update from repo for android?

EDIT, I can update that after this is merged.

phunkyfish

LGTM

glennguy force-pushed the android-search-paths branch from ef78a57 to b04f7d7 Compare February 9, 2021 05:14

ksooo mentioned this pull request Feb 16, 2021

[addons] declare inputstream.adaptive as optional system add-on xbmc/xbmc#19240

Merged

3 tasks

phunkyfish added the require discussion label Mar 31, 2021

glennguy added 2 commits April 9, 2021 21:30

Remove Android specific decrypter search paths

40f4429

Bump to version 2.6.12

732d850

glennguy force-pushed the android-search-paths branch from b04f7d7 to 732d850 Compare April 9, 2021 11:35

matthuisman mentioned this pull request Apr 10, 2021

[Leia] Backport Matrix bug fixes #634

Merged

phunkyfish approved these changes Apr 10, 2021

View reviewed changes

phunkyfish merged commit e8f2106 into xbmc:Matrix Apr 10, 2021

phunkyfish removed the require discussion label Apr 10, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change decrypter search path for Android #601

Change decrypter search path for Android #601

glennguy commented Feb 9, 2021

matthuisman commented Feb 9, 2021 •

edited

glennguy commented Feb 9, 2021

matthuisman commented Feb 9, 2021 •

edited

glennguy commented Feb 9, 2021

glennguy commented Feb 9, 2021

matthuisman commented Feb 9, 2021

howie-f commented Feb 10, 2021

matthuisman commented Apr 8, 2021 •

edited

glennguy commented Apr 8, 2021

matthuisman commented Apr 8, 2021 •

edited

glennguy commented Apr 9, 2021

matthuisman commented Apr 10, 2021 •

edited

howie-f commented Apr 10, 2021

glennguy commented Apr 10, 2021

phunkyfish commented Apr 10, 2021

glennguy commented Apr 10, 2021

phunkyfish commented Apr 10, 2021

phunkyfish commented Apr 10, 2021 •

edited

phunkyfish left a comment

Change decrypter search path for Android #601

Change decrypter search path for Android #601

Conversation

glennguy commented Feb 9, 2021

matthuisman commented Feb 9, 2021 • edited

glennguy commented Feb 9, 2021

matthuisman commented Feb 9, 2021 • edited

glennguy commented Feb 9, 2021

glennguy commented Feb 9, 2021

matthuisman commented Feb 9, 2021

howie-f commented Feb 10, 2021

matthuisman commented Apr 8, 2021 • edited

glennguy commented Apr 8, 2021

matthuisman commented Apr 8, 2021 • edited

glennguy commented Apr 9, 2021

matthuisman commented Apr 10, 2021 • edited

howie-f commented Apr 10, 2021

glennguy commented Apr 10, 2021

phunkyfish commented Apr 10, 2021

glennguy commented Apr 10, 2021

phunkyfish commented Apr 10, 2021

phunkyfish commented Apr 10, 2021 • edited

phunkyfish left a comment

Choose a reason for hiding this comment

matthuisman commented Feb 9, 2021 •

edited

matthuisman commented Feb 9, 2021 •

edited

matthuisman commented Apr 8, 2021 •

edited

matthuisman commented Apr 8, 2021 •

edited

matthuisman commented Apr 10, 2021 •

edited

phunkyfish commented Apr 10, 2021 •

edited