Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qml App token manager offer unregister token API

Browse Source 
This way components can unregister callbacks when not interested anymore
Use the new mechanism to unregister TrustedNodesView callback on
destruction to avoid attempt to excecute code not valid anymore
This commit is contained in:
Gioacchino Mazzurco 2018-02-01 14:22:33 +01:00
parent 1e3d2c2c9b
commit 9a9fcca1a9
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
retroshare-qml-app/src/TokensManager.qml
View File

@ -1,6 +1,6 @@
/*
* RetroShare Android QML App
* Copyright (C) 2017 Gioacchino Mazzurco <gio@eigenlab.org>
* Copyright (C) 2017-2018 Gioacchino Mazzurco <gio@eigenlab.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -30,7 +30,7 @@ QtObject
{
if(!maybeToken(token))
{
console.error("TokensManager attempt to register a non int token")
console.error("TokensManager attempt to register a non int token: ", token)
console.trace()
return
}
@ -60,8 +60,41 @@ QtObject
}
else tokens[token] = [callback]
}
function unRegisterToken(token, callback)
{
if(!maybeToken(token))
{
console.error("TokensManager attempt to unregister a non int token: ", token)
console.trace()
return
}
var remCount = 0;
var arrLen = tokens[token].length
for(var i=0; i<arrLen; ++i)
{
if(callback === tokens[token][i])
{
tokens[token].splice(i,1)
++remCount
}
}
if(remCount === 0)
{
console.warn("TokensManager attempt to unregister unregistered callback", token, callback.name)
console.trace()
}
}
function tokenExpire(token)
{
if(!maybeToken(token))
{
console.error("TokensManager attempt to expire a non int token: ", token)
console.trace()
return
}
if(Array.isArray(tokens[token]))
{
var arrLen = tokens[token].length

3
retroshare-qml-app/src/TrustedNodesView.qml
View File

@ -1,6 +1,6 @@
/*
* RetroShare Android QML App
* Copyright (C) 2016-2017 Gioacchino Mazzurco <gio@eigenlab.org>
* Copyright (C) 2016-2018 Gioacchino Mazzurco <gio@eigenlab.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@ -28,6 +28,7 @@ Item
property int token: 0
Component.onCompleted: refreshData()
Component.onDestruction: TokensManager.unRegisterToken(token, refreshData)
onVisibleChanged: visible && refreshData()
function refreshDataCallback(par)