From 661ef08e58ee3f8136d1850e857289e118224f12 Mon Sep 17 00:00:00 2001 From: Maurizio Porrato Date: Sun, 17 Feb 2019 12:29:35 +0000 Subject: [PATCH] Avoid creating new remote and beamer instances in onCreate() --- .../eu/worn/apps/androvac/MainActivity.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/worn/apps/androvac/MainActivity.java b/app/src/main/java/eu/worn/apps/androvac/MainActivity.java index bd76d9c..79cf2f3 100644 --- a/app/src/main/java/eu/worn/apps/androvac/MainActivity.java +++ b/app/src/main/java/eu/worn/apps/androvac/MainActivity.java @@ -44,14 +44,17 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - remote = new RoboVac11sRemote(); + if (remote == null) + remote = new RoboVac11sRemote(); - beamer = new AndroidIRBeamer(this); - if (!beamer.isAvailable()) { - Toast.makeText(this.getApplicationContext(), - "No IR beamer found: entering debug mode", - Toast.LENGTH_LONG).show(); - beamer = new DebugIRBeamer(this); + if (beamer == null) { + beamer = new AndroidIRBeamer(this); + if (!beamer.isAvailable()) { + Toast.makeText(this.getApplicationContext(), + "No IR beamer found: entering debug mode", + Toast.LENGTH_LONG).show(); + beamer = new DebugIRBeamer(this); + } } findViewById(R.id.schedule).setEnabled(