From 76945f6aabaa66aeb9f81153d544fa3b2400c238 Mon Sep 17 00:00:00 2001 From: Nikunj Garg Date: Sat, 13 Feb 2021 19:20:10 +0530 Subject: [PATCH] Fixes #646 : App crash fixed on Share click --- .../activities/ShareDataActivity.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/neurolab/activities/ShareDataActivity.java b/app/src/main/java/io/neurolab/activities/ShareDataActivity.java index b06d234d..f83dc716 100644 --- a/app/src/main/java/io/neurolab/activities/ShareDataActivity.java +++ b/app/src/main/java/io/neurolab/activities/ShareDataActivity.java @@ -65,10 +65,10 @@ protected void onCreate(Bundle savedInstanceState) { File appDir = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + CSV_DIRECTORY); File[] files = appDir.listFiles(); - fileList = new String[files.length]; - newFileName = new String[files.length]; if (appDir.listFiles() != null && files.length > 0) { + fileList = new String[files.length]; + newFileName = new String[files.length]; int j = 0; for (int i = 0; i < files.length; i++) { fileList[j] = files[i].getAbsolutePath(); @@ -79,18 +79,20 @@ protected void onCreate(Bundle savedInstanceState) { Toast.makeText(this, R.string.share_screen_toast, Toast.LENGTH_SHORT).show(); } - if (appDir.listFiles().length == 0) { + if (appDir.listFiles() == null) { numberOfFiles.setVisibility(View.VISIBLE); numberOfFiles.setText(R.string.no_datasets_message); shareButton.setVisibility(View.INVISIBLE); } - final List file_list = new ArrayList(Arrays.asList(newFileName)); - final ArrayAdapter arrayAdapter = new ArrayAdapter - (this, android.R.layout.simple_list_item_multiple_choice, file_list); - fileListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE); - fileListView.setItemsCanFocus(false); - fileListView.setAdapter(arrayAdapter); + if (newFileName != null) { + final List file_list = new ArrayList(Arrays.asList(newFileName)); + final ArrayAdapter arrayAdapter = new ArrayAdapter + (this, android.R.layout.simple_list_item_multiple_choice, file_list); + fileListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE); + fileListView.setItemsCanFocus(false); + fileListView.setAdapter(arrayAdapter); + } fileListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override