Skip to content

Commit d306774

Browse files
VREMSoftwareDevelopmentVREMSoftwareDevelopment
committed
code cleanup
1 parent aa34750 commit d306774

File tree

11 files changed

+211
-36
lines changed

11 files changed

+211
-36
lines changed

‎app/build.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#
1818

1919
#Build Properties
20-
#Sun Jul 07 09:23:00 EDT 2019
20+
#Mon Jul 08 17:30:22 EDT 2019
2121
version_minor=0
22-
version_build=5
22+
version_build=6
2323
version_patch=5
24-
version_major=2
2524
version_store=46
25+
version_major=2

‎app/src/main/java/com/vrem/wifianalyzer/MainActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import com.vrem.wifianalyzer.navigation.NavigationMenuControl;
4040
import com.vrem.wifianalyzer.navigation.NavigationMenuController;
4141
import com.vrem.wifianalyzer.navigation.options.OptionMenu;
42-
import com.vrem.wifianalyzer.permission.PermissionChecker;
42+
import com.vrem.wifianalyzer.permission.ApplicationPermission;
4343
import com.vrem.wifianalyzer.settings.Repository;
4444
import com.vrem.wifianalyzer.settings.Settings;
4545
import com.vrem.wifianalyzer.wifi.accesspoint.ConnectionView;
@@ -56,7 +56,7 @@ public class MainActivity extends AppCompatActivity implements NavigationMenuCon
5656
private NavigationMenu navigationMenu;
5757
private OptionMenu optionMenu;
5858
private String currentCountryCode;
59-
private PermissionChecker permissionChecker;
59+
private ApplicationPermission applicationPermission;
6060

6161
@Override
6262
protected void attachBaseContext(Context newBase) {
@@ -99,8 +99,8 @@ protected void onCreate(Bundle savedInstanceState) {
9999
ConnectionView connectionView = new ConnectionView(this);
100100
mainContext.getScannerService().register(connectionView);
101101

102-
permissionChecker = new PermissionChecker(this);
103-
permissionChecker.check();
102+
applicationPermission = new ApplicationPermission(this);
103+
applicationPermission.check();
104104
}
105105

106106
@Override
@@ -117,7 +117,7 @@ public void onConfigurationChanged(Configuration newConfig) {
117117

118118
@Override
119119
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
120-
if (!permissionChecker.isGranted(requestCode, grantResults)) {
120+
if (!applicationPermission.isGranted(requestCode, grantResults)) {
121121
finish();
122122
}
123123
super.onRequestPermissionsResult(requestCode, permissions, grantResults);

app/src/main/java/com/vrem/wifianalyzer/permission/PermissionChecker.java renamed to app/src/main/java/com/vrem/wifianalyzer/permission/ApplicationPermission.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525

2626
import com.vrem.util.BuildUtils;
2727

28-
public class PermissionChecker {
28+
public class ApplicationPermission {
2929
static final String[] PERMISSIONS = {Manifest.permission.ACCESS_COARSE_LOCATION};
3030
static final int REQUEST_CODE = 0x123450;
3131

3232
private final Activity activity;
3333
private final PermissionDialog permissionDialog;
3434

35-
public PermissionChecker(@NonNull Activity activity) {
35+
public ApplicationPermission(@NonNull Activity activity) {
3636
this(activity, new PermissionDialog(activity));
3737
}
3838

39-
PermissionChecker(@NonNull Activity activity, @NonNull PermissionDialog permissionDialog) {
39+
ApplicationPermission(@NonNull Activity activity, @NonNull PermissionDialog permissionDialog) {
4040
this.activity = activity;
4141
this.permissionDialog = permissionDialog;
4242
}
@@ -55,7 +55,7 @@ public boolean isGranted(int requestCode, @NonNull int[] grantResults) {
5555
return requestCode == REQUEST_CODE && grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
5656
}
5757

58-
public boolean isGranted() {
58+
boolean isGranted() {
5959
return isGranted(Manifest.permission.ACCESS_COARSE_LOCATION) || isGranted(Manifest.permission.ACCESS_FINE_LOCATION);
6060
}
6161

‎app/src/main/java/com/vrem/wifianalyzer/permission/PermissionDialog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static class OkClick implements OnClickListener {
5959
public void onClick(DialogInterface dialog, int which) {
6060
dialog.dismiss();
6161
if (BuildUtils.isMinVersionM()) {
62-
activity.requestPermissions(PermissionChecker.PERMISSIONS, PermissionChecker.REQUEST_CODE);
62+
activity.requestPermissions(ApplicationPermission.PERMISSIONS, ApplicationPermission.REQUEST_CODE);
6363
}
6464
}
6565
}

‎app/src/main/java/com/vrem/wifianalyzer/permission/RequirementPermission.java‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* WiFiAnalyzer
3+
* Copyright (C) 2019 VREM Software Development <[email protected]>
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>
17+
*/
18+
19+
package com.vrem.wifianalyzer.permission;
20+
21+
import android.app.Activity;
22+
import android.support.annotation.NonNull;
23+
24+
import com.vrem.util.BuildUtils;
25+
26+
public class RequirementPermission {
27+
private SystemPermission systemPermission;
28+
private ApplicationPermission applicationPermission;
29+
30+
public RequirementPermission(@NonNull Activity activity) {
31+
this.applicationPermission = new ApplicationPermission(activity);
32+
this.systemPermission = new SystemPermission(activity);
33+
}
34+
35+
public boolean isEnabled() {
36+
if (BuildUtils.isMinVersionM()) {
37+
return systemPermission.isEnabled() && applicationPermission.isGranted();
38+
} else {
39+
return true;
40+
}
41+
}
42+
43+
void setSystemPermission(SystemPermission systemPermission) {
44+
this.systemPermission = systemPermission;
45+
}
46+
47+
void setApplicationPermission(ApplicationPermission applicationPermission) {
48+
this.applicationPermission = applicationPermission;
49+
}
50+
}

app/src/main/java/com/vrem/wifianalyzer/permission/LocationChecker.java renamed to app/src/main/java/com/vrem/wifianalyzer/permission/SystemPermission.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525

2626
import com.vrem.util.BuildUtils;
2727

28-
public class LocationChecker {
28+
public class SystemPermission {
2929
private final Activity activity;
3030

31-
public LocationChecker(@NonNull Activity activity) {
31+
public SystemPermission(@NonNull Activity activity) {
3232
this.activity = activity;
3333
}
3434

‎app/src/main/java/com/vrem/wifianalyzer/wifi/accesspoint/ConnectionView.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
import com.vrem.wifianalyzer.MainActivity;
2929
import com.vrem.wifianalyzer.MainContext;
3030
import com.vrem.wifianalyzer.R;
31-
import com.vrem.wifianalyzer.permission.LocationChecker;
32-
import com.vrem.wifianalyzer.permission.PermissionChecker;
31+
import com.vrem.wifianalyzer.permission.RequirementPermission;
3332
import com.vrem.wifianalyzer.wifi.model.WiFiConnection;
3433
import com.vrem.wifianalyzer.wifi.model.WiFiData;
3534
import com.vrem.wifianalyzer.wifi.model.WiFiDetail;
@@ -39,15 +38,13 @@
3938

4039
public class ConnectionView implements UpdateNotifier {
4140
private final MainActivity mainActivity;
42-
private final PermissionChecker permissionChecker;
43-
private final LocationChecker locationChecker;
41+
private final RequirementPermission requirementPermission;
4442
private AccessPointDetail accessPointDetail;
4543
private AccessPointPopup accessPointPopup;
4644

4745
public ConnectionView(@NonNull MainActivity mainActivity) {
4846
this.mainActivity = mainActivity;
49-
this.permissionChecker = new PermissionChecker(mainActivity);
50-
this.locationChecker = new LocationChecker(mainActivity);
47+
this.requirementPermission = new RequirementPermission(mainActivity);
5148
setAccessPointDetail(new AccessPointDetail());
5249
setAccessPointPopup(new AccessPointPopup());
5350
}
@@ -77,7 +74,7 @@ private void displayNoData(@NonNull WiFiData wiFiData) {
7774
}
7875

7976
private int getNoLocationVisibility(int visibility) {
80-
return locationChecker.isEnabled() && permissionChecker.isGranted() ? View.GONE : visibility;
77+
return requirementPermission.isEnabled() ? View.GONE : visibility;
8178
}
8279

8380
private boolean noData(@NonNull WiFiData wiFiData) {

app/src/test/java/com/vrem/wifianalyzer/permission/PermissionCheckerTest.java renamed to app/src/test/java/com/vrem/wifianalyzer/permission/ApplicationPermissionTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@
3737
import static org.mockito.Mockito.when;
3838

3939
@RunWith(RobolectricTestRunner.class)
40-
public class PermissionCheckerTest {
40+
public class ApplicationPermissionTest {
4141

4242
private Activity activity;
4343
private PermissionDialog permissionDialog;
44-
private PermissionChecker fixture;
44+
private ApplicationPermission fixture;
4545

4646
@Before
4747
public void setUp() {
4848
activity = mock(Activity.class);
4949
permissionDialog = mock(PermissionDialog.class);
50-
fixture = new PermissionChecker(activity, permissionDialog);
50+
fixture = new ApplicationPermission(activity, permissionDialog);
5151
}
5252

5353
@After
@@ -65,7 +65,7 @@ public void testCheckWithCoarseLocationGranted() {
6565
verify(activity).checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION);
6666
verify(activity, never()).checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION);
6767
verify(activity, never()).isFinishing();
68-
verify(activity, never()).requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, PermissionChecker.REQUEST_CODE);
68+
verify(activity, never()).requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, ApplicationPermission.REQUEST_CODE);
6969
}
7070

7171
@Test
@@ -79,7 +79,7 @@ public void testCheckWithFineLocationGranted() {
7979
verify(activity).checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION);
8080
verify(activity).checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION);
8181
verify(activity, never()).isFinishing();
82-
verify(activity, never()).requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, PermissionChecker.REQUEST_CODE);
82+
verify(activity, never()).requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, ApplicationPermission.REQUEST_CODE);
8383
}
8484

8585
@Test
@@ -94,7 +94,7 @@ public void testCheckWithActivityFinish() {
9494
verify(activity).checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION);
9595
verify(activity).checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION);
9696
verify(activity).isFinishing();
97-
verify(activity, never()).requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, PermissionChecker.REQUEST_CODE);
97+
verify(activity, never()).requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, ApplicationPermission.REQUEST_CODE);
9898
}
9999

100100
@Test
@@ -117,7 +117,7 @@ public void testIsGranted() {
117117
// setup
118118
int[] grantResults = new int[]{PackageManager.PERMISSION_GRANTED};
119119
// execute
120-
boolean actual = fixture.isGranted(PermissionChecker.REQUEST_CODE, grantResults);
120+
boolean actual = fixture.isGranted(ApplicationPermission.REQUEST_CODE, grantResults);
121121
// validate
122122
assertTrue(actual);
123123
}
@@ -127,7 +127,7 @@ public void testIsGrantedWithOtherRequestCode() {
127127
// setup
128128
int[] grantResults = new int[]{PackageManager.PERMISSION_GRANTED};
129129
// execute
130-
boolean actual = fixture.isGranted(-PermissionChecker.REQUEST_CODE, grantResults);
130+
boolean actual = fixture.isGranted(-ApplicationPermission.REQUEST_CODE, grantResults);
131131
// validate
132132
assertFalse(actual);
133133
}
@@ -137,7 +137,7 @@ public void testIsGrantedWithNoResults() {
137137
// setup
138138
int[] grantResults = new int[]{};
139139
// execute
140-
boolean actual = fixture.isGranted(PermissionChecker.REQUEST_CODE, grantResults);
140+
boolean actual = fixture.isGranted(ApplicationPermission.REQUEST_CODE, grantResults);
141141
// validate
142142
assertFalse(actual);
143143
}
@@ -147,7 +147,7 @@ public void testIsGrantedWithNoPermissioGranted() {
147147
// setup
148148
int[] grantResults = new int[]{PackageManager.PERMISSION_DENIED};
149149
// execute
150-
boolean actual = fixture.isGranted(PermissionChecker.REQUEST_CODE, grantResults);
150+
boolean actual = fixture.isGranted(ApplicationPermission.REQUEST_CODE, grantResults);
151151
// validate
152152
assertFalse(actual);
153153
}

‎app/src/test/java/com/vrem/wifianalyzer/permission/PermissionDialogTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void testOkClick() {
6161
// execute
6262
fixture.onClick(dialog, 0);
6363
// validate
64-
verify(activity).requestPermissions(PermissionChecker.PERMISSIONS, PermissionChecker.REQUEST_CODE);
64+
verify(activity).requestPermissions(ApplicationPermission.PERMISSIONS, ApplicationPermission.REQUEST_CODE);
6565
verify(dialog).dismiss();
6666
verifyNoMoreInteractions(activity);
6767
verifyNoMoreInteractions(dialog);

0 commit comments

Comments
 (0)