caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1781 from MilosKozak/NPEfixes

Browse source 
NPE fixes from Firebase
This commit is contained in:
Milos Kozak 2019-05-02 22:24:20 +02:00 committed by GitHub
parent ea60b6ceef a303d71d25
commit 75d469a9db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
View file

@ -93,7 +93,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
} else if (editTextPref.getText() != null) {
((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());
pref.setSummary(editTextPref.getText());
} else if (pref.getKey().contains("smscommunicator_allowednumbers") && TextUtils.isEmpty(editTextPref.getText().trim())) {
} else if (pref.getKey().contains("smscommunicator_allowednumbers") && (editTextPref.getText() == null || TextUtils.isEmpty(editTextPref.getText().trim()))) {
pref.setSummary(MainApp.gs(R.string.smscommunicator_allowednumbers_summary));
}
}

21
app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
View file

@ -160,20 +160,25 @@ public class InsightPairingActivity extends AppCompatActivity implements Insight
private void startBLScan() {
if (!scanning) {
BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
if (!bluetoothAdapter.isEnabled()) bluetoothAdapter.enable();
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
intentFilter.addAction(BluetoothDevice.ACTION_FOUND);
registerReceiver(broadcastReceiver, intentFilter);
bluetoothAdapter.startDiscovery();
scanning = true;
if (bluetoothAdapter != null) {
if (!bluetoothAdapter.isEnabled()) bluetoothAdapter.enable();
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
intentFilter.addAction(BluetoothDevice.ACTION_FOUND);
registerReceiver(broadcastReceiver, intentFilter);
bluetoothAdapter.startDiscovery();
scanning = true;
}
}
}
private void stopBLScan() {
if (scanning) {
unregisterReceiver(broadcastReceiver);
BluetoothAdapter.getDefaultAdapter().cancelDiscovery();
BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
if (bluetoothAdapter != null) {
bluetoothAdapter.cancelDiscovery();
}
scanning = false;
}
}

5
app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
View file

@ -190,8 +190,9 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
}
// prepare task for execution in 1 sec
// cancel waiting task to prevent sending multiple posts
if (callback.getPost() != null)
callback.getPost().cancel(false);
ScheduledFuture<?> scheduledFuture = callback.getPost();
if (scheduledFuture != null)
scheduledFuture.cancel(false);
Runnable task = new PostRunnable();
final int sec = 1;
callback.setPost(eventWorker.schedule(task, sec, TimeUnit.SECONDS));

6
app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
View file

@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory;
import java.util.LinkedList;
import javax.annotation.Nullable;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.DetailedBolusInfo;
@ -143,11 +145,11 @@ public class CommandQueue {
return queue.size();
}
public Command performing() {
Command performing() {
return performing;
}
public void resetPerforming() {
void resetPerforming() {
performing = null;
}

22
app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
View file

@ -141,15 +141,17 @@ public class QueueThread extends Thread {
// Pickup 1st command and set performing variable
if (queue.size() > 0) {
queue.pickup();
if (L.isEnabled(L.PUMPQUEUE))
log.debug("performing " + queue.performing().status());
MainApp.bus().post(new EventQueueChanged());
queue.performing().execute();
queue.resetPerforming();
MainApp.bus().post(new EventQueueChanged());
lastCommandTime = System.currentTimeMillis();
SystemClock.sleep(100);
continue;
if (queue.performing() != null) {
if (L.isEnabled(L.PUMPQUEUE))
log.debug("performing " + queue.performing().status());
MainApp.bus().post(new EventQueueChanged());
queue.performing().execute();
queue.resetPerforming();
MainApp.bus().post(new EventQueueChanged());
lastCommandTime = System.currentTimeMillis();
SystemClock.sleep(100);
continue;
}
}
}
@ -173,7 +175,7 @@ public class QueueThread extends Thread {
}
}
} finally {
if (mWakeLock != null)
if (mWakeLock != null && mWakeLock.isHeld())
mWakeLock.release();
if (L.isEnabled(L.PUMPQUEUE))
log.debug("thread end");

1
app/src/test/java/info/AAPSMocker.java
View file

@ -150,6 +150,7 @@ public class AAPSMocker {
when(MainApp.gs(R.string.pumpsuspended)).thenReturn("Pump suspended");
when(MainApp.gs(R.string.cob)).thenReturn("COB");
when(MainApp.gs(R.string.value_unavailable_short)).thenReturn("n/a");
when(MainApp.gs(R.string.pumpNotInitialized)).thenReturn("Pump not initialized!");
}
public static MainApp mockMainApp() {