Merge pull request #2002 from reckoner1429/development

neel1998 · web-flow · commit 33c4c7c6e5d4 · 2019-11-12T22:34:16.000+05:30
Fixes #2000 Fixed the repeated display of 'Not Connected' Toast messa…
diff --git a/app/src/main/java/io/pslab/fragment/DustSensorDataFragment.java b/app/src/main/java/io/pslab/fragment/DustSensorDataFragment.java
@@ -107,6 +107,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         scienceLab = ScienceLabCommon.scienceLab;
         entries = new ArrayList<>();
         setupInstruments();
+        if(!scienceLab.isConnected())
+            Toast.makeText(getContext(), R.string.not_connected, Toast.LENGTH_SHORT).show();
         return rootView;
     }
 
@@ -388,8 +390,6 @@ private void visualizeData() {
                 mChart.moveViewToX(data.getEntryCount());
                 mChart.invalidate();
             }
-        } else {
-            Toast.makeText(getContext(), R.string.not_connected, Toast.LENGTH_SHORT).show();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c`
`107`	`107`	`scienceLab = ScienceLabCommon.scienceLab;`
`108`	`108`	`entries = new ArrayList<>();`
`109`	`109`	`setupInstruments();`
	`110`	`+ if(!scienceLab.isConnected())`
	`111`	`+ Toast.makeText(getContext(), R.string.not_connected, Toast.LENGTH_SHORT).show();`
`110`	`112`	`return rootView;`
`111`	`113`	`}`
`112`	`114`
`@@ -388,8 +390,6 @@ private void visualizeData() {`
`388`	`390`	`mChart.moveViewToX(data.getEntryCount());`
`389`	`391`	`mChart.invalidate();`
`390`	`392`	`}`
`391`		`- } else {`
`392`		`- Toast.makeText(getContext(), R.string.not_connected, Toast.LENGTH_SHORT).show();`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`