Commit c921829d authored by aringot's avatar aringot

Merge branch 'dev' into feat-updateForOreo

parents f88777b8 dfa70644
......@@ -47,7 +47,7 @@ See the list of [contributors](http://sonicontrol.fhstp.ac.at/#team) who partici
## License
This project is licensed under the GNU General Public License - see the [LICENSE.md](LICENSE.md) file for details
This project is licensed under the GNU General Public License - see the [LICENSE.md](LICENSE.md) file for details. Please also see the [Superpowered license](Superpowered_license.md).
## Acknowledgments
......
......@@ -459,23 +459,40 @@ public class MainActivity extends BaseActivity implements Scan.DetectionListener
Manifest.permission.ACCESS_FINE_LOCATION);
if((!(isGPSEnabled && gpsEnabled) && !(isNetworkEnabled && networkEnabled)) || status != PackageManager.PERMISSION_GRANTED){
btnAlertSpoof.setEnabled(false);
btnAlertDismissAlways.setEnabled(false);
txtNoLocation.setText(R.string.on_alert_no_location_message);
runOnUiThread(new Runnable() {
@Override
public void run() {
btnAlertSpoof.setEnabled(false);
btnAlertDismissAlways.setEnabled(false);
txtNoLocation.setText(R.string.on_alert_no_location_message);
}
});
}else if(!saveJsonFile){
btnAlertSpoof.setEnabled(false);
btnAlertDismissAlways.setEnabled(false);
txtNoLocation.setText(R.string.on_alert_no_location_message);
runOnUiThread(new Runnable() {
@Override
public void run() {
btnAlertSpoof.setEnabled(false);
btnAlertDismissAlways.setEnabled(false);
txtNoLocation.setText(R.string.alert_no_json_file_message);
}
});
}else{
btnAlertSpoof.setEnabled(true);
btnAlertDismissAlways.setEnabled(true);
runOnUiThread(new Runnable() {
@Override
public void run() {
btnAlertSpoof.setEnabled(true);
btnAlertDismissAlways.setEnabled(true);
txtNoLocation.setText("");
}
});
}
sigType = signalType; //set the technology variable to the latest detected one
boolean activityExists = settings.getBoolean("active", false);
if (activityExists) {
uiHandler.post(displayAlert);
runOnUiThread(displayAlert);
//uiHandler.post(displayAlert); NOTE: runOnUiThread will execute code directly, not post
}
}
......
......@@ -8,7 +8,7 @@ This code contains scripts and prototypes developed in the SoniControl project (
External dependencies:
- This code is optimized to run under GNU Octave
- This code needs the LTFAT library (http://ltfat.sourceforge.net/), available also directly as a GNU Octave package for real-time audio processing. To install LTFAT under Octave run: "pkg install -forge ltfat". After installation make sure all files are in folder [OCTAVE_ROOT]\packages\ltfat-2.2.0. There should also be binaries in [[OCTAVE_ROOT]\packages]\packages\ltfat-2.2.0\x86_64-w64-mingw32-api-v51. Add both folder to the Octave path (with subfolders). To see if the installation has worked, run: "demo_blockproc_slidingsgram('playrec')". Note: no compilation is necessary. Mingw is automatically installed with Octave. Also a jdk is installed with octave. The portaudio library is not needed under windows.
- This code needs the LTFAT library (http://ltfat.sourceforge.net/), available also directly as a GNU Octave package for real-time audio processing. To install LTFAT under Octave run: "pkg install -forge ltfat". After installation make sure all files are in folder [OCTAVE_ROOT]\share\octave\packages\ltfat-2.2.0. There should also be binaries in [OCTAVE_ROOT]\lib\octave\packages\ltfat-2.2.0\x86_64-w64-mingw32-api-v51. Add both folder to the Octave path (with subfolders). To see if the installation has worked, run: "demo_blockproc_slidingsgram('playrec')". Note: no compilation is necessary. Mingw is automatically installed with Octave. Also a jdk is installed with octave. The portaudio library is not needed under windows.
Note: There are incompatibilities between 32-bit and 64-bit versions of GNU Octave, LTFAT, and Java. In case of problems, please try to use the 32-bit versions for all of these.
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment