Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-07 22:02:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'qml_app_avatar_picker' into GSoC2017-evaluation-II

Browse source
This commit is contained in:
Gioacchino Mazzurco 2017-07-19 13:33:40 +02:00
commit 5f0cb3ce5d
9 changed files with 286 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
retroshare-qml-app/src/main-app.qml
View file

@ -364,7 +364,7 @@ ApplicationWindow
function handleIntentUri(uriStr)
{
console.log("handleIntentUri(uriStr)")
console.log("handleIntentUri(uriStr)", uriStr)
if(!Array.isArray(uriStr.match(/:\/\/[a-zA-Z.-]*\//g)))
{
@ -382,7 +382,10 @@ ApplicationWindow
var uri = new UriJs.URI(uriStr)
var hPath = uri.path() // no nesting ATM segmentCoded()
console.log(hPath)
console.log("hPath", hPath)
var authority = uri.authority()
console.log("authority", authority)
if(typeof uriHandlersRegister[hPath] == "function")
{
@ -390,6 +393,13 @@ ApplicationWindow
hPath, uriHandlersRegister[hPath])
uriHandlersRegister[hPath](uriStr)
}
else if (typeof uriHandlersRegister[authority] == "function" )
{
console.log("handleIntentUri(uriStr)", "found handler for path",
authority, uriHandlersRegister[authority])
uriHandlersRegister[authority](uriStr)
}
}
function certificateLinkHandler(uriStr)