Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-17 10:59:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Open contacts view on click unread notification

Browse source
This commit is contained in:
Angela Mazzurco 2017-07-31 16:52:03 +02:00
parent 93d778a577
commit c86b7c79ae
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-android-notify-service/src/main.qml
View file

@ -46,7 +46,8 @@ QtObject
qsTr("%1 Unread %2 from %3") qsTr("%1 Unread %2 from %3")
.arg(json.data[0].unread_count) .arg(json.data[0].unread_count)
.arg(json.data[0].unread_count > 1 ? "messages" : "message") .arg(json.data[0].unread_count > 1 ? "messages" : "message")
.arg(json.data[0].remote_author_name) .arg(json.data[0].remote_author_name),
qsTr("/contacts")
) )
} }
} }

8
retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareQmlActivity.java
View file

@ -65,12 +65,16 @@ public class RetroShareQmlActivity extends QtActivity
@Override @Override
public void onNewIntent(Intent intent) public void onNewIntent(Intent intent)
{ {
Log.i("RetroShareQmlActivity", "onNewIntent(Intent intent)"); Log.i("RetroShareQmlActivity", "on NewIntent(Intent intent)");
super.onNewIntent(intent); super.onNewIntent(intent);
String uri = intent.getDataString(); String uri = intent.getDataString();
if (uri != null) NativeCalls.notifyIntentUri(uri); if (uri != null)
{
NativeCalls.notifyIntentUri(uri);
Log.i("RetroShareQmlActivity", "onNewIntent(Intent intent) Uri: " + uri);
}
} }
@UsedByNativeCode @SuppressWarnings("unused") @UsedByNativeCode @SuppressWarnings("unused")

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

@ -41,6 +41,7 @@ ApplicationWindow
{ {
addUriHandler("/certificate", certificateLinkHandler) addUriHandler("/certificate", certificateLinkHandler)
addUriHandler("/identity", contactLinkHandler) addUriHandler("/identity", contactLinkHandler)
addUriHandler("/contacts", openContactsViewLinkHandler)
var argc = mainArgs.length var argc = mainArgs.length
for(var i=0; i<argc; ++i) for(var i=0; i<argc; ++i)
@ -477,6 +478,15 @@ ApplicationWindow
) )
} }
} }
function openContactsViewLinkHandler (uriStr)
{
if(coreReady)
{
stackView.push("qrc:/Contacts.qml" )
}
}
Popup Popup
{ {
id: contactImportPopup id: contactImportPopup