1. Modified Get all records method for order by feature.

amitjangid80 · Aug 7, 2019 · 2fdea9c · 2fdea9c
1 parent bbd9e09
commit 2fdea9c
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/app/src/main/java/com/amit/db/DBHelper.java b/app/src/main/java/com/amit/db/DBHelper.java
@@ -1926,13 +1926,24 @@ public <T> ArrayList<T> getAllRecords(String tableName, boolean isAscending,
                 Log.e(TAG, "getAllRecords: Table name was null or empty.");
                 return null;
             }
+
+            // checking if order by column name is not null and not empty for ascending order
+            if (orderByColumnName != null && !orderByColumnName.isEmpty())
+            {
+                Log.e(TAG, "getAllRecords: order by column name was null or empty.");
+                return null;
+            }
 
             // checking if isAscending is false
             // and order by column name is not null and not empty for descending order
-            if (!isAscending && (orderByColumnName != null && !orderByColumnName.isEmpty()))
+            if (!isAscending)
             {
                 orderBy = " ORDER BY " + orderByColumnName + " DESC";
             }
+            else
+            {
+                orderBy = " ORDER BY " + orderByColumnName + " ASC";
+            }
 
             // checking if model class was provided or not
             // it not then not proceeding further
@@ -2098,13 +2109,24 @@ public <T> ArrayList<T> getAllRecords(String tableName, boolean isAscending,
             {
                 whereClause = " WHERE " + conditionalValues;
             }
-
+
+            // checking if order by column name is not null and not empty for ascending order
+            if (orderByColumnName != null && !orderByColumnName.isEmpty())
+            {
+                Log.e(TAG, "getAllRecords: order by column name was null or empty.");
+                return null;
+            }
+
             // checking if isAscending is false
             // and order by column name is not null and not empty for descending order
-            if (!isAscending && (orderByColumnName != null && !orderByColumnName.isEmpty()))
+            if (!isAscending)
             {
                 orderBy = " ORDER BY " + orderByColumnName + " DESC";
             }
+            else
+            {
+                orderBy = " ORDER BY " + orderByColumnName + " ASC";
+            }
 
             // checking if model class was provided or not
             // it not then not proceeding further