GCR v2.7

* Issue 56 CSV export from the conversation screen does not work * Issue 57 PIN: No output files created on export * Issue 58 Log user events * Issue 59 Bug reports page and Help page title doesn't look right on 10.3
ragaeeb · Nov 24, 2014 · 7fed8a3 · 7fed8a3
1 parent 6daf276
commit 7fed8a3
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 234 deletions.
diff --git a/.cproject b/.cproject
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="com.qnx.qcc.toolChain.1927767027">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.toolChain.1927767027" moduleId="org.eclipse.cdt.core.settings" name="Device-Debug">
 				<externalSettings/>
 				<extensions>
-					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -45,10 +43,10 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.toolChain.826817782" moduleId="org.eclipse.cdt.core.settings" name="Device-Release">
 				<externalSettings/>
 				<extensions>
-					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -83,10 +81,10 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.toolChain.918068556" moduleId="org.eclipse.cdt.core.settings" name="Simulator-Debug">
 				<externalSettings/>
 				<extensions>
-					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -138,4 +136,4 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
 		</scannerConfigBuildInfo>
 	</storageModule>
-</cproject>
+</cproject>
diff --git a/assets/ExportPane.qml b/assets/ExportPane.qml
@@ -70,6 +70,8 @@ NavigationPane
                     else if ( persist.tutorial("tutorialSelectAll", qsTr("You can tap the Select All button at the bottom of the screen to quickly export all your conversations!"), "asset:///images/menu/selectAll.png" ) ) {}
                     else if ( persist.tutorial("tutorialDropDown", qsTr("Use the dropdown at the top to switch between your mailboxes."), "asset:///images/dropdown/ic_account.png" ) ) {}
                     else if ( persist.tutorial("tutorialSettings", qsTr("There are many customizations you can make to the way the messages are exported. You can do this from the Settings. To access the app settings, swipe-down from the top-bezel and choose 'Settings' from the application menu."), "file:///usr/share/icons/bb_action_install.png" ) ) {}
+                    else if ( persist.reviewed() ) {}
+                    else if ( reporter.performCII() ) {}
                 }
 
                 onSelectedValueChanged: {

diff --git a/assets/HelpPage.qml b/assets/HelpPage.qml
@@ -6,31 +6,32 @@ Page
 
     titleBar: AboutTitleBar {
         id: atb
+        labelColor: 'Signature' in ActionBarPlacement ? Color.Black : Color.White
     }
 
     actions: [
-        InvokeActionItem
+        ActionItem
         {
-            title: qsTr("Our BBM Channel") + Retranslate.onLanguageChanged
+            imageSource: "file:///usr/share/icons/bb_action_openbbmchannel.png"
+            title: atb.channelTitle
             ActionBar.placement: ActionBarPlacement.OnBar
 
-            query {
-                invokeTargetId: atb.invokeTargetId
-                uri: atb.channelUri
+            onTriggered: {
+                console.log("UserEvent: OpenChannelTriggered");
+                persist.openChannel();
             }
         },
 
-        InvokeActionItem
+        ActionItem
         {
-            query {
-                mimeType: "text/html"
-                uri: "http://youtu.be/_sSZJPBwlnc"
-                invokeActionId: "bb.action.OPEN"
-            }
-
             imageSource: "images/menu/ic_tutorial.png"
             title: qsTr("Video Tutorial") + Retranslate.onLanguageChanged
-            ActionBar.placement: 'Signature' in ActionBarPlacement ? ActionBarPlacement.Signature : ActionBarPlacement.OnBar
+            ActionBar.placement: 'Signature' in ActionBarPlacement ? ActionBarPlacement["Signature"] : ActionBarPlacement.OnBar
+
+            onTriggered: {
+                console.log("UserEvent: VideoTutorialTriggered");
+                persist.tutorialVideo("http://youtu.be/_sSZJPBwlnc", false);
+            }
         }
     ]
 
@@ -53,7 +54,7 @@ Page
                 textStyle.textAlign: TextAlign.Center
                 textStyle.fontSize: FontSize.Small
                 content.flags: TextContentFlag.ActiveText | TextContentFlag.EmoticonsOff
-                text: qsTr("\n\nEver wanted to forward or share multiple SMS or Email conversations with others (or yourself)? Or ever wanted to persist these messages into the file system? This is where Exporter comes in.\n\nThis app makes it really easy to select which conversations you want to share and even allows you to select a subset of the messages that you want to share. You can also select these conversations to be archived into your SD card, a cloud storage account, or any other persistent storage. After selecting the conversations you are free to share it in whichever channel you wish (ie: Facebook, Remember, Email, BBM, SMS, etc.)\n\nThe great thing is that the app gives you access to nearly all your accounts to export messages from. This includes emails, SMS, PIN messages, etc. Exporter is also registered as in BB10's invocation framework and this means that any plain-text information can easily be saved to your file system when you use a Share action!\n\n") + Retranslate.onLanguageChanged
+                text: qsTr("\n\nEver wanted to forward or share multiple SMS or Email conversations with others (or yourself)? Or ever wanted to persist these messages into the file system? This is where Exporter comes in.\n\nThis app makes it really easy to select which conversations you want to share and even allows you to select a subset of the messages that you want to share. You can also select these conversations to be archived into your SD card, a cloud storage account, or any other persistent storage. After selecting the conversations you are free to share it in whichever channel you wish (ie: Facebook, Remember, Email, BBM, SMS, etc.)\n\nThe great thing is that the app gives you access to nearly all your accounts to export messages from. This includes emails, SMS, PIN messages, etc. Exporter is also registered as in BlackBerry 10's invocation framework and this means that any plain-text information can easily be saved to your file system when you use a Share action!\n\n") + Retranslate.onLanguageChanged
             }
         }
     }

diff --git a/bar-descriptor.xml b/bar-descriptor.xml
@@ -35,7 +35,7 @@
     <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
          Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
          An updated version of application must have a versionNumber value higher than the previous version. Required. -->
-    <versionNumber>2.6.0</versionNumber>
+    <versionNumber>2.7.0</versionNumber>
 
     <!-- Fourth digit segment of the package version. First three segments are taken from the 
          <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->

diff --git a/src/PaymentHelper.cpp b/src/PaymentHelper.cpp
diff --git a/src/PaymentHelper.h b/src/PaymentHelper.h