safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java

@@ -57,7 +57,6 @@ import com.safemobile.services.TCPService.TCPBinder;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.Dialog;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -1396,7 +1395,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 
 				HistCountmsg histCountMsg = new HistCountmsg(msg);
 				SM.Debug("Message Count:" + histCountMsg.histcountValue.count);
-				if (AppParams.crtTab != AppParams.Tabs.history) {
+				if (histCountMsg.histcountValue.count >= 2000 && AppParams.crtTab == AppParams.Tabs.history) {
 					//list for live
 					SM.Debug("currentActivity instanceof HistoryActivity");
 					try {
@@ -1407,44 +1406,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 					} catch (Exception ex) {
 						SM.Debug(HASH_ERROR_MESSAGE + ex);
 					}
-					return;
-				}
-
-				if (histCountMsg.histcountValue.count >= 2000) {
-					try {
-						if (getHistoryActivity() != null) {
-							getHistoryActivity().UpdateCancel();
-							getHistoryActivity().UpdateUnableDisp();
-						}
-					} catch (Exception ex) {
-						SM.Debug(HASH_ERROR_MESSAGE + ex);
-					}
-					runOnUiThread(new Runnable() {
-						public void run() {
-							DialogService dialogService = new DialogService();
-							dialogService.showError(getHistoryActivity(), getString(R.string.too_many_positions, String.valueOf(histCountMsg.histcountValue.count)));
-						}
-					});
-					return;
-				}
-
-				if (histCountMsg.histcountValue.count == 0) {
-					try {
-						if (getHistoryActivity() != null) {
-							getHistoryActivity().UpdateCancel();
-							getHistoryActivity().UpdateUnableDisp();
-						}
-					} catch (Exception ex) {
-						SM.Debug(HASH_ERROR_MESSAGE + ex);
-					}
-
-					runOnUiThread(new Runnable() {
-						public void run() {
-							DialogService dialogService = new DialogService();
-							dialogService.showError(getHistoryActivity(), getString(R.string.no_data_for_interval));
-						}
-					});
-					return;
 				}
 			}
 

safeDispatch/src/main/res/values/strings.xml

@@ -263,7 +263,5 @@
     <string name="permissionBlocked">%1$s permission was not accepted. To be able to use the %2$s, please open application settings and grant the %3$s permission</string>
     <string name="microphone">Microphone</string>
     <string name="radio_tab">Radio Tab</string>
-    <string name="too_many_positions">You have selected %1$s positions.\nPlease select a smalled interval.</string>
-    <string name="no_data_for_interval">No data for this interval</string>
 
 </resources>