Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
feb7bd654c | |||
0bdd161d69 |
@ -255,8 +255,7 @@ public abstract class AbstractSDParentActivity extends TabActivity {
|
||||
return res;
|
||||
}
|
||||
|
||||
public boolean getAlarms(long userID)
|
||||
{
|
||||
public boolean getAlarms(long userID) {
|
||||
if (tcp == null)
|
||||
return false;
|
||||
|
||||
|
@ -42,7 +42,6 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
|
||||
public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context) {
|
||||
isLiveTab = false;
|
||||
this.context = context;
|
||||
// this.superVehHash = vehicles;
|
||||
mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null);
|
||||
}
|
||||
|
||||
@ -73,7 +72,7 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
position = Integer.getInteger(marker.getTitle());
|
||||
position = Integer.parseInt(marker.getTitle());
|
||||
} catch (Exception e) {
|
||||
Log.v(TAG, "Unable to parse Google Maps Info Bubble title on History");
|
||||
}
|
||||
|
@ -1741,11 +1741,9 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
}
|
||||
|
||||
//list for SMS
|
||||
if (AppParams.crtTab == AppParams.Tabs.alarms) {
|
||||
SM.Debug("currentActivity instanceof AlarmActivity - newSMS | " + tempArr[0] + " | " + tempArr[1]);
|
||||
if (AppParams.crtTab == AppParams.Tabs.alarms)
|
||||
getAlarms(AppParams.USERID);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRecordingsListReceived(TCPEvent event) {
|
||||
|
Reference in New Issue
Block a user