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

fix

Browse Source
This commit is contained in:
Rashiq Ahmad 2013-12-07 19:42:12 +01:00
parent 1e013e1086
commit 372ed541af
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/kiwix/kiwixmobile/KiwixMobileFragment.java
View File

@ -568,6 +568,8 @@ public class KiwixMobileFragment extends Fragment {
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
Log.i("kiwix", "Intent data: " + data);
switch (requestCode) { switch (requestCode) {
case ZIMFILESELECT_REQUEST_CODE: case ZIMFILESELECT_REQUEST_CODE:
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
@ -641,7 +643,7 @@ public class KiwixMobileFragment extends Fragment {
webView.getSettings().setDisplayZoomControls(pref_zoom_enabled); webView.getSettings().setDisplayZoomControls(pref_zoom_enabled);
if (!isButtonEnabled) { if (!isButtonEnabled) {
mBackToTopButton.setVisibility(View.INVISIBLE); mBackToTopButton.setVisibility(View.INVISIBLE);
} }
// Night mode status // Night mode status
@ -742,7 +744,7 @@ public class KiwixMobileFragment extends Fragment {
} }
} else { } else {
Log.e("kiwix", "ZIM file doesn't exist at " + file.getAbsolutePath()); Log.e("kiwix", "ZIM file doesn't exist at " + file.getAbsolutePath());
Toast.makeText(getActivity(), getResources().getString(R.string.error_filenotfound), Toast.makeText(getActivity(), getResources().getString(R.string.error_filenotfound),
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
} }
@ -750,13 +752,18 @@ public class KiwixMobileFragment extends Fragment {
} }
private void initAllMenuItems() { private void initAllMenuItems() {
menu.findItem(R.id.menu_fullscreen).setVisible(true);
menu.findItem(R.id.menu_back).setVisible(true); try {
menu.findItem(R.id.menu_forward).setVisible(false); menu.findItem(R.id.menu_forward).setVisible(false);
menu.findItem(R.id.menu_home).setVisible(true); menu.findItem(R.id.menu_fullscreen).setVisible(true);
menu.findItem(R.id.menu_randomarticle).setVisible(true); menu.findItem(R.id.menu_back).setVisible(true);
menu.findItem(R.id.menu_searchintext).setVisible(true); menu.findItem(R.id.menu_home).setVisible(true);
menu.findItem(R.id.menu_search).setVisible(true); menu.findItem(R.id.menu_randomarticle).setVisible(true);
menu.findItem(R.id.menu_searchintext).setVisible(true);
menu.findItem(R.id.menu_search).setVisible(true);
} catch (Exception e) {
e.printStackTrace();
}
} }
public void onKeyDown(int keyCode, KeyEvent event) { public void onKeyDown(int keyCode, KeyEvent event) {

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

@ -81,6 +81,7 @@ public class ZimFileSelectActivity extends FragmentActivity
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);
Log.i("kiwix", "Opening " + uri);
setResult(RESULT_OK, new Intent().setData(uri)); setResult(RESULT_OK, new Intent().setData(uri));
finish(); finish();
} else { } else {
@ -189,12 +190,28 @@ public class ZimFileSelectActivity extends FragmentActivity
// if the scan resturns null and our CursorAdapter will update. // if the scan resturns null and our CursorAdapter will update.
private void removeNonExistentFiles(Cursor cursor) { private void removeNonExistentFiles(Cursor cursor) {
List<String> files = new ArrayList<String>(); ArrayList<String> files = new ArrayList<String>();
// Iterate trough the data from our curser and add every file path column to an ArrayList // Iterate trough the data from our curser and add every file path column to an ArrayList
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);
}
// Add new files to the MediaStore
private void addDataToMediaStore(ArrayList<DataModel> files) {
ArrayList<String> paths = new ArrayList<String>();
for (int i = 0; i < files.size(); i++) {
paths.add(files.get(i).getPath());
}
updateMediaStore(paths);
}
private void updateMediaStore(ArrayList<String> files) {
// 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(
@ -312,6 +329,8 @@ 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);
} }