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
efd14e4465
RetroShare/retroshare-qml-app/src/retroshare-qml-app.pro

53 lines
1.3 KiB
Prolog
Raw Normal View History

Retroshare android service now run and start at boot on android, the qml app is still disfunctional
2016-08-22 21:19:33 -04:00
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
Added Qt SVG module dependency
2017-06-19 12:03:07 -04:00
QT += core network qml quick svg
Retroshare android service now run and start at boot on android, the qml app is still disfunctional
2016-08-22 21:19:33 -04:00
CONFIG += c++11
QML app fix: crash closing, notification deadlock The crash was introduced at 533dbef0c79b37b6c50c9176235d2e5d0193918b This has been particurarly tricky as lot of different parts contributed in causing unexpected behaviours When the activity is created onNewIntent is not called and we have to get the intent data from C++ bu other means, but C++ code is running in a different thread so there is no guarantee that the intent data is reacheable yet on starting, so the C++ code has to wait for the intent data being ready, but paying attention to not cause a deadlock beetween the two thread (the android ui thread may be waiting for some operation performed by Qt) Because of notification intent flags not properly set the activity was recreated also if it was already on top, this caused a nasty interaction between android ui thread and qt thread that derived in a deadlock, to avoid this lot of try/error has been made until the proper soup of manifest and intent flags has been found At this point link handling, notification handling, and Activity closing should work as expected without any deadlock or crash
2017-04-14 20:17:27 -04:00
HEADERS += libresapilocalclient.h \
Qml App: better Android interaction on URL export Clipboard usage is uncommon in Android so export the URL via Intent too that is the common pattern on Android
2017-07-04 10:27:12 -04:00
rsqmlappengine.h \
Merge remote-tracking branch 'retro/master' into qml_app_avatar_picker
2017-07-12 11:56:26 -04:00
androidimagepicker.h \
Qml App: better Android interaction on URL export Clipboard usage is uncommon in Android so export the URL via Intent too that is the common pattern on Android
2017-07-04 10:27:12 -04:00
platforminteracions.h
QML app fix: crash closing, notification deadlock The crash was introduced at 533dbef0c79b37b6c50c9176235d2e5d0193918b This has been particurarly tricky as lot of different parts contributed in causing unexpected behaviours When the activity is created onNewIntent is not called and we have to get the intent data from C++ bu other means, but C++ code is running in a different thread so there is no guarantee that the intent data is reacheable yet on starting, so the C++ code has to wait for the intent data being ready, but paying attention to not cause a deadlock beetween the two thread (the android ui thread may be waiting for some operation performed by Qt) Because of notification intent flags not properly set the activity was recreated also if it was already on top, this caused a nasty interaction between android ui thread and qt thread that derived in a deadlock, to avoid this lot of try/error has been made until the proper soup of manifest and intent flags has been found At this point link handling, notification handling, and Activity closing should work as expected without any deadlock or crash
2017-04-14 20:17:27 -04:00
SOURCES += main-app.cpp \
libresapilocalclient.cpp \
rsqmlappengine.cpp
Retroshare android service now run and start at boot on android, the qml app is still disfunctional
2016-08-22 21:19:33 -04:00
RESOURCES += qml.qrc
Qml App: better Android interaction on URL export Clipboard usage is uncommon in Android so export the URL via Intent too that is the common pattern on Android
2017-07-04 10:27:12 -04:00
# Platform interaction specific code
Implement Android intent handling in qml app AndroidManifest.xml register activity as an handler for retroshare links RetroShareQmlActivity...NativeCalls.cpp bring the intent data from java to C++ and then to QML QMl mainWindow uses URI.js to parse the received uri Create a singleton for qml engine so it is reachable from NativeCalls
2017-04-11 07:11:57 -04:00
android-g++ {
QML app fix: crash closing, notification deadlock The crash was introduced at 533dbef0c79b37b6c50c9176235d2e5d0193918b This has been particurarly tricky as lot of different parts contributed in causing unexpected behaviours When the activity is created onNewIntent is not called and we have to get the intent data from C++ bu other means, but C++ code is running in a different thread so there is no guarantee that the intent data is reacheable yet on starting, so the C++ code has to wait for the intent data being ready, but paying attention to not cause a deadlock beetween the two thread (the android ui thread may be waiting for some operation performed by Qt) Because of notification intent flags not properly set the activity was recreated also if it was already on top, this caused a nasty interaction between android ui thread and qt thread that derived in a deadlock, to avoid this lot of try/error has been made until the proper soup of manifest and intent flags has been found At this point link handling, notification handling, and Activity closing should work as expected without any deadlock or crash
2017-04-14 20:17:27 -04:00
QT += androidextras
Qml App: better Android interaction on URL export Clipboard usage is uncommon in Android so export the URL via Intent too that is the common pattern on Android
2017-07-04 10:27:12 -04:00
HEADERS += NativeCalls.h androidplatforminteracions.h
SOURCES += NativeCalls.cpp androidplatforminteracions.cpp
} else {
HEADERS += defaultplatforminteracions.h
SOURCES += defaultplatforminteracions.cpp
Implement Android intent handling in qml app AndroidManifest.xml register activity as an handler for retroshare links RetroShareQmlActivity...NativeCalls.cpp bring the intent data from java to C++ and then to QML QMl mainWindow uses URI.js to parse the received uri Create a singleton for qml engine so it is reachable from NativeCalls
2017-04-11 07:11:57 -04:00
}
Retroshare android service now run and start at boot on android, the qml app is still disfunctional
2016-08-22 21:19:33 -04:00
# Additional import path used to resolve QML modules in Qt Creator's code model
Implement a working Distant Chat prototype in Qml Deprecate id field in JSON API as it may cause problems in Qml Offer gxs_id field in JSON API as an id alternative LibresapiLocalClient support callbacks now an instance may be shared for different tasks Expose an instance of LibresapiLocalClient to Qml, type exposure is kept for retrocompatibility but deprecated Qml app now has a tab that permit to exchange some message with selected distant peer
2016-12-08 09:56:23 -05:00
#QML_IMPORT_PATH =
Improve Contacts: sorting, searching and unread ChatHandler::handleUnreadMsgs(...) deprecate 'id' field in favour of 'chat_id' IdentityHandler::handleWildcard(...) reduce sleep time from 500 to 50 ms IdentityHandler::handleWildcard(...) expose 'is_contact' to JSON API Split contacts list delegate into GxsIdentityDelegate.qml Update to QtQuick.Controls 2.0 because 1.4 is not supported anymore and 2.1 is not available yet in Qt 5.7.1 ChatView.qml mark messages as read Set refreshTimer.triggeredOnStart=true to improve reponsiveness of views Contacts.qml use a Popup that is available in Controls 2.0 instead of a castrated Dialog to display full fingerprint TrustedNodesView.qml check if locations[*].is_online is an array before attempting calling reduce main.qml added menuentry to shutdown de core main.qml added menuantry to search contact
2017-03-24 07:02:13 -04:00
#QML2_IMPORT_PATH =
Retroshare android service now run and start at boot on android, the qml app is still disfunctional
2016-08-22 21:19:33 -04:00
# Default rules for deployment.
include(deployment.pri)
DISTFILES += \
android/AndroidManifest.xml \
android/gradle/wrapper/gradle-wrapper.jar \
android/gradlew \
android/res/values/libs.xml \
android/build.gradle \
android/gradle/wrapper/gradle-wrapper.properties \
Multiple Qml app improvements LibresapiLocalClient::request(...) return a meaningful value ChatView.qml uses a TextField for message input TrustedNodesView.qml improve aestetic main.qml use stack based navigation and tool/menubar
2017-03-17 12:22:58 -04:00
android/gradlew.bat \
Implemented certificate link handling Move content of qml directory to parent directory src Message notification take care of plurar/singular Fix compilation of service for non-android linux AddTrustedNode.qml show node details for confirmation before adding Added TrustedNodeDetails.qml to show nodes details TrustedNodesView.qml show node details on click Qml app added minimal infrastructure to delegate link handling Removed unused icons
2017-04-13 10:47:27 -04:00
icons/retroshare06.png
Retroshare android service now run and start at boot on android, the qml app is still disfunctional
2016-08-22 21:19:33 -04:00
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
DEPENDPATH *= ../../libretroshare/src
INCLUDEPATH *= ../../libretroshare/src
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
LIBS *= ../../libretroshare/src/lib/libretroshare.a
Reference in New Issue Copy Permalink