Skip to content

Commit 027e106

Browse files
VREMSoftwareDevelopmentVREMSoftwareDevelopment
committed
create scanner service factory
1 parent ccc77f5 commit 027e106

27 files changed

+236
-117
lines changed

‎app/build.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Build Properties
2-
#Fri Dec 29 08:07:50 EST 2017
2+
#Fri Dec 29 08:42:58 EST 2017
33
version_minor=8
4-
version_build=6
4+
version_build=7
55
version_patch=8
6-
version_store=34
76
version_major=1
7+
version_store=34

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected void onCreate(Bundle savedInstanceState) {
100100
onNavigationItemSelected(navigationMenuView.getCurrentMenuItem());
101101

102102
ConnectionView connectionView = new ConnectionView(this);
103-
mainContext.getScanner().register(connectionView);
103+
mainContext.getScannerService().register(connectionView);
104104
}
105105

106106
private void setWiFiChannelPairs(MainContext mainContext) {
@@ -132,7 +132,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
132132
}
133133

134134
public void update() {
135-
MainContext.INSTANCE.getScanner().update();
135+
MainContext.INSTANCE.getScannerService().update();
136136
updateActionBar();
137137
}
138138

@@ -193,7 +193,7 @@ protected void onResume() {
193193

194194
@Override
195195
protected void onStop() {
196-
MainContext.INSTANCE.getScanner().setWiFiOnExit();
196+
MainContext.INSTANCE.getScannerService().setWiFiOnExit();
197197
super.onStop();
198198
}
199199

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@
3030
import com.vrem.wifianalyzer.vendor.model.VendorService;
3131
import com.vrem.wifianalyzer.vendor.model.VendorServiceFactory;
3232
import com.vrem.wifianalyzer.wifi.filter.adapter.FilterAdapter;
33-
import com.vrem.wifianalyzer.wifi.scanner.Scanner;
33+
import com.vrem.wifianalyzer.wifi.scanner.ScannerService;
34+
import com.vrem.wifianalyzer.wifi.scanner.ScannerServiceFactory;
3435

3536
public enum MainContext {
3637
INSTANCE;
3738

3839
private Settings settings;
3940
private MainActivity mainActivity;
40-
private Scanner scanner;
41+
private ScannerService scannerService;
4142
private VendorService vendorService;
4243
private Configuration configuration;
4344
private FilterAdapter filterAdapter;
@@ -58,12 +59,12 @@ void setVendorService(VendorService vendorService) {
5859
this.vendorService = vendorService;
5960
}
6061

61-
public Scanner getScanner() {
62-
return scanner;
62+
public ScannerService getScannerService() {
63+
return scannerService;
6364
}
6465

65-
void setScanner(Scanner scanner) {
66-
this.scanner = scanner;
66+
void setScannerService(ScannerService scannerService) {
67+
this.scannerService = scannerService;
6768
}
6869

6970
public MainActivity getMainActivity() {
@@ -113,7 +114,7 @@ void initialize(@NonNull MainActivity mainActivity, boolean largeScreen) {
113114
setConfiguration(currentConfiguration);
114115
setSettings(currentSettings);
115116
setVendorService(VendorServiceFactory.makeVendorService(mainActivity.getResources()));
116-
setScanner(new Scanner(wifiManager, handler, currentSettings));
117+
setScannerService(ScannerServiceFactory.makeScannerService(wifiManager, handler, currentSettings));
117118
setFilterAdapter(new FilterAdapter(currentSettings));
118119
}
119120

‎app/src/main/java/com/vrem/wifianalyzer/menu/OptionMenu.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void create(@NonNull Activity activity, Menu menu) {
3838
public void select(@NonNull MenuItem item) {
3939
switch (item.getItemId()) {
4040
case R.id.action_scanner:
41-
if (MainContext.INSTANCE.getScanner().isRunning()) {
41+
if (MainContext.INSTANCE.getScannerService().isRunning()) {
4242
pause();
4343
} else {
4444
resume();
@@ -54,11 +54,11 @@ public void select(@NonNull MenuItem item) {
5454
}
5555

5656
public void pause() {
57-
MainContext.INSTANCE.getScanner().pause();
57+
MainContext.INSTANCE.getScannerService().pause();
5858
}
5959

6060
public void resume() {
61-
MainContext.INSTANCE.getScanner().resume();
61+
MainContext.INSTANCE.getScannerService().resume();
6262
}
6363

6464
public Menu getMenu() {

‎app/src/main/java/com/vrem/wifianalyzer/navigation/items/ExportItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ String getData(String timestamp, @NonNull List<WiFiDetail> wiFiDetails) {
9090
}
9191

9292
private List<WiFiDetail> getWiFiDetails() {
93-
return MainContext.INSTANCE.getScanner().getWiFiData().getWiFiDetails();
93+
return MainContext.INSTANCE.getScannerService().getWiFiData().getWiFiDetails();
9494
}
9595

9696
@NonNull

‎app/src/main/java/com/vrem/wifianalyzer/navigation/options/ScannerSwitchOn.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void apply(@NonNull MainActivity mainActivity) {
3434
if (menu != null) {
3535
MenuItem menuItem = menu.findItem(R.id.action_scanner);
3636
menuItem.setVisible(true);
37-
if (MainContext.INSTANCE.getScanner().isRunning()) {
37+
if (MainContext.INSTANCE.getScannerService().isRunning()) {
3838
menuItem.setTitle(R.string.action_pause);
3939
menuItem.setIcon(R.drawable.ic_pause_grey_500_48dp);
4040
} else {

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
package com.vrem.wifianalyzer.wifi.accesspoint;
2020

2121
import android.os.Bundle;
22+
import android.support.annotation.NonNull;
2223
import android.support.v4.app.Fragment;
23-
import android.support.v4.app.FragmentActivity;
2424
import android.support.v4.widget.SwipeRefreshLayout;
2525
import android.view.LayoutInflater;
2626
import android.view.View;
@@ -29,36 +29,32 @@
2929

3030
import com.vrem.wifianalyzer.MainContext;
3131
import com.vrem.wifianalyzer.R;
32-
import com.vrem.wifianalyzer.wifi.scanner.Scanner;
3332

3433
public class AccessPointsFragment extends Fragment {
3534
private SwipeRefreshLayout swipeRefreshLayout;
3635
private AccessPointsAdapter accessPointsAdapter;
3736

3837
@Override
39-
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
40-
FragmentActivity activity = getActivity();
38+
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
4139

4240
View view = inflater.inflate(R.layout.access_points_content, container, false);
4341

4442
swipeRefreshLayout = view.findViewById(R.id.accessPointsRefresh);
4543
swipeRefreshLayout.setOnRefreshListener(new ListViewOnRefreshListener());
4644

47-
accessPointsAdapter = new AccessPointsAdapter(activity);
45+
accessPointsAdapter = new AccessPointsAdapter(getActivity());
4846
ExpandableListView expandableListView = view.findViewById(R.id.accessPointsView);
4947
expandableListView.setAdapter(accessPointsAdapter);
5048
accessPointsAdapter.setExpandableListView(expandableListView);
5149

52-
Scanner scanner = MainContext.INSTANCE.getScanner();
53-
scanner.register(accessPointsAdapter);
50+
MainContext.INSTANCE.getScannerService().register(accessPointsAdapter);
5451

5552
return view;
5653
}
5754

5855
private void refresh() {
5956
swipeRefreshLayout.setRefreshing(true);
60-
Scanner scanner = MainContext.INSTANCE.getScanner();
61-
scanner.update();
57+
MainContext.INSTANCE.getScannerService().update();
6258
swipeRefreshLayout.setRefreshing(false);
6359
}
6460

@@ -70,8 +66,7 @@ public void onResume() {
7066

7167
@Override
7268
public void onDestroy() {
73-
Scanner scanner = MainContext.INSTANCE.getScanner();
74-
scanner.unregister(accessPointsAdapter);
69+
MainContext.INSTANCE.getScannerService().unregister(accessPointsAdapter);
7570
super.onDestroy();
7671
}
7772

‎app/src/main/java/com/vrem/wifianalyzer/wifi/channelgraph/ChannelGraphFragment.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package com.vrem.wifianalyzer.wifi.channelgraph;
2020

2121
import android.os.Bundle;
22+
import android.support.annotation.NonNull;
2223
import android.support.v4.app.Fragment;
2324
import android.support.v4.widget.SwipeRefreshLayout;
2425
import android.view.LayoutInflater;
@@ -29,7 +30,6 @@
2930
import com.vrem.wifianalyzer.MainContext;
3031
import com.vrem.wifianalyzer.R;
3132
import com.vrem.wifianalyzer.wifi.graphutils.GraphViewAdd;
32-
import com.vrem.wifianalyzer.wifi.scanner.Scanner;
3333

3434
import org.apache.commons.collections4.IterableUtils;
3535

@@ -38,7 +38,7 @@ public class ChannelGraphFragment extends Fragment {
3838
private ChannelGraphAdapter channelGraphAdapter;
3939

4040
@Override
41-
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
41+
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
4242
View view = inflater.inflate(R.layout.graph_content, container, false);
4343

4444
swipeRefreshLayout = view.findViewById(R.id.graphRefresh);
@@ -49,8 +49,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
4949
channelGraphAdapter = new ChannelGraphAdapter(channelGraphNavigation);
5050
addGraphViews(swipeRefreshLayout, channelGraphAdapter);
5151

52-
Scanner scanner = MainContext.INSTANCE.getScanner();
53-
scanner.register(channelGraphAdapter);
52+
MainContext.INSTANCE.getScannerService().register(channelGraphAdapter);
5453

5554
return view;
5655
}
@@ -62,8 +61,7 @@ private void addGraphViews(View view, ChannelGraphAdapter channelGraphAdapter) {
6261

6362
private void refresh() {
6463
swipeRefreshLayout.setRefreshing(true);
65-
Scanner scanner = MainContext.INSTANCE.getScanner();
66-
scanner.update();
64+
MainContext.INSTANCE.getScannerService().update();
6765
swipeRefreshLayout.setRefreshing(false);
6866
}
6967

@@ -75,8 +73,7 @@ public void onResume() {
7573

7674
@Override
7775
public void onDestroy() {
78-
Scanner scanner = MainContext.INSTANCE.getScanner();
79-
scanner.unregister(channelGraphAdapter);
76+
MainContext.INSTANCE.getScannerService().unregister(channelGraphAdapter);
8077
super.onDestroy();
8178
}
8279

‎app/src/main/java/com/vrem/wifianalyzer/wifi/channelgraph/ChannelGraphNavigation.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import com.vrem.wifianalyzer.wifi.model.WiFiData;
3939
import com.vrem.wifianalyzer.wifi.model.WiFiDetail;
4040
import com.vrem.wifianalyzer.wifi.predicate.FilterPredicate;
41-
import com.vrem.wifianalyzer.wifi.scanner.Scanner;
4241

4342
import org.apache.commons.collections4.Closure;
4443
import org.apache.commons.collections4.CollectionUtils;
@@ -100,8 +99,7 @@ static class SetOnClickListener implements OnClickListener {
10099
public void onClick(View view) {
101100
MainContext mainContext = MainContext.INSTANCE;
102101
mainContext.getConfiguration().setWiFiChannelPair(wiFiChannelPair);
103-
Scanner scanner = mainContext.getScanner();
104-
scanner.update();
102+
mainContext.getScannerService().update();
105103
}
106104
}
107105

‎app/src/main/java/com/vrem/wifianalyzer/wifi/channelrating/ChannelRatingFragment.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
package com.vrem.wifianalyzer.wifi.channelrating;
2020

2121
import android.os.Bundle;
22+
import android.support.annotation.NonNull;
2223
import android.support.v4.app.Fragment;
23-
import android.support.v4.app.FragmentActivity;
2424
import android.support.v4.widget.SwipeRefreshLayout;
2525
import android.view.LayoutInflater;
2626
import android.view.View;
@@ -30,15 +30,13 @@
3030

3131
import com.vrem.wifianalyzer.MainContext;
3232
import com.vrem.wifianalyzer.R;
33-
import com.vrem.wifianalyzer.wifi.scanner.Scanner;
3433

3534
public class ChannelRatingFragment extends Fragment {
3635
private SwipeRefreshLayout swipeRefreshLayout;
3736
private ChannelRatingAdapter channelRatingAdapter;
3837

3938
@Override
40-
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
41-
FragmentActivity activity = getActivity();
39+
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
4240

4341
View view = inflater.inflate(R.layout.channel_rating_content, container, false);
4442

@@ -48,19 +46,17 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
4846
TextView bestChannels = view.findViewById(R.id.channelRatingBestChannels);
4947
ListView listView = view.findViewById(R.id.channelRatingView);
5048

51-
channelRatingAdapter = new ChannelRatingAdapter(activity, bestChannels);
49+
channelRatingAdapter = new ChannelRatingAdapter(getActivity(), bestChannels);
5250
listView.setAdapter(channelRatingAdapter);
5351

54-
Scanner scanner = MainContext.INSTANCE.getScanner();
55-
scanner.register(channelRatingAdapter);
52+
MainContext.INSTANCE.getScannerService().register(channelRatingAdapter);
5653

5754
return view;
5855
}
5956

6057
private void refresh() {
6158
swipeRefreshLayout.setRefreshing(true);
62-
Scanner scanner = MainContext.INSTANCE.getScanner();
63-
scanner.update();
59+
MainContext.INSTANCE.getScannerService().update();
6460
swipeRefreshLayout.setRefreshing(false);
6561
}
6662

@@ -72,8 +68,7 @@ public void onResume() {
7268

7369
@Override
7470
public void onDestroy() {
75-
Scanner scanner = MainContext.INSTANCE.getScanner();
76-
scanner.unregister(channelRatingAdapter);
71+
MainContext.INSTANCE.getScannerService().unregister(channelRatingAdapter);
7772
super.onDestroy();
7873
}
7974

0 commit comments

Comments
 (0)