This repository was archived by the owner on Apr 9, 2021. It is now read-only.
Add support for Android 9 #227
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,7 +40,6 @@ | |
| import org.odk.share.services.ReceiverService; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import javax.inject.Inject; | ||
|
|
@@ -58,12 +57,13 @@ | |
| import timber.log.Timber; | ||
|
|
||
| import static com.google.zxing.integration.android.IntentIntegrator.QR_CODE_TYPES; | ||
| import static org.odk.share.utilities.QRCodeUtils.IP; | ||
| import static org.odk.share.utilities.QRCodeUtils.PASSWORD; | ||
| import static org.odk.share.utilities.QRCodeUtils.PORT; | ||
| import static org.odk.share.utilities.QRCodeUtils.PROTECTED; | ||
| import static org.odk.share.utilities.QRCodeUtils.SSID; | ||
|
|
||
| public class ReceiverActivity extends InjectableActivity implements OnItemClickListener, WifiStateListener { | ||
|
|
||
| private static final int DIALOG_DOWNLOAD_PROGRESS = 1; | ||
| private static final int DIALOG_CONNECTING = 2; | ||
|
|
@@ -101,7 +101,7 @@ public class WifiActivity extends InjectableActivity implements OnItemClickListe | |
| private int port; | ||
|
|
||
| private boolean isQRCodeScanned; | ||
| private String ip; | ||
| private boolean isProtected; | ||
| private String passwordScanned; | ||
|
|
||
|
|
@@ -121,10 +121,7 @@ protected void onCreate(Bundle savedInstanceState) { | |
| getSupportActionBar().setDisplayHomeAsUpEnabled(true); | ||
|
|
||
| isQRCodeScanned = false; | ||
| isProtected = false; | ||
| port = -1; | ||
|
|
||
| scanResultList = new ArrayList<>(); | ||
|
|
@@ -141,18 +138,19 @@ protected void onCreate(Bundle savedInstanceState) { | |
| } else { | ||
| lastConnectedWifiInfo = wifiConnector.getActiveConnection(); | ||
| } | ||
|
|
||
| startScan(); | ||
| } | ||
|
|
||
| /*private boolean isPossibleHotspot(String ssid) { | ||
| return ssid.contains(getString(R.string.hotspot_name_suffix)) || | ||
| ssid.startsWith(getString(R.string.hotspot_name_prefix_oreo)); | ||
| }*/ | ||
|
|
||
| @Override | ||
| protected void onResume() { | ||
| super.onResume(); | ||
| wifiStateBroadcastReceiver.register(); | ||
| compositeDisposable.add(addDownloadEventSubscription()); | ||
| } | ||
|
|
||
|
|
@@ -313,8 +311,12 @@ private void setEmptyViewVisibility(String text) { | |
|
|
||
| private void startReceiveTask() { | ||
| showDialog(DIALOG_DOWNLOAD_PROGRESS); | ||
|
|
||
| if (ip == null || ip.isEmpty()) { | ||
| ip = wifiConnector.getAccessPointIpAddress(); | ||
| } | ||
|
|
||
| receiverService.startDownloading(ip, port); | ||
| } | ||
|
|
||
| @OnClick(R.id.bScan) | ||
|
|
@@ -397,19 +399,25 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { | |
| // request was canceled... | ||
| Timber.i("QR code scanning cancelled"); | ||
| } else { | ||
|
|
||
| Timber.d("Result: %s", result); | ||
| try { | ||
| JSONObject obj = new JSONObject(result.getContents()); | ||
| ip = (String) obj.get(IP); | ||
| wifiNetworkSSID = (String) obj.get(SSID); | ||
| port = (Integer) obj.get(PORT); | ||
| isProtected = (boolean) obj.get(PROTECTED); | ||
| if (isProtected) { | ||
| passwordScanned = (String) obj.get(PASSWORD); | ||
| } | ||
|
|
||
| Timber.d("Scanned results " + wifiNetworkSSID + " " + port + " " + isProtected + " " + passwordScanned); | ||
|
There was a problem hiding this comment. I suggest removing all the test log if they are only used for debugging, or just comment them. |
||
| isQRCodeScanned = true; | ||
|
|
||
| if (wifiConnector.getAccessPointIpAddress() != null && wifiConnector.getAccessPointIpAddress().equals(ip)) { | ||
| onConnected(); | ||
| } else { | ||
| startScan(); | ||
| } | ||
| } catch (JSONException e) { | ||
| Timber.e(e); | ||
| } | ||
|
|
@@ -419,7 +427,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { | |
|
|
||
| @Override | ||
| public void onStateUpdate(NetworkInfo.DetailedState detailedState) { | ||
| String connectedSsid = wifiConnector.getWifiSSID(); | ||
|
|
||
| Timber.d(wifiNetworkSSID + " " + connectedSsid + " " + detailedState.toString()); | ||
|
|
@@ -430,7 +437,6 @@ public void onStateUpdate(NetworkInfo.DetailedState detailedState) { | |
| wifiResultAdapter.notifyItemChanged(scanResultList.indexOf(wifiNetworkInfo)); | ||
|
|
||
| if (!isConnected) { | ||
| onConnected(); | ||
| } | ||
|
|
||
|
|
@@ -440,6 +446,8 @@ public void onStateUpdate(NetworkInfo.DetailedState detailedState) { | |
| } | ||
|
|
||
| private void onConnected() { | ||
| isConnected = true; | ||
|
|
||
| Toast.makeText(getApplicationContext(), "Connected to " + wifiNetworkSSID, Toast.LENGTH_LONG).show(); | ||
|
|
||
| removeDialog(DIALOG_CONNECTING); | ||
|
|
@@ -462,17 +470,13 @@ public void onScanResultsAvailable() { | |
| ArrayList<WifiNetworkInfo> list = new ArrayList<>(); | ||
|
|
||
| for (ScanResult scanResult : scanResults) { | ||
| WifiNetworkInfo wifiNetworkInfo = new WifiNetworkInfo(); | ||
| wifiNetworkInfo.setSsid(scanResult.SSID); | ||
| wifiNetworkInfo.setRssi(WifiManager.calculateSignalLevel(scanResult.level, 100)); | ||
| wifiNetworkInfo.setSecurityType(wifiConnector.getScanResultSecurity(scanResult)); | ||
| list.add(wifiNetworkInfo); | ||
| } | ||
|
|
||
| wifiListAvailable(list); | ||
| } | ||
|
|
||
|
|
@@ -491,12 +495,12 @@ private void wifiListAvailable(ArrayList<WifiNetworkInfo> list) { | |
| if (isQRCodeScanned) { | ||
| isQRCodeScanned = false; | ||
| for (WifiNetworkInfo info : list) { | ||
| if (info.getSsid().equals(wifiNetworkSSID)) { | ||
| if (info.getState() != NetworkInfo.DetailedState.CONNECTED) { | ||
| Toast.makeText(this, "attempting connection", Toast.LENGTH_SHORT).show(); | ||
| connectToNetwork(info.getSecurityType(), wifiNetworkSSID, passwordScanned); | ||
| } else { | ||
|
There was a problem hiding this comment. Can we extract the toasts into something like |
||
| Toast.makeText(this, "already connected to " + wifiNetworkSSID, Toast.LENGTH_SHORT).show(); | ||
| } | ||
| return; | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the code is useless, please remove them or making comments to clarify the reason for keeping them.