Skip to content

Commit a1e4119

Browse files
TrueMLGProTrueMLGPro
authored
Updated to v1.5.1
Merge pull request #43 from TrueMLGPro/pre-v1.5.1
2 parents 4c19122 + cb5cdfc commit a1e4119

Some content is hidden

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

64 files changed

+561
-403
lines changed

‎CONTRIBUTING.md

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# How To Contribute
2+
3+
Prerequisites:
4+
5+
- Familiarity with [pull requests](https://help.github.com/articles/using-pull-requests) and [issues](https://guides.github.com/features/issues/).
6+
- Ability to use [Git](https://git-scm.com/downloads) or [GitHub Desktop](https://desktop.github.com/) (or any other Git GUI client you prefer).
7+
8+
## Getting Started
9+
10+
1. Fork this repository.
11+
2. Clone your fork.
12+
3. Create a branch specific to the issue you are working on.
13+
14+
> Make sure you have [Git](https://git-scm.com/downloads) installed. Open your cloned repo in the command line of your choice and create a branch (change the branch name used in the example below to your needs).
15+
>
16+
> ```console
17+
> git checkout -b fix-memory-leak-mainactivity-java
18+
> ```
19+
>
20+
> or use a GUI client (for example, [GitHub Desktop](https://desktop.github.com/)) to do it.
21+
22+
> For clarity, name your branch `update-xxx`, `fix-xxx` or `patch-xxx`. The `xxx` is a short description of the changes you're making. Examples include `update-readme` or `fix-typo-in-main-xml`.
23+
24+
4. Open up the project in Android Studio.
25+
5. First thing to do is to create a `gradle.properties` file in the project's root directory. Its contents have to match the lines below:
26+
27+
```properties
28+
# AndroidX
29+
android.useAndroidX=true
30+
android.enableJetifier=true
31+
# Release build variables
32+
KEYSTORE_LOCATION=null
33+
KEYSTORE_PASSWORD=null
34+
KEY_ALIAS=null
35+
KEY_PASSWORD=null
36+
# Optionally, you might want to add this line to reduce the build time
37+
org.gradle.parallel=true
38+
```
39+
40+
6. Sync Gradle to get the dependencies. It might take a while to complete.
41+
7. You're ready to begin the development!
42+
8. Once you're done: test, commit and push your changes.
43+
9. Open a pull request and describe the changes you've made.
44+
45+
In particular, this community seeks the following types of contributions:
46+
47+
- **Ideas**: participate in an issue thread or start your own to have your voice heard.
48+
- **Features & bug fixes**: contribute by implemeting a new feature, QoL addition/change, bug fix.
49+
- **Writing**: contribute your expertise in an area by helping us expand the included content.
50+
- **Copy editing**: fix typos, clarify language, and generally improve the quality of the content.
51+
- **Formatting**: help keep content easy to read with consistent formatting.
52+
53+
## Conduct
54+
55+
We are committed to providing a friendly, safe and welcoming environment for all.
56+
57+
Please be kind and courteous. There's no need to be mean or rude.
58+
Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer, merely an optimal answer given a set of values and circumstances.
59+
60+
Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
61+
62+
Any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.
63+
64+
## Communication
65+
66+
If you want to discuss certain addition or change, ask questions, report bugs and such - feel free to join our [Discord server](https://discord.com/invite/qxE2DFr).
67+
68+
Likewise, [GitHub Issues](https://github.com/TrueMLGPro/Wi-Fi_Info/issues/) and [GitHub Discussions](https://github.com/TrueMLGPro/Wi-Fi_Info/discussions) are the ways for communicating about specific proposed changes to this project.

‎README.md

+4
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@
8989
<li><strong>DNS Lookup Tool</strong></li>
9090
</ul>
9191

92+
<h2>Contribute</h2>
93+
94+
For contributor guidelines see <code><a href="CONTRIBUTING.md">CONTRIBUTING.md</a></code>
95+
9296
<h2>Links</h2>
9397

9498
<p>

‎app/build.gradle

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdk 31
5-
buildToolsVersion "30.0.3"
4+
namespace "com.truemlgpro.wifiinfo"
5+
compileSdk 33
6+
buildToolsVersion '33.0.0'
67

78
signingConfigs {
89
release {
@@ -19,17 +20,17 @@ android {
1920
defaultConfig {
2021
applicationId "com.truemlgpro.wifiinfo"
2122
minSdkVersion 21
22-
targetSdkVersion 31
23-
versionCode 1500
24-
versionName "1.5"
23+
targetSdkVersion 33
24+
versionCode 1510
25+
versionName "1.5.1"
2526
}
2627
buildTypes {
2728
release {
2829
debuggable false
2930
minifyEnabled true
3031
shrinkResources true
31-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3232
signingConfig signingConfigs.release
33+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3334
}
3435
debug {
3536
versionNameSuffix "_dev"
@@ -42,6 +43,7 @@ android {
4243
debuggable true
4344
minifyEnabled true
4445
shrinkResources true
46+
signingConfig signingConfigs.debug
4547
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
4648
}
4749
}
@@ -52,20 +54,20 @@ android {
5254
}
5355

5456
dependencies {
55-
implementation 'com.android.support:design:27.1.0'
56-
implementation 'com.android.support:support-v4:27.1.0'
57-
implementation 'com.android.support:appcompat-v7:27.1.0'
58-
implementation 'com.android.support:cardview-v7:27.1.0'
59-
implementation 'com.android.support:preference-v7:27.1.0'
60-
implementation 'com.android.support:preference-v14:27.1.0'
61-
implementation 'me.anwarshahriar:calligrapher:1.0'
62-
implementation 'com.github.bloder:magic:1.1'
63-
implementation 'com.mikhaellopez:circularimageview:3.2.0'
64-
implementation 'com.github.clans:fab:1.6.4'
57+
implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
58+
implementation 'com.google.android.material:material:1.7.0'
59+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
60+
implementation 'androidx.cardview:cardview:1.0.0'
61+
implementation 'androidx.preference:preference:1.2.0'
62+
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
63+
implementation 'com.github.AnwarShahriar:Calligrapher:master'
64+
implementation 'com.github.bloderxd:MagicButton:1.1'
65+
implementation 'com.mikhaellopez:circularimageview:4.3.1'
66+
implementation 'com.github.sougata-chatterjee:FloatingActionButton:1.7.0'
6567
implementation 'com.github.stealthcopter:AndroidNetworkTools:0.4.5.3'
6668
implementation 'com.github.100rabhkr:TCWHOIS:master' // Minimum SDK version is 22, ignored in AndroidManifest.xml
67-
implementation 'org.minidns:minidns-hla:1.0.2'
68-
implementation 'org.minidns:minidns-android21:1.0.2'
69+
implementation 'org.minidns:minidns-hla:1.0.4'
70+
implementation 'org.minidns:minidns-android21:1.0.4'
6971
// api 'com.getkeepsafe.taptargetview:taptargetview:1.12.0'
7072
// api 'com.pes.materialcolorpicker:library:1.2.5'
7173
implementation fileTree(dir: 'libs', include: ['*.jar'])

‎app/src/main/AndroidManifest.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
<uses-sdk
77
android:minSdkVersion="21"
8-
android:targetSdkVersion="31"
9-
tools:overrideLibrary="thecollectiveweb.com.tcwhois" />
8+
android:targetSdkVersion="33"
9+
tools:overrideLibrary="thecollectiveweb.com.tcwhois"
10+
tools:ignore="GradleOverrides" />
1011

1112
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
1213
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
import android.os.Bundle;
1111
import android.os.Handler;
1212
import android.os.Looper;
13-
import android.support.v7.app.ActionBar;
14-
import android.support.v7.app.AppCompatActivity;
15-
import android.support.v7.widget.CardView;
16-
import android.support.v7.widget.Toolbar;
1713
import android.view.View;
1814
import android.widget.TextView;
1915

16+
import androidx.appcompat.app.ActionBar;
17+
import androidx.appcompat.app.AppCompatActivity;
18+
import androidx.appcompat.widget.Toolbar;
19+
import androidx.cardview.widget.CardView;
20+
2021
import com.github.clans.fab.FloatingActionButton;
2122

2223
import java.io.IOException;

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
import android.os.Handler;
1616
import android.os.IBinder;
1717
import android.os.Looper;
18-
import android.support.annotation.RequiresApi;
18+
19+
import androidx.annotation.RequiresApi;
1920

2021
public class ConnectionStateService extends Service
2122
{
@@ -426,7 +427,7 @@ public int onStartCommand(Intent intent, int flags, int startId)
426427

427428
Intent intentActionStop = new Intent(this, ActionButtonReceiver.class);
428429
intentActionStop.setAction("ACTION_STOP_CONN_STATE_SERVICE");
429-
PendingIntent pIntentActionStop = PendingIntent.getBroadcast(this, 0, intentActionStop, PendingIntent.FLAG_ONE_SHOT);
430+
PendingIntent pIntentActionStop = PendingIntent.getBroadcast(this, 0, intentActionStop, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
430431

431432
Notification notification = builder.setSmallIcon(R.drawable.ic_wifi_fail)
432433
.setContentTitle(state_offline)

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

+9-6
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
import android.net.NetworkInfo;
99
import android.os.AsyncTask;
1010
import android.os.Bundle;
11-
import android.support.design.widget.TextInputLayout;
12-
import android.support.v7.app.ActionBar;
13-
import android.support.v7.app.AppCompatActivity;
14-
import android.support.v7.widget.Toolbar;
1511
import android.text.TextUtils;
1612
import android.view.View;
1713
import android.widget.AdapterView;
@@ -23,16 +19,23 @@
2319
import android.widget.TextView;
2420
import android.widget.Toast;
2521

26-
import me.anwarshahriar.calligrapher.Calligrapher;
22+
import androidx.appcompat.app.ActionBar;
23+
import androidx.appcompat.app.AppCompatActivity;
24+
import androidx.appcompat.widget.Toolbar;
25+
26+
import com.google.android.material.textfield.TextInputLayout;
27+
28+
import org.minidns.dnsserverlookup.android21.AndroidUsingLinkProperties;
2729
import org.minidns.hla.ResolverApi;
2830
import org.minidns.hla.ResolverResult;
29-
import org.minidns.dnsserverlookup.android21.AndroidUsingLinkProperties;
3031
import org.minidns.record.Data;
3132
import org.minidns.record.Record;
3233

3334
import java.io.IOException;
3435
import java.util.Set;
3536

37+
import me.anwarshahriar.calligrapher.Calligrapher;
38+
3639
public class DNSLookupActivity extends AppCompatActivity {
3740

3841
private TextView textview_nonetworkconn;

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
import android.content.pm.PackageManager;
77
import android.os.Build;
88
import android.os.Bundle;
9-
import android.support.v7.app.ActionBar;
10-
import android.support.v7.app.AppCompatActivity;
11-
import android.support.v7.widget.Toolbar;
129
import android.view.View;
1310
import android.widget.TextView;
1411
import android.widget.Toast;
1512

13+
import androidx.appcompat.app.ActionBar;
14+
import androidx.appcompat.app.AppCompatActivity;
15+
import androidx.appcompat.widget.Toolbar;
16+
1617
import br.com.bloder.magic.view.MagicButton;
1718
import me.anwarshahriar.calligrapher.Calligrapher;
1819

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
import android.content.Intent;
44
import android.net.Uri;
55
import android.os.Bundle;
6-
import android.support.v7.app.ActionBar;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
96
import android.view.View;
107

8+
import androidx.appcompat.app.ActionBar;
9+
import androidx.appcompat.app.AppCompatActivity;
10+
import androidx.appcompat.widget.Toolbar;
11+
1112
import me.anwarshahriar.calligrapher.Calligrapher;
1213

1314
public class DiscordServersActivity extends AppCompatActivity

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@
1010
import android.net.wifi.WifiManager;
1111
import android.os.Build;
1212
import android.os.Bundle;
13-
import android.support.annotation.NonNull;
14-
import android.support.v7.app.ActionBar;
15-
import android.support.v7.app.AppCompatActivity;
16-
import android.support.v7.widget.Toolbar;
1713
import android.util.Log;
1814
import android.view.View;
1915
import android.widget.ArrayAdapter;
2016
import android.widget.Button;
2117
import android.widget.ListView;
2218
import android.widget.TextView;
2319

20+
import androidx.annotation.NonNull;
21+
import androidx.appcompat.app.ActionBar;
22+
import androidx.appcompat.app.AppCompatActivity;
23+
import androidx.appcompat.widget.Toolbar;
24+
2425
import com.stealthcopter.networktools.SubnetDevices;
2526
import com.stealthcopter.networktools.subnet.Device;
2627

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.Manifest;
44
import android.annotation.SuppressLint;
5-
import android.app.AlertDialog;
65
import android.content.BroadcastReceiver;
76
import android.content.ClipData;
87
import android.content.ClipboardManager;
@@ -33,21 +32,23 @@
3332
import android.os.HandlerThread;
3433
import android.os.Looper;
3534
import android.provider.Settings;
36-
import android.support.annotation.NonNull;
37-
import android.support.v4.app.ActivityCompat;
38-
import android.support.v4.content.ContextCompat;
39-
import android.support.v7.app.ActionBar;
40-
import android.support.v7.app.AppCompatActivity;
41-
import android.support.v7.preference.PreferenceManager;
42-
import android.support.v7.widget.CardView;
43-
import android.support.v7.widget.Toolbar;
4435
import android.util.Log;
4536
import android.view.Menu;
4637
import android.view.MenuItem;
4738
import android.view.View;
4839
import android.widget.TextView;
4940
import android.widget.Toast;
5041

42+
import androidx.annotation.NonNull;
43+
import androidx.appcompat.app.ActionBar;
44+
import androidx.appcompat.app.AlertDialog;
45+
import androidx.appcompat.app.AppCompatActivity;
46+
import androidx.appcompat.widget.Toolbar;
47+
import androidx.cardview.widget.CardView;
48+
import androidx.core.app.ActivityCompat;
49+
import androidx.core.content.ContextCompat;
50+
import androidx.preference.PreferenceManager;
51+
5152
import com.github.clans.fab.FloatingActionButton;
5253
import com.github.clans.fab.FloatingActionMenu;
5354

@@ -417,7 +418,7 @@ protected void onCreate(Bundle savedInstanceState)
417418
/// END ///
418419

419420
super.onCreate(savedInstanceState);
420-
setContentView(R.layout.main);
421+
setContentView(R.layout.main);
421422

422423
/// Initialize ///
423424

@@ -540,8 +541,7 @@ protected void onCreate(Bundle savedInstanceState)
540541

541542
/// Set default preferences ///
542543

543-
android.support.v7.preference.PreferenceManager
544-
.setDefaultValues(this, R.xml.preferences, false);
544+
PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
545545

546546
/// END ///
547547

@@ -1786,7 +1786,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
17861786
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
17871787
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
17881788
builder.setTitle("Background Location Permission (Optional)")
1789-
.setMessage("Due to the changes in Android 11+ you need to go to Settings to enable it" + "\n" + "Once Background Location permission is granted you'll be able to see SSID in the notification even if you close the app")
1789+
.setMessage("Due to the changes in Android 11+ you need to go to Settings to enable it" + "\n" + "Once Background Location permission is granted you'll be able to see the SSID in notification even if you close the app")
17901790
.setPositiveButton("Ok", (dialog, id) -> {
17911791
Toast.makeText(MainActivity.this, "Go to Permissions -> Location", Toast.LENGTH_LONG).show();
17921792
Toast.makeText(MainActivity.this, "Select \"Allow all the time\"", Toast.LENGTH_LONG).show();

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
import android.os.IBinder;
1919
import android.os.Looper;
2020
import android.provider.Settings;
21-
import android.support.annotation.RequiresApi;
2221
import android.util.Log;
2322

23+
import androidx.annotation.RequiresApi;
24+
2425
import java.net.Inet4Address;
2526
import java.net.InetAddress;
2627
import java.net.NetworkInterface;

0 commit comments

Comments
 (0)