Support for Lollipop 5.1 / Added MTU in interface details

diff --git a/ChangeLog b/ChangeLog
index 678f89e..9f2edc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
 *
 * 2.0-M4
 *
-
+- Android Agent:
+       - Added support for Lollipop MR1 (v5.1)
+       - Updated support library
+- Android Console:
+       - Changed order of overview items to match Java console (node browser)
+       - Added MTU field in interface details (node browser)
+       - Updated support library
 - MEGATEC protocol support in UPS subagent
 - Template hierarchy preserved during export/import
 - Script export/import

diff --git a/android/src/agent/libs/android-support-v4.jar b/android/src/agent/libs/android-support-v4.jar
index 4ebdaa9..1437d24 100644 (file)
Binary files a/android/src/agent/libs/android-support-v4.jar and b/android/src/agent/libs/android-support-v4.jar differ

diff --git a/android/src/agent/project.properties b/android/src/agent/project.properties
index bbe203c..358ce4a 100644 (file)
--- a/android/src/agent/project.properties
+++ b/android/src/agent/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-21
+target=android-22

diff --git a/android/src/agent/src/org/netxms/agent/android/helpers/DeviceInfoHelper.java b/android/src/agent/src/org/netxms/agent/android/helpers/DeviceInfoHelper.java
index 40df88c..9862f61 100644 (file)
--- a/android/src/agent/src/org/netxms/agent/android/helpers/DeviceInfoHelper.java
+++ b/android/src/agent/src/org/netxms/agent/android/helpers/DeviceInfoHelper.java
@@ -165,6 +165,8 @@ public class DeviceInfoHelper
                                return "ANDROID (KITKAT_WATCH)";
                        case Build.VERSION_CODES.LOLLIPOP:
                                return "ANDROID (LOLLIPOP)";
+                       case Build.VERSION_CODES.LOLLIPOP_MR1:
+                               return "ANDROID (LOLLIPOP_MR1)";
                }
                return "ANDROID (UNKNOWN)";
        }

diff --git a/android/src/console/libs/android-support-v4.jar b/android/src/console/libs/android-support-v4.jar
index 4ebdaa9..1437d24 100644 (file)
Binary files a/android/src/console/libs/android-support-v4.jar and b/android/src/console/libs/android-support-v4.jar differ

diff --git a/android/src/console/project.properties b/android/src/console/project.properties
index bbe203c..358ce4a 100644 (file)
--- a/android/src/console/project.properties
+++ b/android/src/console/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-21
+target=android-22

diff --git a/android/src/console/res/values/strings.xml b/android/src/console/res/values/strings.xml
index bc370f2..2860edd 100644 (file)
--- a/android/src/console/res/values/strings.xml
+++ b/android/src/console/res/values/strings.xml
@@ -203,7 +203,8 @@
        <string name="if_ignore">IGNORE</string>
        <string name="if_id">ID</string>
        <string name="if_name">Name</string>
-  <string name="if_alias">Alias</string>
+       <string name="if_alias">Alias</string>
+       <string name="if_mtu">MTU</string>
        <string name="if_type">ifType</string>
        <string name="if_index">ifIndex</string>
        <string name="if_slot">Slot</string>

diff --git a/android/src/console/src/org/netxms/ui/android/main/adapters/InterfaceDetailsAdapter.java b/android/src/console/src/org/netxms/ui/android/main/adapters/InterfaceDetailsAdapter.java
index 90a831c..fa27594 100644 (file)
--- a/android/src/console/src/org/netxms/ui/android/main/adapters/InterfaceDetailsAdapter.java
+++ b/android/src/console/src/org/netxms/ui/android/main/adapters/InterfaceDetailsAdapter.java
@@ -3,7 +3,6 @@
  */
 package org.netxms.ui.android.main.adapters;
 
-import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -54,14 +53,15 @@ public class InterfaceDetailsAdapter extends BaseAdapter
        {
                addRow(r.getString(R.string.if_id), Long.toString(i.getObjectId()));
                addRow(r.getString(R.string.if_name), i.getObjectName());
-    addRow(r.getString(R.string.if_alias), i.getAlias());
+               addRow(r.getString(R.string.if_alias), i.getAlias());
                addRow(r.getString(R.string.if_type), Integer.toString(i.getIfType()));
                addRow(r.getString(R.string.if_index), Integer.toString(i.getIfIndex()));
                addRow(r.getString(R.string.if_slot), Integer.toString(i.getSlot()));
                addRow(r.getString(R.string.if_port), Integer.toString(i.getPort()));
+               addRow(r.getString(R.string.if_mtu), Integer.toString(i.getMtu()));
                addRow(r.getString(R.string.if_description), i.getDescription());
                addRow(r.getString(R.string.if_mac_address), i.getMacAddress().toString());
-               for(InetAddressEx a : i.getIpAddressList())
+               for (InetAddressEx a : i.getIpAddressList())
                        addRow(r.getString(R.string.if_ip_address), a.toString());
                addRow(r.getString(R.string.if_admin_state), i.getAdminStateAsText(), getAdminStateColor(i.getAdminState()));
                addRow(r.getString(R.string.if_oper_state), i.getOperStateAsText(), getOperStateColor(i.getOperState()));

diff --git a/android/src/console/src/org/netxms/ui/android/main/adapters/OverviewAdapter.java b/android/src/console/src/org/netxms/ui/android/main/adapters/OverviewAdapter.java
index 8b1ce10..b6c3582 100644 (file)
--- a/android/src/console/src/org/netxms/ui/android/main/adapters/OverviewAdapter.java
+++ b/android/src/console/src/org/netxms/ui/android/main/adapters/OverviewAdapter.java
@@ -65,19 +65,19 @@ public class OverviewAdapter extends BaseAdapter
                        switch (obj.getObjectClass())
                        {
                                case AbstractObject.OBJECT_NODE:
-                                       addPair(r.getString(R.string.overview_primary_ip), ((Node)obj).getPrimaryIP().getHostAddress());
                                        addPair(r.getString(R.string.overview_zone_id), Long.toString(((Node)obj).getZoneId()));
                                        addPair(r.getString(R.string.overview_primary_hostname), ((Node)obj).getPrimaryName());
+                                       addPair(r.getString(R.string.overview_primary_ip), ((Node)obj).getPrimaryIP().getHostAddress());
                                        if (((Node)obj).hasAgent())
                                                addPair(r.getString(R.string.overview_netxms_agent_version), ((Node)obj).getAgentVersion());
                                        addPair(r.getString(R.string.overview_system_description), ((Node)obj).getSystemDescription(), false);
                                        addPair(r.getString(R.string.overview_platform_name), ((Node)obj).getPlatformName(), false);
-                                       addPair(r.getString(R.string.overview_boot_time), toString(((Node)obj).getBootTime()), false);
                                        addPair(r.getString(R.string.overview_snmp_sysname), ((Node)obj).getSnmpSysName(), false);
                                        addPair(r.getString(R.string.overview_snmp_oid), ((Node)obj).getSnmpOID(), false);
                                        if ((((Node)obj).getFlags() & Node.NF_IS_BRIDGE) != 0)
                                                addPair(r.getString(R.string.overview_bridge_base_address), toString(((Node)obj).getBridgeBaseAddress()));
                                        addPair(r.getString(R.string.overview_driver), ((Node)obj).getDriverName(), false);
+                                       addPair(r.getString(R.string.overview_boot_time), toString(((Node)obj).getBootTime()), false);
                                        break;
                                case AbstractObject.OBJECT_MOBILEDEVICE:
                                        addPair(r.getString(R.string.overview_last_report), DateFormat.getDateTimeInstance().format(((MobileDevice)obj).getLastReportTime()));