fix(adapter): validate get position on data

Signed-off-by: Rafa Hernandez <[email protected]>
flyve-mdm · Apr 12, 2018 · c43e9cd · c43e9cd
1 parent 3d78330
commit c43e9cd
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 14 deletions.
diff --git a/app/src/main/java/org/flyve/mdm/agent/adapter/ApplicationsAdapter.java b/app/src/main/java/org/flyve/mdm/agent/adapter/ApplicationsAdapter.java
@@ -88,9 +88,15 @@ public long getItemId(int position) {
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 
-		Application app = data[position];
-
 		View vi = inflater.inflate(R.layout.list_item_application, null);
+		Application app;
+
+		try {
+			app = data[position];
+		} catch (Exception ex) {
+			FlyveLog.e(ex.getMessage());
+			return vi;
+		}
 
 		TextView txtStatus = vi.findViewById(R.id.txtStatus);
 

diff --git a/app/src/main/java/org/flyve/mdm/agent/adapter/ConnectivityAdapter.java b/app/src/main/java/org/flyve/mdm/agent/adapter/ConnectivityAdapter.java
@@ -33,6 +33,7 @@
 import android.widget.TextView;
 
 import org.flyve.mdm.agent.R;
+import org.flyve.mdm.agent.utils.FlyveLog;
 
 import java.util.HashMap;
 import java.util.List;
@@ -85,11 +86,17 @@ public long getItemId(int position) {
 	 */
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
-		HashMap<String, String> hashdata;
-		hashdata = this.data.get(position);
-
+
 		View vi = inflater.inflate(R.layout.list_item_connectivity, null);
 
+		HashMap<String, String> hashdata;
+		try {
+			hashdata = data.get(position);
+		} catch (Exception ex) {
+			FlyveLog.e(ex.getMessage());
+			return vi;
+		}
+
 		TextView lblDescription = vi.findViewById(R.id.lblDescription);
 		lblDescription.setText(hashdata.get("description"));
 

diff --git a/app/src/main/java/org/flyve/mdm/agent/adapter/DrawerAdapter.java b/app/src/main/java/org/flyve/mdm/agent/adapter/DrawerAdapter.java
@@ -31,7 +31,10 @@
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import org.flyve.mdm.agent.R;
+import org.flyve.mdm.agent.utils.FlyveLog;
+
 import java.util.HashMap;
 import java.util.List;
 
@@ -83,10 +86,16 @@ public long getItemId(int position) {
 	 */
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
-		HashMap<String, String> hashdata;
-		hashdata = this.data.get(position);
 
 		View vi = inflater.inflate(R.layout.list_item_drawer, null);
+		HashMap<String, String> hashdata;
+
+		try {
+			hashdata = data.get(position);
+		} catch (Exception ex) {
+			FlyveLog.e(ex.getMessage());
+			return vi;
+		}
 
 		View viewSeparator = vi.findViewById(R.id.viewSeparator);
 		if(hashdata.containsKey("separator") && "true".equalsIgnoreCase(hashdata.get("separator"))) {

diff --git a/app/src/main/java/org/flyve/mdm/agent/adapter/FilesAdapter.java b/app/src/main/java/org/flyve/mdm/agent/adapter/FilesAdapter.java
@@ -86,9 +86,15 @@ public long getItemId(int position) {
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 
-		File file = data[position];
-
 		View vi = inflater.inflate(R.layout.list_item_file, null);
+		File file;
+
+		try {
+			file = data[position];
+		} catch (Exception ex) {
+			FlyveLog.e(ex.getMessage());
+			return vi;
+		}
 
 		TextView txtFileName = vi.findViewById(R.id.txtFileName);
 		txtFileName.setText(file.fileName);

diff --git a/app/src/main/java/org/flyve/mdm/agent/adapter/LogAdapter.java b/app/src/main/java/org/flyve/mdm/agent/adapter/LogAdapter.java
@@ -86,9 +86,15 @@ public long getItemId(int position) {
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 
-		HashMap<String, String> hashdata = data.get(position);
-
 		View vi = inflater.inflate(R.layout.list_item_log, null);
+		HashMap<String, String> hashdata;
+
+		try {
+			hashdata = data.get(position);
+		} catch (Exception ex) {
+			FlyveLog.e(ex.getMessage());
+			return vi;
+		}
 
 		TextView txtType = vi.findViewById(R.id.txtType);
 		txtType.setText(hashdata.get("type"));

diff --git a/app/src/main/java/org/flyve/mdm/agent/adapter/PoliciesAdapter.java b/app/src/main/java/org/flyve/mdm/agent/adapter/PoliciesAdapter.java
@@ -32,6 +32,7 @@
 import android.widget.TextView;
 
 import org.flyve.mdm.agent.R;
+import org.flyve.mdm.agent.utils.FlyveLog;
 
 import java.util.HashMap;
 import java.util.List;
@@ -84,10 +85,16 @@ public long getItemId(int position) {
 	 */
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
-		HashMap<String, String> hashdata;
-		hashdata = this.data.get(position);
-
+
 		View vi = inflater.inflate(R.layout.list_item_policies, null);
+		HashMap<String, String> hashdata;
+
+		try {
+			hashdata = data.get(position);
+		} catch (Exception ex) {
+			FlyveLog.e(ex.getMessage());
+			return vi;
+		}
 
 		TextView lblDescription = vi.findViewById(R.id.lblDescription);
 		lblDescription.setText(hashdata.get("description"));