minor updates on styles and consistencies.

Author: johnnzhou

app/src/main/java/com/lcl/lclmeasurementtool/MainActivity.java

@@ -31,9 +31,9 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        context = this;
+        this.context = this;
 
-        isTestStarted = false;
+        this.isTestStarted = false;
 
 
 //        LocationManager manager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
@@ -44,17 +44,17 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
 
-        mNetworkManager = new NetworkManager(this);
-        mCellularManager = CellularManager.getManager(this);
+        this.mNetworkManager = new NetworkManager(this);
+        this.mCellularManager = CellularManager.getManager(this);
 
-        if (!mNetworkManager.isCellularConnected()) {
+        if (!this.mNetworkManager.isCellularConnected()) {
             updateSignalStrengthTexts(SignalStrengthLevel.NONE, 0);
         }
 
         setUpFAB();
-        updateFAB(mNetworkManager.isCellularConnected());
+        updateFAB(this.mNetworkManager.isCellularConnected());
 
-        mNetworkManager.addNetworkChangeListener(new NetworkManager.NetworkChangeListener() {
+        this.mNetworkManager.addNetworkChangeListener(new NetworkManager.NetworkChangeListener() {
             @Override
             public void onAvailable() {
                 Log.i(TAG, "from call back on avaliable");
@@ -103,13 +103,13 @@ private void updateSignalStrengthTexts(SignalStrengthLevel level, int dBm) {
     private void setUpFAB() {
         FloatingActionButton fab = findViewById(R.id.fab);
         fab.setOnClickListener(button -> {
-            ((FloatingActionButton) button).setImageResource( isTestStarted ? R.drawable.start : R.drawable.stop );
+            ((FloatingActionButton) button).setImageResource( this.isTestStarted ? R.drawable.start : R.drawable.stop );
             fab.setColorFilter(ContextCompat.getColor(this, R.color.purple_500));
 
             // TODO: init/cancel ping and iperf based in iTestStart
 
-            isTestStarted = !isTestStarted;
-            Toast.makeText(this, "test starts: " + isTestStarted, Toast.LENGTH_SHORT).show();
+            this.isTestStarted = !isTestStarted;
+            Toast.makeText(this, "test starts: " + this.isTestStarted, Toast.LENGTH_SHORT).show();
         });
     }
 
@@ -126,7 +126,7 @@ private void updateFAB(boolean state) {
                 // cancel test
 //            }
 
-            isTestStarted = false;
+            this.isTestStarted = false;
         });
     }
 
@@ -137,7 +137,7 @@ private void updateFAB(boolean state) {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mCellularManager.stopListening();
-        mNetworkManager.removeAllNetworkChangeListeners();
+        this.mCellularManager.stopListening();
+        this.mNetworkManager.removeAllNetworkChangeListeners();
     }
 }

app/src/main/java/com/lcl/lclmeasurementtool/Managers/CellularManager.java

@@ -61,7 +61,10 @@ private CellularManager(@NonNull Context context) {
      * @return a cellular manager
      */
     public static CellularManager getManager(@NonNull Context context) {
-        return cellularManager == null ? new CellularManager(context) : cellularManager;
+        if (cellularManager == null) {
+            cellularManager = new CellularManager(context);
+        }
+        return cellularManager;
     }
 
     /**
@@ -77,8 +80,8 @@ public SignalStrength getSignalStrength() {
      * @return a corresponding signal strength level from the current context.
      */
     public SignalStrengthLevel getSignalStrengthLevel() {
-        if (report != null) {
-            int level = report.getLevel();
+        if (this.report != null) {
+            int level = this.report.getLevel();
             return SignalStrengthLevel.init(level);
         }
 
@@ -92,7 +95,7 @@ public SignalStrengthLevel getSignalStrengthLevel() {
      *         report might be null if no cellular connection.
      */
     public CellSignalStrength getCellSignalStrength() {
-        return report;
+        return this.report;
     }
 
     /**
@@ -101,7 +104,7 @@ public CellSignalStrength getCellSignalStrength() {
      *         If no cellular connection, 0.
      */
     public int getDBM() {
-        return report != null ? report.getDbm() : 0;
+        return this.report != null ? this.report.getDbm() : 0;
     }
 
     /**

app/src/main/java/com/lcl/lclmeasurementtool/Managers/NetworkManager.java

@@ -70,7 +70,7 @@ public NetworkManager(@NonNull Context context) {
      * @param networkChangeListener a new listener (should not be null).
      */
     public void addNetworkChangeListener(@NonNull NetworkChangeListener networkChangeListener) {
-        mNetworkChangeListeners.add(networkChangeListener);
+        this.mNetworkChangeListeners.add(networkChangeListener);
 
         NetworkRequest request = new NetworkRequest
                 .Builder()
@@ -110,23 +110,23 @@ public void onUnavailable() {
             }
         };
 
-        this.connectivityManager.registerNetworkCallback(request, networkCallback);
+        this.connectivityManager.registerNetworkCallback(request, this.networkCallback);
     }
 
     /**
      * Remove a specified listener
      *
      * @param networkChangeListener the listener to be removed (should not be null)
      */
-    public void removeNetworokChangeListener(@NonNull NetworkChangeListener networkChangeListener) {
-        mNetworkChangeListeners.remove(networkChangeListener);
+    public void removeNetworkChangeListener(@NonNull NetworkChangeListener networkChangeListener) {
+        this.mNetworkChangeListeners.remove(networkChangeListener);
     }
 
     /**
      * Remove all registered listeners
      */
     public void removeAllNetworkChangeListeners() {
-        mNetworkChangeListeners.clear();
+        this.mNetworkChangeListeners.clear();
         this.connectivityManager.unregisterNetworkCallback(this.networkCallback);
     }
 
@@ -135,20 +135,20 @@ public void removeAllNetworkChangeListeners() {
      * @return true if the current device is connected to the internet via cellular; false otherwise.
      */
     public boolean isCellularConnected() {
-        return capabilities != null &&
-                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
+        return this.capabilities != null &&
+                this.capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
     }
 
     public int getLinkDownstreamBandwidthKbps() {
-        if (capabilities != null) {
-            return capabilities.getLinkDownstreamBandwidthKbps();
+        if (this.capabilities != null) {
+            return this.capabilities.getLinkDownstreamBandwidthKbps();
         }
 
         return 0;
     }
 
     public int getLinkUpstreamBandwidthKbps() {
-        if (capabilities != null) {
+        if (this.capabilities != null) {
             return this.capabilities.getLinkUpstreamBandwidthKbps();
         }
 

app/src/main/java/com/lcl/lclmeasurementtool/Utils/DataTransferRateUnit.java

@@ -33,23 +33,23 @@ public enum DataTransferRateUnit {
      * @return the corresponding unit of the enum value.
      */
     public Unit getUnit() {
-        return unit;
+        return this.unit;
     }
 
     /**
      * Retrieve the String representation of the data transfer rate unit.
      * @return a string representation of the data transfer rate.
      */
     public String getUnitString() {
-        return magnitude.getUnitString() + unit.getUnitString() + "/s";
+        return this.magnitude.getUnitString() + this.unit.getUnitString() + "/s";
     }
 
     /**
      * Return the <code>Magnitude</code> of the enum value.
      * @return the corresponding magnitude of the enum value.
      */
     public Magnitude getMagnitude() {
-        return magnitude;
+        return this.magnitude;
     }
 
     /**
@@ -80,7 +80,7 @@ public enum Magnitude implements AbstractDataTransferRate {
 
         @Override
         public int getLevel() {
-            return level;
+            return this.level;
         }
 
         @Override
@@ -124,7 +124,7 @@ public enum Unit implements AbstractDataTransferRate {
 
         @Override
         public int getLevel() {
-            return level;
+            return this.level;
         }
 
         @Override