Display and post additional information (owner, encryption)

NB: THIS WILL LIKELY BREAK SFOS 3.4 Contributes-To: #13 Releated-To: #12
sailfishos-chum · Aug 26, 2022 · 41287d4 · 41287d4
1 parent a9631b2
commit 41287d4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/qml/components/DeviceInfo.qml b/qml/components/DeviceInfo.qml
@@ -32,19 +32,31 @@ Flow {
         //DetailItem { label: "Build" ;           value: bugInfo.hw.sailfish_build;}
         //DetailItem { label: "Flavour" ;         value: bugInfo.hw.sailfish_flavour;}
 
-        DetailItem { label: "Owner" ;      value: userInfo.username }
     }
     Column {
         width: parent.width/2
         SectionHeader { text: qsTr("Operating System") }
         DetailItem { label: "Name" ;            value: bugInfo.os.name;}
         DetailItem { label: "OS Version" ;      value: bugInfo.os.version_id;}
-        DetailItem { label: "Code Name" ;            value: bugInfo.os.version.split("(")[1].replace(")","") }
-        DetailItem { label: "Arch" ;                 value: bugInfo.ssu.arch;}
+        DetailItem { label: "Code Name" ;       value: bugInfo.os.version.split("(")[1].replace(")","") }
+        DetailItem { label: "Arch" ;            value: bugInfo.ssu.arch;}
         //DetailItem { label: "Build" ;           value: bugInfo.os.sailfish_build;}
         //DetailItem { label: "Build" ;           value: bugInfo.os.sailfish_build;}
         //DetailItem { label: "Flavour" ;         value: bugInfo.os.sailfish_flavour;}
 
+
+    }
+    Column {
+        width: parent.width/2
+        SectionHeader { text: qsTr("Other") }
+        DetailItem { label: "Owner" ;           value: userInfo.username }
+        DetailItem { label: "Encryption" ;      value: (homeInfo.type == "LUKS") ? "enabled" : "n/a" ;}
+    }
+    Column {
+        width: parent.width/2
+        SectionHeader { text: qsTr("Locale") }
+        DetailItem { label: "Current";   value: Qt.locale().name}
+        DetailItem { label: "System";    value: languageModel.locale(languageModel.currentIndex)}
     }
     /*
     Column {

diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
@@ -20,6 +20,7 @@ limitations under the License.
 
 import QtQuick 2.6
 import Sailfish.Silica 1.0
+import Sailfish.Encryption 1.0
 import org.nemomobile.systemsettings 1.0
 import "../components"
 import "../config/settings.js" as Settings
@@ -79,6 +80,8 @@ Page {
         "repro":            -1
     }
 
+    // from Sailfish.Encryption to determine Home Encryption
+    HomeInfo{id: homeInfo}
     // from org.nemomobile.systemsettings to determine Device Owner
     UserInfo{id: userInfo; uid: 100000}
     // from org.nemomobile.systemsettings to determine OS language
@@ -395,6 +398,8 @@ Page {
             + "\n\n"
             + "ADDITIONAL INFORMATION:\n"
             + "=================\n\n" + text_add.text
+            + "Device Owner: " + userInfo.username + "  \n"
+            + "Home Encryption: " + ((homeInfo.type == "LUKS") ? "enabled" : "n/a") + "  \n"
             + "\n\n\n\n"
             // add footer:
             + "----  \n" 

diff --git a/rpm/harbour-bugger.changes b/rpm/harbour-bugger.changes
@@ -2,6 +2,7 @@
 - Bugger! Release 0.9.7
 - remove boring Lorem from Developer Tool
 - Add autosave/restore feature
+- Display and post additional information (owner, encryption)
 
 * Wed Aug 24 2022 Nephros <[email protected]> - 0.9.6
 - bug fix release 0.9.6