added the githash to influx / log output

omnt · Nov 12, 2024 · 7a88b51 · 7a88b51
1 parent 20aadaa
commit 7a88b51
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/...main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/DataProvider/BuildInformation.java b/...main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/DataProvider/BuildInformation.java
@@ -7,7 +7,7 @@
 import org.json.JSONObject;
 
 import de.fraunhofer.fokus.OpenMobileNetworkToolkit.BuildConfig;
-import de.fraunhofer.fokus.OpenMobileNetworkToolkit.R;
+import de.fraunhofer.fokus.OpenMobileNetworkToolkit.GlobalVars;
 
 public class BuildInformation extends Information {
     private final String TAG = "BuildInformation";
@@ -40,8 +40,8 @@ public boolean isDebug() {
         return BuildConfig.DEBUG;
     }
 
-    public int getGitHash() {
-        return R.string.git_hash;
+    public String getGitHash() {
+        return GlobalVars.getInstance().getGit_hash();
     }
 
     public JSONObject toJSON() {

diff --git a/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/GlobalVars.java b/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/GlobalVars.java
@@ -38,6 +38,16 @@ public class GlobalVars {
     private boolean feature_work_profile;
     private boolean permission_phone_state;
     private String signing_hash;
+
+    public String getGit_hash() {
+        return git_hash;
+    }
+
+    public void setGit_hash(String git_hash) {
+        this.git_hash = git_hash;
+    }
+
+    private String git_hash;
     private boolean permission_fine_location;
 
     private GlobalVars() {

diff --git a/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MainActivity.java b/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MainActivity.java
@@ -212,6 +212,7 @@ protected void onCreate(Bundle savedInstanceState) {
             }
         }, SPType.logging_sp);
         getAppSignature();
+        gv.setGit_hash(getString(R.string.git_hash));
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -212,6 +212,7 @@ protected void onCreate(Bundle savedInstanceState) { @@
                 }
             }, SPType.logging_sp);
             getAppSignature();
+            gv.setGit_hash(getString(R.string.git_hash));
         }
         /**
@@ Expand Down @@