Create Rel 0.3.1

CHANGELOG.md

@@ -1,4 +1,10 @@
 # OpenMobileNetworkToolkit Changelog
+## Release [0.3.1]
+
+### Changed
+- Fix Bug if DP is not available
+- Use [TelephonyCallback](https://developer.android.com/reference/android/telephony/TelephonyCallback) instead of [PhoneStateListener](https://developer.android.com/reference/android/telephony/PhoneStateListener)
+
 ## Release [0.3]
 
 ### Added
@@ -11,7 +17,7 @@
 - iPerf3 GUI [PR 14](https://github.com/omnt/OpenMobileNetworkToolkit/pull/14)
 - Fix Ping Bug, where button is enabled but now Ping is running after app restart [PR 14](https://github.com/omnt/OpenMobileNetworkToolkit/pull/14)
 - Update Ping Fragment, now uses the Metric class to display [PR 14](https://github.com/omnt/OpenMobileNetworkToolkit/pull/14)
-- 
+
 ### Breaking Changes
 - see [PR 14](https://github.com/omnt/OpenMobileNetworkToolkit/pull/14)
 

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/DataProvider/DataProvider.java

@@ -74,7 +74,7 @@
 
 import de.fraunhofer.fokus.OpenMobileNetworkToolkit.GlobalVars;
 
-public class DataProvider extends PhoneStateListener implements LocationListener, TelephonyCallback.CellInfoListener, TelephonyCallback.PhysicalChannelConfigListener {
+public class DataProvider extends TelephonyCallback implements LocationListener, TelephonyCallback.CellInfoListener, TelephonyCallback.PhysicalChannelConfigListener, TelephonyCallback.SignalStrengthsListener {
     private static final String TAG = "DataProvider";
     private final Context ct;
     private final SharedPreferences sp;
@@ -191,7 +191,6 @@ public Point getNetworkInformationPoint() {
 
 
     // ## Device Information
-    @SuppressLint({"MissingPermission", "HardwareIds", "ObsoleteSdkInt"})
     public void refreshDeviceInformation() {
         updateTimestamp();
         di.setTimeStamp(ts);
@@ -211,12 +210,17 @@ public void refreshDeviceInformation() {
             di.setDeviceSoftwareVersion(String.valueOf(tm.getDeviceSoftwareVersion()));
         }
         if (cp) { // todo try root privileges or more fine granular permission
-            di.setIMEI(tm.getImei());
-            di.setMEID(tm.getMeid());
+            try {
+                di.setIMEI(tm.getImei());
+                di.setMEID(tm.getMeid());
+                di.setSimSerial(tm.getSimSerialNumber());
+                di.setSubscriberId(tm.getSubscriberId());
+                di.setNetworkAccessIdentifier(tm.getNai());
+            } catch (SecurityException e) {
+                Log.d(TAG, "Carrier Privileges not available");
+            }
             di.setIMSI(getIMSI());
-            di.setSimSerial(tm.getSimSerialNumber());
-            di.setSubscriberId(tm.getSubscriberId());
-            di.setNetworkAccessIdentifier(tm.getNai());
+
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 di.setSubscriberId(String.valueOf(tm.getSubscriptionId()));
             }
@@ -280,7 +284,6 @@ public List<Point> getNetworkInterfaceInformationPoints() {
         return points;
     }
 
-
     // ### Cell Information ###
 
     /**
@@ -526,8 +529,6 @@ public Point getNetworkCapabilitiesPoint() {
         point.addField("MobileRxBytes", TrafficStats.getMobileRxBytes());
         return point;
     }
-
-
     // ### Signal Strength Information ###
     @SuppressLint("ObsoleteSdkInt")
     @Override

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/LoggingService.java

@@ -103,6 +103,7 @@ public void run() {
     private final Runnable notification_updater = new Runnable() {
         @Override
         public void run() {
+            if(dp == null) return;
             List<CellInformation> cil = dp.getRegisteredCells();
             StringBuilder s = new StringBuilder();
             for (CellInformation ci : cil) {

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MainActivity.java

@@ -235,7 +235,6 @@ public void onClick(DialogInterface dialog, int which) {
         }
         requestCellInfoUpdateHandler = new Handler(Objects.requireNonNull(Looper.myLooper()));
         requestCellInfoUpdateHandler.post(requestCellInfoUpdate);
-        tm.listen(dp, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
     }
 
 

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Ping/PingFragment.java

@@ -64,22 +64,7 @@ private void startPingService(){
         Intent pingStart = new Intent(ct, PingService.class);
         ct.startService(pingStart);
         rttMetric.resetMetric();
-        PingParser pingParser = PingParser.getInstance(null);
-        pingParser.addPropertyChangeListener(new PropertyChangeListener() {
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                PingInformation pi = (PingInformation) evt.getNewValue();
-                switch (pi.getLineType()){
-                    case RTT:
-                        rttMetric.update( ((RTTLine)pi).getRtt());
-                        break;
-                    case PACKET_LOSS:
-                        packetLossMetric.update(((PacketLossLine)pi).getPacketLoss());
-                        //packetLossMetric.setVisibility(View.VISIBLE);
-                        break;
-                }
-            }
-        });
+        packetLossMetric.resetMetric();
     }
     private void stopPingService(){
         input.setEnabled(true);
@@ -123,7 +108,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         aSwitch = verticalLL.findViewById(R.id.ping_switch);
         input = verticalLL.findViewById(R.id.ping_input);
         input.setText(sp.getString("ping_input", "-w 5 8.8.8.8"));
-
+        input.setEnabled(!PingService.isRunning());
         ct = requireContext();
 
         saveTextInputToSharedPreferences(input, "ping_input");
@@ -150,6 +135,25 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
         metricsLL.addView(packetLossMetric.createMainLL("Packet Loss [%]"));
 
         horizontalLL1.addView(metricsLL);
+
+
+        PingParser pingParser = PingParser.getInstance(null);
+        pingParser.addPropertyChangeListener(new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                PingInformation pi = (PingInformation) evt.getNewValue();
+                switch (pi.getLineType()){
+                    case RTT:
+                        rttMetric.update( ((RTTLine)pi).getRtt());
+                        break;
+                    case PACKET_LOSS:
+                        packetLossMetric.update(((PacketLossLine)pi).getPacketLoss());
+                        //packetLossMetric.setVisibility(View.VISIBLE);
+                        break;
+                }
+            }
+        });
+
         //packetLossMetric.setVisibility(View.INVISIBLE);
         return v;
     }

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Ping/PingService.java

@@ -57,7 +57,6 @@ public class PingService extends Service {
     private static final String TAG = "PingService";
     private FileOutputStream ping_stream;
     private Handler pingLogging;
-    private String pingInput;
     private WorkManager wm;
     private Context context;
     private ArrayList<OneTimeWorkRequest> pingWRs;
@@ -67,10 +66,7 @@ public class PingService extends Service {
     DataProvider dp;
     InfluxdbConnection influx;
     private static boolean isRunning = false;
-    private static PingParser pingParser;
-    private Process pingProcess;
     private String pingCommand;
-    private Runtime runtime = Runtime.getRuntime();
     private PropertyChangeListener propertyChangeListener;
     HashMap<String, String> parsedCommand = new HashMap<>();
 
@@ -95,9 +91,10 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         defaultSP = PreferenceManager.getDefaultSharedPreferences(context);
         if(defaultSP.getBoolean("enable_influx", false)) influx = InfluxdbConnections.getRicInstance(context);
         wm = WorkManager.getInstance(context);
+        wm.cancelAllWorkByTag("Ping");
         if(intent == null) return START_NOT_STICKY;
-        pingInput = intent.getStringExtra("input");
         pingWRs = new ArrayList<>();
+
         setupPing();
         isRunning = true;
         return START_STICKY;
@@ -233,6 +230,7 @@ public void onChanged(Object o) {
                     }
 
                     wm.getWorkInfoByIdLiveData(pingWR.getId()).removeObserver(this);
+                    pingWRs.remove(pingWR);
                     pingLogging.postDelayed(pingUpdate, 200);
                 }
             };

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Ping/PingWorker.java

@@ -162,7 +162,6 @@ public void propertyChange(PropertyChangeEvent evt) {
                         case RTT:
                             rtt = ((RTTLine)pi).getRtt();
                             break;
-
                     }
                     updateNotification.run();
                 }

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.0'
         def nav_version = "2.5.3"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'