Merge branch 'dev'

src/mainwindow.ui

@@ -1223,6 +1223,50 @@
               </widget>
              </item>
 
+             <item row="17" column="0">
+              <widget class="QLabel" name="localserviceslabel">
+               <property name="text">
+                <string>Local Services</string>
+               </property>
+              </widget>
+             </item>
+             <item row="17" column="2">
+              <widget class="QLabel" name="localservices">
+               <property name="text">
+                <string>Loading...</string>
+               </property>
+              </widget>
+             </item>
+             <item row="17" column="1">
+              <widget class="QLabel" name="localservicesspacer">
+               <property name="text">
+                <string>|</string>
+               </property>
+              </widget>
+             </item>
+
+             <item row="18" column="0">
+              <widget class="QLabel" name="longestchainlabel">
+               <property name="text">
+                <string>Longest Chain</string>
+               </property>
+              </widget>
+             </item>
+             <item row="18" column="2">
+              <widget class="QLabel" name="longestchain">
+               <property name="text">
+                <string>Loading...</string>
+               </property>
+              </widget>
+             </item>
+             <item row="18" column="1">
+              <widget class="QLabel" name="longestchainspacer">
+               <property name="text">
+                <string>|</string>
+               </property>
+              </widget>
+             </item>
+
              <item row="3" column="2">
               <widget class="QLabel" name="solrate">
                <property name="text">

src/mobileappconnector.ui

@@ -33,7 +33,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>Scan this QRCode from your SilentDragon companion app to connect your phone</string>
+      <string>Scan this QRCode in SilentDragonAndroid to connect your device</string>
      </property>
     </widget>
    </item>
@@ -91,7 +91,7 @@
    <item row="1" column="2" rowspan="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>SilentDragon Companion App</string>
+      <string>SilentDragonAndroid</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="5" column="0">

src/rpc.cpp

@@ -585,6 +585,7 @@ void RPC::getInfoThenRefresh(bool force) {
 
         static int lastBlock    = 0;
         int curBlock            = reply["blocks"].get<json::number_integer_t>();
+        int longestchain        = reply["longestchain"].get<json::number_integer_t>();
         int version             = reply["version"].get<json::number_integer_t>();
         int p2pport             = reply["p2pport"].get<json::number_integer_t>();
         int rpcport             = reply["rpcport"].get<json::number_integer_t>();
@@ -600,6 +601,7 @@ void RPC::getInfoThenRefresh(bool force) {
 
         Settings::getInstance()->setZcashdVersion(version);
 
+	ui->longestchain->setText(QString::number(longestchain));
         ui->notarizedhashvalue->setText( ntzhash );
         ui->notarizedtxidvalue->setText( ntztxid );
         ui->lagvalue->setText( QString::number(lag) );
@@ -654,8 +656,10 @@ void RPC::getInfoThenRefresh(bool force) {
 
         conn->doRPCIgnoreError(payload, [=](const json& reply) {
             QString clientname    = QString::fromStdString( reply["subversion"].get<json::string_t>() );
+            QString localservices = QString::fromStdString( reply["localservices"].get<json::string_t>() );
 
             ui->clientname->setText(clientname);
+	    ui->localservices->setText(localservices);
         });
 
         // Call to see if the blockchain is syncing.