Skip to content

Commit c923e47

Browse files
TrueMLGProTrueMLGPro
authored
Updated to 1.5.2
Yay!
2 parents 20487a3 + 28ff3dd commit c923e47

File tree

84 files changed

+1220
-1500
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1220
-1500
lines changed

‎app/build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ android {
2121
applicationId "com.truemlgpro.wifiinfo"
2222
minSdkVersion 21
2323
targetSdkVersion 33
24-
versionCode 1510
25-
versionName "1.5.1"
24+
versionCode 1520
25+
versionName "1.5.2"
2626
}
2727
buildTypes {
2828
release {
@@ -60,6 +60,7 @@ dependencies {
6060
implementation 'androidx.cardview:cardview:1.0.0'
6161
implementation 'androidx.preference:preference:1.2.0'
6262
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
63+
implementation 'androidx.core:core-splashscreen:1.0.0'
6364
implementation 'com.github.AnwarShahriar:Calligrapher:master'
6465
implementation 'com.github.bloderxd:MagicButton:1.1'
6566
implementation 'com.mikhaellopez:circularimageview:4.3.1'

‎app/src/main/AndroidManifest.xml

+18-17
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.truemlgpro.wifiinfo">
5-
5+
66
<uses-sdk
77
android:minSdkVersion="21"
88
android:targetSdkVersion="33"
99
tools:overrideLibrary="thecollectiveweb.com.tcwhois"
1010
tools:ignore="GradleOverrides" />
11-
11+
1212
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
1313
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1414
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -17,31 +17,32 @@
1717
<uses-permission android:name="android.permission.INTERNET" />
1818
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
1919
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
20-
20+
2121
<application
2222
android:icon="@mipmap/ic_launcher"
23-
android:roundIcon="@mipmap/ic_launcher"
2423
android:label="@string/app_name"
2524
android:theme="@style/DarkTheme"
2625
android:largeHeap="true"
2726
android:usesCleartextTraffic="true">
2827

2928
<meta-data android:name="android.webkit.WebView.MetricsOptOut"
3029
android:value="true" />
31-
30+
3231
<activity
3332
android:name="com.truemlgpro.wifiinfo.SplashActivity"
3433
android:screenOrientation="portrait"
3534
android:exported="true">
36-
<intent-filter>
37-
<action android:name="android.intent.action.MAIN" />
38-
<category android:name="android.intent.category.LAUNCHER" />
39-
</intent-filter>
4035
</activity>
4136
<activity
4237
android:name="com.truemlgpro.wifiinfo.MainActivity"
4338
android:label="@string/app_name"
44-
android:screenOrientation="portrait">
39+
android:screenOrientation="portrait"
40+
android:theme="@style/SplashDark"
41+
android:exported="true">
42+
<intent-filter>
43+
<action android:name="android.intent.action.MAIN" />
44+
<category android:name="android.intent.category.LAUNCHER" />
45+
</intent-filter>
4546
</activity>
4647
<activity
4748
android:name="com.truemlgpro.wifiinfo.DevInfoActivity"
@@ -112,12 +113,12 @@
112113
android:name="android.support.PARENT_ACTIVITY"
113114
android:value="com.truemlgpro.wifiinfo.MainActivity" />
114115
</activity>
115-
116+
116117
<service
117118
android:name=".NotificationService"
118119
android:enabled="true">
119120
</service>
120-
121+
121122
<service
122123
android:name=".ConnectionStateService"
123124
android:enabled="true">
@@ -140,35 +141,35 @@
140141
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
141142
</intent-filter>
142143
</receiver>
143-
144+
144145
<receiver android:name=".WiFiConnectivityReceiver"
145146
android:exported="false">
146147
<intent-filter>
147148
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
148149
</intent-filter>
149150
</receiver>
150-
151+
151152
<receiver android:name=".CellularDataConnectivityReceiver"
152153
android:exported="false">
153154
<intent-filter>
154155
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
155156
</intent-filter>
156157
</receiver>
157-
158+
158159
<receiver android:name=".NetworkConnectivityReceiver"
159160
android:exported="false">
160161
<intent-filter>
161162
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
162163
</intent-filter>
163164
</receiver>
164-
165+
165166
<receiver android:name=".BootReceiver"
166167
android:exported="true">
167168
<intent-filter>
168169
<action android:name="android.intent.action.BOOT_COMPLETED" />
169170
</intent-filter>
170171
</receiver>
171-
172+
172173
<receiver android:name=".ActionButtonReceiver"
173174
android:exported="false">
174175
<intent-filter>

‎app/src/main/java/com/truemlgpro/wifiinfo/ActionButtonReceiver.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import android.content.Context;
55
import android.content.Intent;
66

7-
public class ActionButtonReceiver extends BroadcastReceiver
8-
{
7+
public class ActionButtonReceiver extends BroadcastReceiver {
98
@Override
109
public void onReceive(Context context, Intent intent)
1110
{

‎app/src/main/java/com/truemlgpro/wifiinfo/BootReceiver.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
import android.content.Context;
55
import android.content.Intent;
66

7-
public class BootReceiver extends BroadcastReceiver
8-
{
7+
public class BootReceiver extends BroadcastReceiver {
98
@Override
109
public void onReceive(Context context, Intent intent)
1110
{
12-
Boolean keyBoot = new SharedPreferencesManager(context).retrieveBoolean(SettingsActivity.KEY_PREF_BOOT_SWITCH, MainActivity.startOnBoot);
13-
11+
boolean keyBoot = new SharedPreferencesManager(context).retrieveBoolean(SettingsActivity.KEY_PREF_BOOT_SWITCH, MainActivity.startOnBoot);
1412
if (keyBoot) {
1513
Intent ServiceIntent = new Intent(context, ConnectionStateService.class);
1614
if (android.os.Build.VERSION.SDK_INT < 26) {

‎app/src/main/java/com/truemlgpro/wifiinfo/CellularDataIPActivity.java

+5-25
Original file line numberDiff line numberDiff line change
@@ -31,43 +31,23 @@
3131

3232
import me.anwarshahriar.calligrapher.Calligrapher;
3333

34-
public class CellularDataIPActivity extends AppCompatActivity
35-
{
36-
34+
public class CellularDataIPActivity extends AppCompatActivity {
3735
private TextView textview_nocellconn;
3836
private CardView cardview_ip;
3937
private CardView cardview_local_ip;
4038
private TextView textview_ip_cell;
4139
private TextView textview_header_local_ip;
4240
private TextView textview_local_ip_cell;
4341
private FloatingActionButton fab_update_ip;
44-
private ConnectivityManager CM;
45-
private NetworkInfo CellularCheck;
4642
private String publicIPFetched;
4743
private boolean siteReachable = false;
48-
private Scanner scanner;
4944

5045
private BroadcastReceiver CellularDataConnectivityReceiver;
5146

5247
@Override
5348
protected void onCreate(Bundle savedInstanceState)
5449
{
55-
Boolean keyTheme = new SharedPreferencesManager(getApplicationContext()).retrieveBoolean(SettingsActivity.KEY_PREF_SWITCH, MainActivity.darkMode);
56-
Boolean keyAmoledTheme = new SharedPreferencesManager(getApplicationContext()).retrieveBoolean(SettingsActivity.KEY_PREF_AMOLED_CHECK, MainActivity.amoledMode);
57-
58-
if (keyTheme) {
59-
setTheme(R.style.DarkTheme);
60-
}
61-
62-
if (keyAmoledTheme) {
63-
if (keyTheme) {
64-
setTheme(R.style.AmoledDarkTheme);
65-
}
66-
}
67-
68-
if (!keyTheme) {
69-
setTheme(R.style.LightTheme);
70-
}
50+
new ThemeManager().initializeThemes(this, getApplicationContext());
7151

7252
super.onCreate(savedInstanceState);
7353
setContentView(R.layout.cellular_data_ip_activity);
@@ -133,7 +113,7 @@ private boolean isReachable(String url) {
133113
public String getPublicIPAddress() {
134114
String publicIP = "";
135115
try {
136-
scanner = new Scanner(new URL("https://api.ipify.org").openStream(), "UTF-8").useDelimiter("\\A");
116+
Scanner scanner = new Scanner(new URL("https://api.ipify.org").openStream(), "UTF-8").useDelimiter("\\A");
137117
publicIP = scanner.next();
138118
scanner.close();
139119
} catch (IOException e) {
@@ -193,8 +173,8 @@ public void hideWidgets() {
193173
}
194174

195175
public void checkCellularConnectivity() {
196-
CM = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
197-
CellularCheck = CM.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
176+
ConnectivityManager CM = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
177+
NetworkInfo CellularCheck = CM.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
198178

199179
if (CellularCheck.isConnected()) {
200180
showWidgets();

‎app/src/main/java/com/truemlgpro/wifiinfo/ConnectionStateService.java

+13-23
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@
1818

1919
import androidx.annotation.RequiresApi;
2020

21-
public class ConnectionStateService extends Service
22-
{
23-
21+
public class ConnectionStateService extends Service {
2422
private BroadcastReceiver ConnectionStateReceiver;
2523
private Notification.Builder builder;
26-
private String state_online = "Connection Status — Online";
27-
private String state_offline = "Connection Status — Offline";
24+
private final String state_online = "Connection Status — Online";
25+
private final String state_offline = "Connection Status — Offline";
2826

2927
private ScreenStateReceiver ScrStateRec;
3028
private IntentFilter intentFilter;
@@ -42,9 +40,8 @@ public void onReceive(final Context context, final Intent intent)
4240
NetworkInfo WiFi_NI = CM.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
4341
boolean isConnected = WiFi_NI != null && WiFi_NI.isConnected();
4442

43+
Intent ServiceIntent = new Intent(ConnectionStateService.this, NotificationService.class);
4544
if (isConnected) {
46-
Intent ServiceIntent = new Intent(ConnectionStateService.this, NotificationService.class);
47-
4845
if (android.os.Build.VERSION.SDK_INT < 26) {
4946
startService(ServiceIntent);
5047
} else {
@@ -59,7 +56,7 @@ public void onReceive(final Context context, final Intent intent)
5956
showOnlineNotificationAPI21(context);
6057
}
6158

62-
Boolean keyStartStopScrnStateNtfc = new SharedPreferencesManager(getApplicationContext()).retrieveBoolean(SettingsActivity.KEY_PREF_STRT_STOP_SRVC_CHECK, MainActivity.startStopSrvcScrnState);
59+
boolean keyStartStopScrnStateNtfc = new SharedPreferencesManager(getApplicationContext()).retrieveBoolean(SettingsActivity.KEY_PREF_STRT_STOP_SRVC_CHECK, MainActivity.startStopSrvcScrnState);
6360

6461
if (keyStartStopScrnStateNtfc) {
6562
registerReceiver(ScrStateRec, intentFilter);
@@ -77,10 +74,8 @@ public void onReceive(final Context context, final Intent intent)
7774
isHandlerPosted = false;
7875
}
7976
}
80-
8177
isNotificationServiceRunning = true;
8278
} else {
83-
Intent ServiceIntent = new Intent(ConnectionStateService.this, NotificationService.class);
8479
if (isNotificationServiceRunning) {
8580
sendBroadcast(new Intent(ConnectionStateService.this, NotificationService.NotificationServiceStopReceiver.class).setAction("ACTION_STOP_FOREGROUND"));
8681
stopService(ServiceIntent);
@@ -264,25 +259,22 @@ public void showOfflineNotificationAPI21(Context context) {
264259
/// END ///
265260
}
266261

267-
private Handler handler = new Handler(Looper.getMainLooper());
268-
private Runnable runnable = new Runnable() {
262+
private final Handler handler = new Handler(Looper.getMainLooper());
263+
private final Runnable runnable = new Runnable() {
269264
@Override
270265
public void run() {
271266
Intent ServiceIntent = new Intent(ConnectionStateService.this, NotificationService.class);
272-
if (ScreenStateReceiver.screenState == true) {
273-
if (isNotificationServiceRunning == false) {
267+
if (ScreenStateReceiver.screenState) {
268+
if (!isNotificationServiceRunning) {
274269
if (android.os.Build.VERSION.SDK_INT < 26) {
275270
startService(ServiceIntent);
276-
isNotificationServiceRunning = true;
277271
} else {
278272
startForegroundService(ServiceIntent);
279-
isNotificationServiceRunning = true;
280273
}
274+
isNotificationServiceRunning = true;
281275
}
282-
}
283-
284-
if (ScreenStateReceiver.screenState == false) {
285-
if (isNotificationServiceRunning == true) {
276+
} else {
277+
if (isNotificationServiceRunning) {
286278
sendBroadcast(new Intent(ConnectionStateService.this, NotificationService.NotificationServiceStopReceiver.class).setAction("ACTION_STOP_FOREGROUND"));
287279
stopService(ServiceIntent);
288280
isNotificationServiceRunning = false;
@@ -428,7 +420,7 @@ public int onStartCommand(Intent intent, int flags, int startId)
428420
Intent intentActionStop = new Intent(this, ActionButtonReceiver.class);
429421
intentActionStop.setAction("ACTION_STOP_CONN_STATE_SERVICE");
430422
PendingIntent pIntentActionStop = PendingIntent.getBroadcast(this, 0, intentActionStop, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
431-
423+
432424
Notification notification = builder.setSmallIcon(R.drawable.ic_wifi_fail)
433425
.setContentTitle(state_offline)
434426
.setWhen(System.currentTimeMillis())
@@ -445,7 +437,6 @@ public int onStartCommand(Intent intent, int flags, int startId)
445437
/// ANDROID 5 - ANDROID 7 ///
446438
int NOTIFICATION_ID = 1306;
447439

448-
NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
449440
builder = new Notification.Builder(this);
450441

451442
Intent intentActionStop = new Intent(this, ActionButtonReceiver.class);
@@ -485,5 +476,4 @@ public IBinder onBind(Intent intent)
485476
{
486477
return null;
487478
}
488-
489479
}

0 commit comments

Comments
 (0)