diff --git a/retroshare-android-notify-service/src/main.qml b/retroshare-android-notify-service/src/main.qml index 63615f77e..99ef28ac2 100644 --- a/retroshare-android-notify-service/src/main.qml +++ b/retroshare-android-notify-service/src/main.qml @@ -41,10 +41,17 @@ QtObject "unread conversations") notificationsBridge.notify( qsTr("New message!"), - qsTr("Unread messages in %1 %2").arg(convCnt).arg( - convCnt > 1 ? - qsTr("conversations") : qsTr("conversation") - ) + (convCnt > 1) ? + qsTr("Unread messages in %1 conversations").arg(convCnt): + qsTr("%1 Unread %2 from %3") + .arg(json.data[0].unread_count) + .arg(json.data[0].unread_count > 1 ? "messages" : "message") + .arg(json.data[0].remote_author_name), + qsTr("/contacts%1").arg( + convCnt == 1? + "?gxsId="+json.data[0].remote_author_id + + "&name="+json.data[0].remote_author_name + : "") ) } } diff --git a/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareQmlActivity.java b/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareQmlActivity.java index 365778142..168d9286c 100644 --- a/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareQmlActivity.java +++ b/retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareQmlActivity.java @@ -65,12 +65,16 @@ public class RetroShareQmlActivity extends QtActivity @Override public void onNewIntent(Intent intent) { - Log.i("RetroShareQmlActivity", "onNewIntent(Intent intent)"); + Log.i("RetroShareQmlActivity", "on NewIntent(Intent intent)"); super.onNewIntent(intent); 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") diff --git a/retroshare-qml-app/src/main-app.qml b/retroshare-qml-app/src/main-app.qml index f98f66fa7..22c03bf94 100644 --- a/retroshare-qml-app/src/main-app.qml +++ b/retroshare-qml-app/src/main-app.qml @@ -41,6 +41,7 @@ ApplicationWindow { addUriHandler("/certificate", certificateLinkHandler) addUriHandler("/identity", contactLinkHandler) + addUriHandler("/contacts", openContactsViewLinkHandler) var argc = mainArgs.length for(var i=0; i