summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-02-20 11:42:25 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-02-20 11:42:25 +0000
commit6cdd02a7fd582af7b10c8ffc4d88589e77d1228d (patch)
tree94a4a50da2f36ead7c2fe04008f75697dd0166f8 /android
parente1879e6a377fba9ec0f21554de16be8a983553da (diff)
android: protect against a crash with an empty sdcard.
If you mis-configure your emulator - that's what you get. Unfortunate that this affects 2x places. Change-Id: I0b281d96b22ec3ac793c687ee7f3ba1a78784ace
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java2
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
index 9307851f3965..fd4d7b2bf19c 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -62,7 +62,7 @@ public class GridItemAdapter extends BaseAdapter {
}
public int getCount() {
- return filePaths.size();
+ return filePaths != null ? filePaths.size() : 0;
}
public Object getItem(int position) {
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 9435c09299a4..e12141b0c021 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -602,7 +602,7 @@ public class LibreOfficeUIActivity extends LOAbout implements ActionBar.OnNaviga
}
public int getCount() {
- return filePaths.size();
+ return filePaths != null ? filePaths.size() : 0;
}
public Object getItem(int arg0) {