From: drizea Date: Fri, 17 Aug 2012 14:57:08 +0000 (+0300) Subject: bug fix on possible holds crash X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=86ac13194a824ccc1711802c8ae8db46ed1230f6;p=working%2FEvergreen.git bug fix on possible holds crash --- diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldRecord.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldRecord.java index b133f06854..82e5a28b91 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldRecord.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldRecord.java @@ -113,12 +113,15 @@ public class HoldRecord implements Serializable { if (res.equals("t")) this.email_notification = true; res = ahr.getString("phone_notify"); - if (res.equals("t")) - this.phone_notification = true; + + if (res != null) + if (res.equals("t")) + this.phone_notification = true; res = ahr.getString("frozen"); - if (res.equals("t")) - this.suspended = true; + if (res != null) + if (res.equals("t")) + this.suspended = true; pickup_lib = ahr.getInt("pickup_lib"); } diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java index 73a2dcb8b9..4318471378 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java @@ -728,7 +728,6 @@ public class SearchCatalogListView extends Activity { .getCount() + " out of " + search.visible); - } break; @@ -801,7 +800,6 @@ public class SearchCatalogListView extends Activity { // Get reference to ImageView recordImage = (ImageView) row .findViewById(R.id.search_record_img); - // TODO fix bugs + features String imageHref = GlobalConfigs.httpAddress + "/opac/extras/ac/jacket/small/" + record.isbn; // start async download of image