diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88150d9..41b286a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+# [0.06] - UNRELEASED
+### Changed
+
+### Added
+- Dark mode
+- QR-Code scanning
+- Sharing of every view using either link, QR-Code or a poster
+- Text which is too large too fit is scrollable now in most places
+- German translations
+- URL handler for https://l.bluerock.dev and https://app.bluerock.dev
+
# [0.05] - 2021-06-07
### Changed
- the boulder result rect doesn't have a background if there is no result now
@@ -16,7 +27,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- the calendar now scrolls less far down
- improoved layout in landscape mode
- some design changes in profile page and speed flowchart
-- added second link for "further infos" in calendar
+
+### Added
+- Second link for "further infos" in calendar
# [0.03.0] - 2019-07-11
### Added
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index be5f1c5..a78be6b 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -10,7 +10,7 @@
-
+
diff --git a/android/build.gradle b/android/build.gradle
index de92470..7ef94c3 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -73,7 +73,7 @@ android {
defaultConfig {
resConfig "en"
minSdkVersion = qtMinSdkVersion
- targetSdkVersion = 29
+ targetSdkVersion = qtTargetSdkVersion
}
lintOptions {
diff --git a/android/src/de/itsblue/blueROCK/MainActivity.java b/android/src/de/itsblue/blueROCK/MainActivity.java
index 8bf57ae..c070a26 100755
--- a/android/src/de/itsblue/blueROCK/MainActivity.java
+++ b/android/src/de/itsblue/blueROCK/MainActivity.java
@@ -61,18 +61,18 @@ public class MainActivity extends QtActivity
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- Log.d("ekkescorner", "onCreate QShareActivity");
- // now we're checking if the App was started from another Android App via Intent
- Intent theIntent = getIntent();
- if (theIntent != null){
- String theAction = theIntent.getAction();
- if (theAction != null){
- Log.d("ekkescorner onCreate ", theAction);
- // QML UI not ready yet
- // delay processIntent();
- isIntentPending = true;
- }
+ Log.d("ekkescorner", "onCreate QShareActivity");
+ // now we're checking if the App was started from another Android App via Intent
+ Intent theIntent = getIntent();
+ if (theIntent != null){
+ String theAction = theIntent.getAction();
+ if (theAction != null){
+ Log.d("ekkescorner onCreate ", theAction);
+ // QML UI not ready yet
+ // delay processIntent();
+ isIntentPending = true;
}
+ }
} // onCreate
// WIP - trying to find a solution to survive a 2nd onCreate
@@ -96,6 +96,7 @@ public class MainActivity extends QtActivity
// this method here - otherwise you'll get wrong request or result codes
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
// Check which request we're responding to
Log.d("ekkescorner onActivityResult", "requestCode: "+requestCode);
if (resultCode == RESULT_OK) {
diff --git a/blueROCK.pro b/blueROCK.pro
index 2ad3af7..1ddd50a 100644
--- a/blueROCK.pro
+++ b/blueROCK.pro
@@ -89,7 +89,7 @@ android {
ANDROID_VERSION_NAME = $$VERSION
ANDROID_VERSION_CODE = $$droidVersionCode($$ANDROID_VERSION_NAME)
- message(Android version code: $$ANDROID_VERSION_CODE)
+ ANDROID_TARGET_SDK_VERSION = 29
include(/home/dorian/Android/Sdk/android_openssl/openssl.pri)
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
diff --git a/resources/qml/Components/MovingLabel.qml b/resources/qml/Components/MovingLabel.qml
new file mode 100644
index 0000000..c7f1ca8
--- /dev/null
+++ b/resources/qml/Components/MovingLabel.qml
@@ -0,0 +1,88 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Controls.Material 2.12
+
+Item {
+ id: control
+
+ property alias text: firstLabel.text
+ property alias font: firstLabel.font
+ property alias verticalAlignment: firstLabel.verticalAlignment
+ property int spacing: 30
+
+ property MovingLabel syncWithLabel
+ property int _spacing: syncWithLabel && syncWithLabel._labelWidth > _labelWidth ? (syncWithLabel._labelWidth - _labelWidth + syncWithLabel.spacing) : spacing
+ property alias _labelWidth: firstLabel.width
+
+ signal linkActivated(string link)
+
+ clip: true
+ height: firstLabel.height
+
+ onTextChanged: {
+ _resetScroll()
+ }
+
+ function startScroll(triggerSyncedLabel=true) {
+ if(control.syncWithLabel && triggerSyncedLabel)
+ control.syncWithLabel.startScroll(false)
+ if(control.width < firstLabel.width && !scrollAnimation.running)
+ scrollAnimation.start()
+ }
+
+ function _resetScroll() {
+ scrollAnimation.stop()
+ firstLabel.anchors.leftMargin = 0
+ }
+
+ Label {
+ id: firstLabel
+
+ anchors {
+ left: parent.left
+ verticalCenter: parent.verticalCenter
+ }
+
+ onLinkActivated: control.onLinkActivated(link)
+ }
+
+ Label {
+ id: secondLabel
+
+ anchors {
+ left: firstLabel.right
+ leftMargin: control._spacing
+ verticalCenter: firstLabel.verticalCenter
+ }
+
+ visible: scrollAnimation.running
+
+ font: firstLabel.font
+ text: firstLabel.text
+ verticalAlignment: firstLabel.verticalAlignment
+ elide: firstLabel.elide
+ bottomPadding: firstLabel.bottomPadding
+ padding: firstLabel.padding
+
+ onLinkActivated: control.onLinkActivated(link)
+ }
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: control.startScroll()
+ }
+
+ NumberAnimation {
+ id: scrollAnimation
+ target: firstLabel
+ property: "anchors.leftMargin"
+ from: 0
+ to: -(firstLabel.width + control._spacing)
+ duration: (to / -100) * 1500
+
+ onRunningChanged: {
+ if(!running)
+ control._resetScroll()
+ }
+ }
+}
diff --git a/resources/qml/Components/SelectorPopup.qml b/resources/qml/Components/SelectorPopup.qml
index 3e7c058..356441e 100644
--- a/resources/qml/Components/SelectorPopup.qml
+++ b/resources/qml/Components/SelectorPopup.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.4
+import QtQuick 2.15
+import QtQuick.Controls 2.15
import QtQuick.Controls.Material 2.3
Dialog {
@@ -33,37 +33,35 @@ Dialog {
id: selectorPuHeaderCol
width: control.width
- height: headerSubLa.text !== "" && headerLa.text !== "" ? 73 : 40
+ height: headerLa.height + headerTopSpacerItm.height + (control.subTitle ? headerSubLa.height:0)
- Label {
+ Item {
+ id: headerTopSpacerItm
+ height: control.padding
+ width: parent.width
+ }
+
+ MovingLabel {
id: headerLa
- visible: control.title
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: selectorPuHeaderCol.width - control.padding * 2
- width: selectorPuHeaderCol.width
-
- elide: "ElideRight"
- padding: control.padding
- bottomPadding: 0
font.bold: true
font.pixelSize: 16
text: control.title
- onLinkActivated: {
- control.linkActivated(link)
- }
+ onLinkActivated: control.linkActivated(link)
}
Label {
id: headerSubLa
- visible: control.subTitle
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: selectorPuHeaderCol.width - control.padding * 2
- width: selectorPuHeaderCol.width
-
- elide: "ElideRight"
- padding: control.padding
+ wrapMode: Text.Wrap
topPadding: 5
bottomPadding: 0
font.bold: true
diff --git a/resources/qml/Components/SpeedFlowChartLocker.qml b/resources/qml/Components/SpeedFlowChartLocker.qml
index 27acda2..f636caa 100644
--- a/resources/qml/Components/SpeedFlowChartLocker.qml
+++ b/resources/qml/Components/SpeedFlowChartLocker.qml
@@ -4,13 +4,10 @@ import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.15
import QtPurchasing 1.12
-Rectangle {
- id: speedFlowChartLockedOverlay
+Page {
+ id: control
anchors.fill: parent
- anchors.margins: -20
-
- color: Material.background
Connections {
target: speedFlowChartProduct
@@ -38,42 +35,40 @@ Rectangle {
}
}
- ColumnLayout {
+ Column {
id: lockedLayout
anchors {
fill: parent
- topMargin: parent.height * 0.05
+ topMargin: parent.height * 0.02
bottomMargin: parent.height * 0.05
rightMargin: parent.width * 0.1 + 20
leftMargin: parent.width * 0.1 + 20
}
- //spacing: parent.height * 0.05
+ spacing: lockedLayout.height * 0.01
Label {
- Layout.fillWidth: true
-
- height: parent.height * 0.015
-
+ anchors.horizontalCenter: parent.horizontalCenter
+ height: lockedLayout.height * 0.03
+ width: lockedLayout.width
//% "This is a premium feature."
text: qsTrId("#thisIsAPremiumFeature")
- font.bold: true
font.pixelSize: height
+ font.bold: true
fontSizeMode: Text.Fit
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
minimumPixelSize: 1
-
- horizontalAlignment: Text.AlignHCenter
-
}
SwipeGallery {
property string platformIcons: Qt.platform.os === "osx" || Qt.platform.os === "iso" ? "ios":"android"
- Layout.fillHeight: true
- Layout.fillWidth: true
+ height: lockedLayout.height * 0.85
+ width: lockedLayout.width
images: [
"qrc:/screenshots/SpeedFlowchartDemo/" + platformIcons + "/1.jpeg",
@@ -84,25 +79,33 @@ Rectangle {
Button {
id: purchaseBt
- Layout.alignment: Layout.Center
+ anchors.horizontalCenter: parent.horizontalCenter
+ height: lockedLayout.height * 0.07
enabled: speedFlowChartProduct.status === Product.Registered
text: speedFlowChartProduct.status === Product.Registered
- ? "\uf218 "+ qsTrId("#buyNowFor") +" " + speedFlowChartProduct.price
+ ? "\uf218 "+ qsTrId("#buyNowFor") + " " + speedFlowChartProduct.price
: qsTrId("#itemIsUnavailable")
font.family: fa5solid.name
+ font.pixelSize: height * 0.4
+ font.capitalization: Font.MixedCase
onClicked: speedFlowChartProduct.purchase()
}
RowLayout {
+ id: bottomRow
- Layout.alignment: Layout.Center
+ anchors.horizontalCenter: parent.horizontalCenter
+ height: lockedLayout.height * 0.065
Button {
id: restorePurchaseButton
Layout.alignment: Layout.Center
- visible: speedFlowChartProduct.status === Product.Registered
+ Layout.preferredHeight: bottomRow.height
+ //visible: speedFlowChartProduct.status === Product.Registered
flat: true
+ font.pixelSize: height * 0.4
+ font.capitalization: Font.MixedCase
//% "Restore purchase"
text: qsTrId("#restorePurchase")
@@ -112,8 +115,11 @@ Rectangle {
Button {
id: contactSupportButton
Layout.alignment: Layout.Center
+ Layout.preferredHeight: bottomRow.height
flat: true
+ font.pixelSize: height * 0.4
+ font.capitalization: Font.MixedCase
//% "contact support"
text: qsTrId("#contact support")
diff --git a/resources/qml/Components/SpeedFlowChartPopup.qml b/resources/qml/Components/SpeedFlowChartPopup.qml
index 5456a8d..3200d82 100644
--- a/resources/qml/Components/SpeedFlowChartPopup.qml
+++ b/resources/qml/Components/SpeedFlowChartPopup.qml
@@ -11,6 +11,9 @@ Rectangle {
//property bool unlocked: QT_DEBUG || appSettings.read("speedBackendPurchase") === "1"
property bool unlocked: appSettings.read("speedBackendPurchase") === "1"
+ Component.onCompleted: {
+ console.warn("unlocked:", appSettings.read("speedBackendPurchase"))
+ }
state: "hidden"
diff --git a/resources/qml/Components/SwipeGallery.qml b/resources/qml/Components/SwipeGallery.qml
index d159c5c..ea07b81 100644
--- a/resources/qml/Components/SwipeGallery.qml
+++ b/resources/qml/Components/SwipeGallery.qml
@@ -14,6 +14,7 @@ Item {
anchors.fill: parent
anchors.margins: 1
anchors.bottomMargin: indicator.height
+ spacing: width * 0.2
Repeater {
model: control.images.length
diff --git a/resources/qml/Pages/StartPage.qml b/resources/qml/Pages/StartPage.qml
index eb8b0db..2b766eb 100644
--- a/resources/qml/Pages/StartPage.qml
+++ b/resources/qml/Pages/StartPage.qml
@@ -94,7 +94,7 @@ Page {
}
width: app.landscape() ? childrenRect.width : parent.width * 0.8
- height: app.landscape() ? headerBadge.height : headerBadge.height * 2
+ height: app.landscape() ? headerBadge.height : Math.min(headerBadge.height * 2, width * 0.27)
columnSpacing: height * 0.1
diff --git a/resources/qml/Widgets/StartlistWidget.qml b/resources/qml/Widgets/StartlistWidget.qml
index 2c1e1e9..44cce04 100644
--- a/resources/qml/Widgets/StartlistWidget.qml
+++ b/resources/qml/Widgets/StartlistWidget.qml
@@ -95,7 +95,7 @@ DataListView {
}
}
- selector.appear(selectOptions, qsTrId("#startlistHeadline"))
+ selector.appear(selectOptions, qsTrId("#selectCategory"))
}
Connections {
diff --git a/resources/qml/main.qml b/resources/qml/main.qml
index 45c3334..c6b3e84 100644
--- a/resources/qml/main.qml
+++ b/resources/qml/main.qml
@@ -195,7 +195,7 @@ Window {
//app.openAthlete() // dorian: 53139 , rustam: 6933 , helen: 53300
//openWidget({nation:'GER'})
//mainStack.push("Pages/AthleteSearchPage.qml")
- //openWidget({comp: 11651, cat: 26})
+ openWidget({comp: 11651, cat: 26})
//openWidget({person: 6623})
//console.log(JSON.stringify(serverConn.getParamsFromUrl("")))
//openWidgetFromUrl("https://l.bluerock.dev/?comp=11601&type=starters")
@@ -321,15 +321,13 @@ Window {
height: childrenRect.height
width: parent.width - extraComponentLoader.width - toolButton.width - 3 * parent.spacing
- Label {
+ MovingLabel {
id: toolBarTitleLa
+ syncWithLabel: toolBarSubTitleLa
width: parent.width
-
scale: 1
- elide: "ElideRight"
-
font.bold: true
verticalAlignment: Text.AlignVCenter
@@ -361,13 +359,13 @@ Window {
}
}
- Label {
+ MovingLabel {
id: toolBarSubTitleLa
- width: parent.width
- height: text !== "" ? undefined:0
+ visible: text !== ""
- elide: "ElideRight"
+ syncWithLabel: toolBarTitleLa
+ width: parent.width
font.bold: false
@@ -380,7 +378,7 @@ Window {
titleString = mainStack.currentItem.subTitle
}
- return(titleString)
+ return titleString
}
Behavior on text {
@@ -566,7 +564,7 @@ Window {
Product {
id: speedFlowChartProduct
//identifier: "speed_flowchart"
- identifier: QT_DEBUG ? "android.test.purchased":"speed_flowchart"
+ identifier: "android.test.purchased"
//identifier: "android.test.canceled"
//identifier: "android.test.refunded"
diff --git a/resources/qml/qml.qrc b/resources/qml/qml.qrc
index 4393e01..323af13 100644
--- a/resources/qml/qml.qrc
+++ b/resources/qml/qml.qrc
@@ -30,5 +30,6 @@
Components/AlignedButton.qml
Components/SharePopup.qml
Pages/QrCodeScanPage.qml
+ Components/MovingLabel.qml
diff --git a/resources/translations/de.qm b/resources/translations/de.qm
index 4d78569..cf8a115 100644
Binary files a/resources/translations/de.qm and b/resources/translations/de.qm differ
diff --git a/resources/translations/de.ts b/resources/translations/de.ts
index 31cf122..6e39f9f 100644
--- a/resources/translations/de.ts
+++ b/resources/translations/de.ts
@@ -18,18 +18,18 @@
Camera access denied
-
+ Kamerazugriff benötigt
This app needs to access your camera in order to scan QR-Codes. It will never record or store any photos or videos.
-
+ blueROCK benötig Zugriff auf die Kamera um QR-Codes zu scannen. Es werden keine Fotos oder Videos aufgezeichnet oder gespeichert.
-
+ Zugriff zulassen
@@ -85,7 +85,7 @@
- Diese Produkt ist nicht verfügbar
+ Dieses Produkt ist nicht verfügbar
@@ -130,7 +130,7 @@
- Diese App wurde unter Verwendung des <a href='https://qt.io'>Qt Frameworks</a> unter der <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 Lizenz</a> erstellt.<br><br>Diese App ist Open-source und lizensiert unter der <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 Lizenz</a>. Der Sourcecode findet sich <a href='https://itsblue.dev/dorian/blueROCK/'>hier</a>.Die Ergebnisse und Ranglisten werden von <a href='http://www.digitalROCK.de'>digital ROCK</a> zur Verfügung gestellt.
+ Diese App wurde unter Verwendung des <a href='https://qt.io'>Qt Frameworks</a> unter der <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 Lizenz</a> erstellt.<br><br>Diese App ist Open-source und lizensiert unter der <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 Lizenz</a>. Der Sourcecode findet sich <a href='https://itsblue.dev/dorian/blueROCK/'>hier</a>.Die Ergebnisse und Ranglisten werden von <a href='http://www.digitalROCK.de'>digital ROCK</a> zur Verfügung gestellt.
@@ -176,6 +176,7 @@
+
Kategorie auswählen
@@ -217,7 +218,7 @@
-
+ Ergebnisse anzeigen
@@ -226,72 +227,44 @@
-
(Startliste)
-
+
Laden
-
+
Keine Verbindung zum Server
-
+
Nicht gefunden
-
+
Keine Daten
-
+
Ungültige Anfrage
-
+
Unerwarteter Fehler
-
-
- Verfolge die Ergebnisse vom Wettkampf "%1" hier live:
-
-
-
- AndroidShareUtils
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Check out the results of %1 over here:
+ Verfolge die Ergebnisse von "%1" hier:
diff --git a/resources/translations/en.qm b/resources/translations/en.qm
index 728b0f4..e12ab65 100644
Binary files a/resources/translations/en.qm and b/resources/translations/en.qm differ
diff --git a/resources/translations/en.ts b/resources/translations/en.ts
index ba048c1..5891f2c 100644
--- a/resources/translations/en.ts
+++ b/resources/translations/en.ts
@@ -172,6 +172,7 @@
+
@@ -222,71 +223,43 @@
-
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
- AndroidShareUtils
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Check out the results of %1 over here:
diff --git a/sources/bluerockbackend.cpp b/sources/bluerockbackend.cpp
index 38094d5..8a1e655 100644
--- a/sources/bluerockbackend.cpp
+++ b/sources/bluerockbackend.cpp
@@ -97,7 +97,7 @@ QVariantMap BlueRockBackend::getParamsFromUrl(QString stringUrl) {
}
void BlueRockBackend::shareResultsAsUrl(QString url, QString compName) {
- //% "Check out the results of %1 over here:"
+ //% "Check out the results of %1 over here:"
this->_shareUtils->shareText(qtTrId("#shareResultsLinkText").arg(compName) + " \n", url);
}
@@ -112,6 +112,7 @@ void BlueRockBackend::shareResultsAsPoster(QString url, QString compName) {
}
}
+ compName = compName.replace("/", "");
path += "/" + compName + ".pdf";
QFile file(path);
@@ -206,7 +207,7 @@ bool BlueRockBackend::requestCameraPermission() {
return false;
}
- return true;
+ return false;
#elif defined Q_OS_IOS
return this->_iosPermissionUtils->requestCameraPermission();
#else
diff --git a/sources/shareUtils/androidshareutils.cpp b/sources/shareUtils/androidshareutils.cpp
index 42b9b8f..f3fdf64 100755
--- a/sources/shareUtils/androidshareutils.cpp
+++ b/sources/shareUtils/androidshareutils.cpp
@@ -188,7 +188,7 @@ void AndroidShareUtils::processActivityResult(int requestCode, int resultCode)
emit shareFinished(requestCode);
} else {
qDebug() << "wrong result code: " << resultCode << " from request: " << requestCode;
- emit shareError(requestCode, tr("Share: an Error occured"));
+ emit shareError(requestCode, "Share: an Error occured");
}
}
@@ -200,7 +200,7 @@ void AndroidShareUtils::checkPendingIntents(const QString workingDirPath)
QAndroidJniObject jniWorkingDir = QAndroidJniObject::fromString(workingDirPath);
if(!jniWorkingDir.isValid()) {
qWarning() << "QAndroidJniObject jniWorkingDir not valid.";
- emit shareError(0, tr("Share: an Error occured\nWorkingDir not valid"));
+ emit shareError(0, "Share: an Error occured\nWorkingDir not valid");
return;
}
activity.callMethod("checkPendingIntents","(Ljava/lang/String;)V", jniWorkingDir.object());
@@ -214,7 +214,7 @@ void AndroidShareUtils::setFileUrlReceived(const QString &url)
{
if(url.isEmpty()) {
qWarning() << "setFileUrlReceived: we got an empty URL";
- emit shareError(0, tr("Empty URL received"));
+ emit shareError(0, "Empty URL received");
return;
}
qDebug() << "AndroidShareUtils setFileUrlReceived: we got the File URL from JAVA: " << url;
@@ -232,7 +232,7 @@ void AndroidShareUtils::setFileUrlReceived(const QString &url)
emit fileUrlReceived(myUrl);
} else {
qDebug() << "setFileUrlReceived: FILE does NOT exist ";
- emit shareError(0, tr("File does not exist: %1").arg(myUrl));
+ emit shareError(0, QString("File does not exist: %1").arg(myUrl));
}
}
@@ -240,7 +240,7 @@ void AndroidShareUtils::setOtherUrlReceived(const QString &url, const QString &s
{
if(url.isEmpty()) {
qWarning() << "setFileUrlReceived: we got an empty URL";
- emit shareError(0, tr("Empty URL received"));
+ emit shareError(0, "Empty URL received");
return;
}
qDebug() << "AndroidShareUtils setOtherUrlReceived: we got the Other URL from JAVA: " << url;
@@ -252,7 +252,7 @@ void AndroidShareUtils::setFileReceivedAndSaved(const QString &url)
{
if(url.isEmpty()) {
qWarning() << "setFileReceivedAndSaved: we got an empty URL";
- emit shareError(0, tr("Empty URL received"));
+ emit shareError(0, "Empty URL received");
return;
}
qDebug() << "AndroidShareUtils setFileReceivedAndSaved: we got the File URL from JAVA: " << url;
@@ -270,7 +270,7 @@ void AndroidShareUtils::setFileReceivedAndSaved(const QString &url)
emit fileReceivedAndSaved(myUrl);
} else {
qDebug() << "setFileReceivedAndSaved: FILE does NOT exist ";
- emit shareError(0, tr("File does not exist: %1").arg(myUrl));
+ emit shareError(0, QString("File does not exist: %1").arg(myUrl));
}
}
@@ -280,7 +280,7 @@ bool AndroidShareUtils::checkFileExits(const QString &url)
{
if(url.isEmpty()) {
qWarning() << "checkFileExits: we got an empty URL";
- emit shareError(0, tr("Empty URL received"));
+ emit shareError(0, "Empty URL received");
return false;
}
qDebug() << "AndroidShareUtils checkFileExits: we got the File URL from JAVA: " << url;