commit 2236d29199bdcf58f3d7cf7e375ce9cf20b11166
author Michael W <baddaemon87@gmail.com> Sun Jul 15 15:09:20 2018 +0200
committer Michael W <baddaemon87@gmail.com> Wed Jul 25 13:34:51 2018 +0200
tree b218e2d8c4fce9cbf8fa0b9cca66c9ebbbab51fa
parent e5741b0e7649e5cda4cb6af8d1ed32f6d42dcf04

SUW: (Not-really-)Spring Cleanup

* Remove unused imports
* Fix a few line length issues
* Convert a few anonymous classes to lambda expressions
* Convert a few global vars to locals
* Remove unused methods
* Add a small local method in MobileDataActivity to shorten repeated calls

Change-Id: Ia10be8b8c98ef3956949f913ddb6bddc185cf1a5

src/org/lineageos/setupwizard/MobileDataActivity.java

diff --git a/src/org/lineageos/setupwizard/MobileDataActivity.java b/src/org/lineageos/setupwizard/MobileDataActivity.java
index a00bbef..b14bbf1 100644
--- a/src/org/lineageos/setupwizard/MobileDataActivity.java
+++ b/src/org/lineageos/setupwizard/MobileDataActivity.java
@@ -28,7 +28,6 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
@@ -61,19 +60,9 @@
 
     private final Handler mHandler = new Handler();
 
-    private final Runnable mRadioReadyRunnable = new Runnable() {
-        @Override
-        public void run() {
-            hideWaitForRadio();
-        }
-    };
+    private final Runnable mRadioReadyRunnable = this::hideWaitForRadio;
 
-    private final Runnable mDataConnectionReadyRunnable = new Runnable() {
-        @Override
-        public void run() {
-            onDataStateReady();
-        }
-    };
+    private final Runnable mDataConnectionReadyRunnable = this::onDataStateReady;
 
     private PhoneMonitor.SubscriptionStateListener mSubscriptionStateListener =
             new PhoneMonitor.SubscriptionStateListener() {
@@ -231,9 +220,9 @@
 
     private void updateCarrierText() {
         if (mIsAttached) {
-            String name = mPhone.getSimOperatorName(SubscriptionManager.getDefaultSubscriptionId());
+            String name = mPhone.getSimOperatorName(getDefaultSubscriptionId());
             if (TextUtils.isEmpty(name)) {
-                name = mPhone.getNetworkOperatorName(SubscriptionManager.getDefaultSubscriptionId());
+                name = mPhone.getNetworkOperatorName(getDefaultSubscriptionId());
             }
             if (TextUtils.isEmpty(name)) {
                 if (mServiceState != null && mServiceState.isEmergencyOnly()) {
@@ -292,7 +281,7 @@
         boolean retVal;
         if (mServiceState == null) {
             mServiceState  =  TelephonyManager.from(this)
-                    .getServiceStateForSubscriber(SubscriptionManager.getDefaultSubscriptionId());
+                    .getServiceStateForSubscriber(getDefaultSubscriptionId());
         }
         if (mServiceState != null) {
             // Consider the device to be in service if either voice or data service is available.
@@ -331,4 +320,7 @@
         return R.drawable.ic_mobile_data;
     }
 
+    private int getDefaultSubscriptionId() {
+        return SubscriptionManager.getDefaultSubscriptionId();
+    }
 }