Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 056af9cc authored by Michael W's avatar Michael W Committed by Jochen Sprickerhof
Browse files

Calendar: Fix check for things to import 

* hasThingsToImport() doesnt require a context
* Only should return true if there are actually files, not folders
--> use listFiles() instead if list()

Change-Id: Id9d5f7e40f4ee644dbb055dcc86377c2e71dd887
(cherry picked from commit 573612e897cfe55775334d9d26d8a552c58467f2)
(cherry picked from commit f42d5a7)
parent 5a9b46be

src/com/android/calendar/AllInOneActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH 
        }



        MenuItem item = menu.findItem(R.id.action_import);

        item.setVisible(ImportActivity.hasThingsToImport(this));

        item.setVisible(ImportActivity.hasThingsToImport());



        mSearchMenu = menu.findItem(R.id.action_search);

        mSearchView = (SearchView) MenuItemCompat.getActionView(mSearchMenu);

src/com/android/calendar/ImportActivity.java

+4 −4
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ public class ImportActivity extends Activity { 


        @Override

        protected String[] doInBackground(Void... params) {

            if (!hasThingsToImport(mActivity)) {

            if (!hasThingsToImport()) {

                return null;

            }

            File folder = EventInfoFragment.EXPORT_SDCARD_DIRECTORY;
@@ -183,9 +183,9 @@ public class ImportActivity extends Activity { 
        new ListFilesTask(activity).execute();

    }



    public static boolean hasThingsToImport(Context context) {

    public static boolean hasThingsToImport() {

        File folder = EventInfoFragment.EXPORT_SDCARD_DIRECTORY;

        String[] filesAndFolders = folder.list();

        return filesAndFolders != null && filesAndFolders.length > 0;

        File[] files = folder.listFiles();

        return files != null && files.length > 0;

    }

}