Merge pull request #6 from omnt/influx3And4G

omnt · Apr 25, 2024 · f7f4ca6 · f7f4ca6
2 parents e090713 + 1475e7a
commit f7f4ca6
Show file tree

Hide file tree

Showing 15 changed files with 366 additions and 70 deletions.
diff --git a/OpenMNT_logo_no_title.svg b/OpenMNT_logo_no_title.svg
diff --git a/...src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/DataProvider/DataProvider.java b/...src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/DataProvider/DataProvider.java
@@ -325,7 +325,9 @@ public void onCellInfoChanged(@NonNull List<CellInfo> list) {
                 cim.setSsrsrq(ssNR.getSsRsrq());
                 cim.setSssinr(ssNR.getSsSinr());
                 cim.setAsuLevel(ssNR.getAsuLevel());
-                cim.setTimingAdvance(ssNR.getTimingAdvanceMicros());
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                    cim.setTimingAdvance(ssNR.getTimingAdvanceMicros());
+                }
             }
             if (ci instanceof CellInfoLte) {
                 CellInfoLte ciLTE = (CellInfoLte) ci;
@@ -408,8 +410,10 @@ public List<Point> getCellInformationPoint() {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                     point.addField("Bands", ci_.getBands());
                 }
-                point.addField("CI", ci_.getCi());
-                point.addTag("CI", String.valueOf(ci_.getCi()));
+                long ci = ci_.getCi();
+                if (ci != CellInfo.UNAVAILABLE) {
+                    point.addTag("CI", String.valueOf(ci));
+                }
                 point.addField("NRARFCN", ci_.getARFCN());
                 point.addField("MNC", ci_.getMnc());
                 point.addField("MCC", ci_.getMcc());
@@ -430,8 +434,10 @@ public List<Point> getCellInformationPoint() {
                     point.addField("Bands", ci_.getBands());
                 }
                 point.addField("Bandwidth", ci_.getBandwidth());
-                point.addField("CI", ci_.getCi());
-                point.addTag("CI", String.valueOf(ci_.getCi()));
+                long ci = ci_.getCi();
+                if (ci != CellInfo.UNAVAILABLE) {
+                    point.addTag("CI", String.valueOf(ci_.getCi()));
+                }
                 point.addField("ARFCN", ci_.getARFCN());
                 point.addField("MNC", ci_.getMnc());
                 point.addField("MCC", ci_.getMcc());
@@ -452,8 +458,10 @@ public List<Point> getCellInformationPoint() {
             }
             if (Objects.equals(ci_.getCellType(), "GSM")) {
                 point.addField("CellType", "GSM");
-                point.addField("CI", ci_.getCi());
-                point.addTag("CI", String.valueOf(ci_.getCi()));
+                long ci = ci_.getCi();
+                if (ci != CellInfo.UNAVAILABLE) {
+                    point.addTag("CI", String.valueOf(ci_.getCi()));
+                }
                 point.addField("ARFCN", ci_.getARFCN());
                 point.addField("MNC", ci_.getMnc());
                 point.addField("MCC", ci_.getMcc());

diff --git a/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/GlobalVars.java b/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/GlobalVars.java
@@ -12,6 +12,7 @@
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.widget.ImageView;
 
 import de.fraunhofer.fokus.OpenMobileNetworkToolkit.DataProvider.DataProvider;
 
@@ -45,6 +46,15 @@ public class GlobalVars {
     private boolean feature_work_profile;
     private boolean permission_phone_state;
 
+    public ImageView getLog_status() {
+        return log_status;
+    }
+
+    public void setLog_status(ImageView log_status) {
+        this.log_status = log_status;
+    }
+
+    ImageView log_status;
     private GlobalVars(){}
 
     public static synchronized GlobalVars getInstance(){

diff --git a/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/HomeFragment.java b/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/HomeFragment.java
@@ -37,6 +37,7 @@
 import androidx.cardview.widget.CardView;
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import java.security.MessageDigest;
@@ -427,6 +428,10 @@ private CardView get_cell_card_view(){
         List<CellInformation> cil = dp.getCellInformation();
         int cell = 1;
         for (CellInformation ci : cil) {
+            if ( !PreferenceManager.getDefaultSharedPreferences(context).getBoolean("show_neighbour_cells", false) && ! ci.isRegistered()) {
+                continue;
+            }
+
             TableRow title = rowBuilder("Cell " + cell, "");
             if (cell > 1) {
                 title.setPadding(0,20,0,0);