fix merge conflicts

Author: johnnzhou

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

@@ -1,5 +1,6 @@
 package com.lcl.lclmeasurementtool;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
@@ -13,6 +14,7 @@
 import android.util.Log;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.lcl.lclmeasurementtool.Managers.CellularManager;
@@ -52,33 +54,25 @@ protected void onCreate(Bundle savedInstanceState) {
             editor.apply();
         }
 
-        mNetworkManager = NetworkManager.getManager(this.getApplicationContext());
-        mCellularManager = CellularManager.getManager(this.getApplicationContext());
+        mNetworkManager = NetworkManager.getManager(this);
+        mCellularManager = CellularManager.getManager(this);
         mLocationManager = LocationServiceManager.getManager(this.getApplicationContext());
-
-        locationServiceListener = new LocationServiceListener(this.getApplicationContext(), getLifecycle());
+        locationServiceListener = new LocationServiceListener(this, getLifecycle());
         getLifecycle().addObserver(locationServiceListener);
         this.context = this;
-
         this.isTestStarted = false;
 
-
-
-
-        this.mNetworkManager = new NetworkManager(this);
-        this.mCellularManager = CellularManager.getManager(this);
-
         if (!this.mNetworkManager.isCellularConnected()) {
             updateSignalStrengthTexts(SignalStrengthLevel.NONE, 0);
         }
 
         setUpFAB();
         updateFAB(this.mNetworkManager.isCellularConnected());
 
-        this.mNetworkManager.addNetworkChangeListener(new NetworkManager.NetworkChangeListener() {
+        this.mNetworkManager.addNetworkChangeListener(new NetworkChangeListener() {
             @Override
             public void onAvailable() {
-                Log.i(TAG, "from call back on avaliable");
+                Log.i(TAG, "from call back on available");
                 updateFAB(true);
                 mCellularManager.listenToSignalStrengthChange((level, dBm) ->
                                                                 updateSignalStrengthTexts(level, dBm));
@@ -87,18 +81,21 @@ public void onAvailable() {
             @Override
             public void onLost() {
                 mCellularManager.stopListening();
+                Log.e(TAG, "on lost");
                 updateSignalStrengthTexts(SignalStrengthLevel.NONE, 0);
                 updateFAB(false);
             }
 
             @Override
             public void onUnavailable() {
+                Log.e(TAG, "on unavailable");
                 updateSignalStrengthTexts(SignalStrengthLevel.NONE, 0);
                 updateFAB(false);
             }
 
             @Override
             public void onCellularNetworkChanged(boolean isConnected) {
+                Log.e(TAG, "on connection lost");
                 if (!isConnected) {
                     updateSignalStrengthTexts(SignalStrengthLevel.NONE, 0);
                     updateFAB(isConnected);

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

@@ -2,6 +2,7 @@
 import android.content.Context;
 import android.os.Looper;
 import android.telephony.CellSignalStrength;
+import android.telephony.CellSignalStrengthGsm;
 import android.telephony.CellSignalStrengthLte;
 import android.telephony.PhoneStateListener;
 import android.telephony.SignalStrength;
@@ -37,7 +38,7 @@ public class CellularManager {
     private final SignalStrength signalStrength;
 
     // the LTE signal strength report that consists of all cellular signal strength information.
-    private final CellSignalStrengthLte report;
+    private final CellSignalStrength report;
 
     // the flag that controls when to stop listening to signal strength change.
     private boolean stopListening;
@@ -49,8 +50,8 @@ public class CellularManager {
     private CellularManager(@NonNull Context context) {
         this.telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
         this.signalStrength = this.telephonyManager.getSignalStrength();
-        if (this.signalStrength.getCellSignalStrengths(CellSignalStrengthLte.class).size() > 0) {
-            this.report = this.signalStrength.getCellSignalStrengths(CellSignalStrengthLte.class).get(0);
+        if (this.signalStrength.getCellSignalStrengths().size() > 0) {
+            this.report = this.signalStrength.getCellSignalStrengths().get(0);
         } else {
             this.report = null;
         }
@@ -122,13 +123,13 @@ public void run() {
                     @Override
                     public void onSignalStrengthsChanged(SignalStrength signalStrength) {
                         super.onSignalStrengthsChanged(signalStrength);
-                        List<CellSignalStrengthLte> reports = signalStrength
-                                .getCellSignalStrengths(CellSignalStrengthLte.class);
+                        List<CellSignalStrength> reports = signalStrength.getCellSignalStrengths();
+
 
                         int dBm;
                         SignalStrengthLevel level;
                         if (reports.size() > 0) {
-                            CellSignalStrengthLte report = reports.get(0);
+                            CellSignalStrength report = reports.get(0);
                             level = SignalStrengthLevel.init(report.getLevel());
                             dBm = report.getDbm();
                         } else {

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

@@ -12,6 +12,7 @@
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
 
+import com.lcl.lclmeasurementtool.MainActivity;
 import com.lcl.lclmeasurementtool.R;
 import com.lcl.lclmeasurementtool.Utils.UIUtils;
 
@@ -62,7 +63,6 @@ void checkLocationPermission() {
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     void checkLocationMode() {
         if (!mLocationManager.isLocationModeOn() && lifecycle.getCurrentState().equals(Lifecycle.State.RESUMED) && !checkLocationModeLock) {
-            System.out.println(1);
             checkLocationModeLock = true;
             // TODO turn off start FAB if canceled
             UIUtils.showDialog(context, R.string.location_message_title, R.string.enable_location_message,