kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-15 18:36:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing a visual issue, where the list would hide away some files and then show them again.

Browse Source
This commit is contained in:
Rashiq Ahmad 2013-12-08 00:58:32 +01:00
parent 372ed541af
commit 66e2344129
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java
View File

@ -44,7 +44,7 @@ public class ZimFileSelectActivity extends FragmentActivity
private static final int LOADER_ID = 0x02; private static final int LOADER_ID = 0x02;
// array of valid audio file extensions // Array of zim file extensions
private static final String[] zimFiles = {"zim", "zimaa"}; private static final String[] zimFiles = {"zim", "zimaa"};
// Adapter of the Data populated by the MediaStore // Adapter of the Data populated by the MediaStore
@ -61,6 +61,10 @@ public class ZimFileSelectActivity extends FragmentActivity
private TextView mProgressBarMessage; private TextView mProgressBarMessage;
private boolean mNeedsUpdate = false;
private boolean mAdapterRefreshed = false;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -78,6 +82,10 @@ public class ZimFileSelectActivity extends FragmentActivity
} }
private void finishResult(String path) { private void finishResult(String path) {
// Add new files to MediaStore
addDataToMediaStore(mFiles);
// Remove the nonexistent files from the MediaStore
removeNonExistentFiles(mCursorAdapter.getCursor());
if (path != null) { if (path != null) {
File file = new File(path); File file = new File(path);
Uri uri = Uri.fromFile(file); Uri uri = Uri.fromFile(file);
@ -91,6 +99,14 @@ public class ZimFileSelectActivity extends FragmentActivity
} }
protected void selectZimFile() { protected void selectZimFile() {
// Stop endless loops
if (mAdapterRefreshed) {
return;
} else {
mAdapterRefreshed = true;
}
// Defines a list of columns to retrieve from the Cursor and load into an output row // Defines a list of columns to retrieve from the Cursor and load into an output row
String[] mZimListColumns = {MediaStore.Files.FileColumns.TITLE, MediaStore.Files.FileColumns.DATA}; String[] mZimListColumns = {MediaStore.Files.FileColumns.TITLE, MediaStore.Files.FileColumns.DATA};
@ -196,7 +212,7 @@ public class ZimFileSelectActivity extends FragmentActivity
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
files.add(cursor.getString(2)); files.add(cursor.getString(2));
} }
updateMediaStore(files); // updateMediaStore(files);
} }
@ -205,14 +221,21 @@ public class ZimFileSelectActivity extends FragmentActivity
ArrayList<String> paths = new ArrayList<String>(); ArrayList<String> paths = new ArrayList<String>();
for (int i = 0; i < files.size(); i++) { for (DataModel file : files) {
paths.add(files.get(i).getPath()); paths.add(file.getPath());
} }
updateMediaStore(paths); updateMediaStore(paths);
} }
private void updateMediaStore(ArrayList<String> files) { private void updateMediaStore(ArrayList<String> files) {
// Abort endless loops. Let this update process only run on rescan.
if (!mNeedsUpdate) {
return;
}
Log.i("kiwix", "Updating MediaStore");
// Scan every file (and delete it from the MediaStore, if it does not exist) // Scan every file (and delete it from the MediaStore, if it does not exist)
MediaScannerConnection.scanFile( MediaScannerConnection.scanFile(
ZimFileSelectActivity.this, ZimFileSelectActivity.this,
@ -224,6 +247,8 @@ public class ZimFileSelectActivity extends FragmentActivity
} }
}); });
mNeedsUpdate = false;
} }
@Override @Override
@ -271,8 +296,9 @@ public class ZimFileSelectActivity extends FragmentActivity
// Execute our AsyncTask, that scans the file system for the actual data // Execute our AsyncTask, that scans the file system for the actual data
new RescanFileSystem().execute(); new RescanFileSystem().execute();
// Remove the nonexistent files from the MediaStore // Make sure, that we set mNeedsUpdate to true and to false, after the MediaStore has been
removeNonExistentFiles(mCursorAdapter.getCursor()); // updated. Otherwise it will result in a endless loop.
mNeedsUpdate = true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
@ -329,8 +355,6 @@ public class ZimFileSelectActivity extends FragmentActivity
mProgressBarMessage.setVisibility(View.GONE); mProgressBarMessage.setVisibility(View.GONE);
mProgressBar.setVisibility(View.GONE); mProgressBar.setVisibility(View.GONE);
addDataToMediaStore(mFiles);
super.onPostExecute(result); super.onPostExecute(result);
} }