diff --git a/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java index 11f711d05..7311b28d8 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java @@ -1648,7 +1648,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback } selectTab(currentTab); } catch (Exception e) { - Log.w(TAG_KIWIX, " Kiwix sharedpreferences corrupted"); + Log.w(TAG_KIWIX, "Kiwix shared preferences corrupted", e); //TODO: Show to user } } @@ -1663,7 +1663,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback return; } - Log.d(TAG_KIWIX, " Kiwix started from a filemanager. Intent filePath: " + Log.d(TAG_KIWIX, "Kiwix started from a filemanager. Intent filePath: " + filePath + " -> open this zimfile and load menu_main page"); openZimFile(new File(filePath), false); @@ -1672,14 +1672,14 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback String zimFile = settings.getString(TAG_CURRENT_FILE, null); if (zimFile != null && new File(zimFile).exists()) { Log.d(TAG_KIWIX, - " Kiwix normal start, zimFile loaded last time -> Open last used zimFile " + zimFile); + "Kiwix normal start, zimFile loaded last time -> Open last used zimFile " + zimFile); restoreTabStates(); // Alternative would be to restore webView state. But more effort to implement, and actually // fits better normal android behavior if after closing app ("back" button) state is not maintained. } else { if (BuildConfig.IS_CUSTOM_APP) { - Log.d(TAG_KIWIX, "Kiwix Custom App starting for the first time. Check Companion ZIM: " + BuildConfig.ZIM_FILE_NAME); + Log.d(TAG_KIWIX, "Kiwix Custom App starting for the first time. Checking Companion ZIM: " + BuildConfig.ZIM_FILE_NAME); String currentLocaleCode = Locale.getDefault().toString(); // Custom App recommends to start off a specific language @@ -1742,8 +1742,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback openZimFile(new File(filePath), true); } } else { - Log.d(TAG_KIWIX, - " Kiwix normal start, no zimFile loaded last time -> display help page"); + Log.d(TAG_KIWIX, "Kiwix normal start, no zimFile loaded last time -> display help page"); showHelpPage(); } } @@ -1757,8 +1756,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback saveTabStates(); refreshBookmarks(); - Log.d(TAG_KIWIX, - "onPause Save currentzimfile to preferences:" + ZimContentProvider.getZimFile()); + Log.d(TAG_KIWIX, "onPause Save currentzimfile to preferences: " + ZimContentProvider.getZimFile()); } @Override public void webViewUrlLoading() { diff --git a/app/src/main/java/org/kiwix/kiwixmobile/KiwixWebViewClient.java b/app/src/main/java/org/kiwix/kiwixmobile/KiwixWebViewClient.java index 896c77f14..d62f7e1fe 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/KiwixWebViewClient.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/KiwixWebViewClient.java @@ -50,6 +50,7 @@ public class KiwixWebViewClient extends WebViewClient { return true; } else if (url.startsWith(ZimContentProvider.UI_URI.toString())) { Log.e("KiwixWebViewClient", "UI Url " + url + " not supported."); + //TODO: Document this code - what's a UI_URL? return true; } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java b/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java index c323805ed..71f348185 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java @@ -98,7 +98,7 @@ public class ZimContentProvider extends ContentProvider { public synchronized static String setZimFile(String fileName) { if (!jniKiwix.loadZIM(fileName)) { - Log.w(TAG_KIWIX, "Unable to open the ZIM file " + fileName); + Log.e(TAG_KIWIX, "Unable to open the ZIM file " + fileName); zimFileName = null; } else { Log.i(TAG_KIWIX, "Opening ZIM file " + fileName); @@ -107,7 +107,7 @@ public class ZimContentProvider extends ContentProvider { /* Try to open the corresponding fulltext index */ String fullText = getFulltextIndexPath(fileName); if (!jniKiwix.loadFulltextIndex(fullText)) { - Log.w(TAG_KIWIX, "Unable to open the ZIM fulltext index " + fullText); + Log.e(TAG_KIWIX, "Unable to open the ZIM fulltext index " + fullText); } } return zimFileName; @@ -464,13 +464,13 @@ public class ZimContentProvider extends ContentProvider { Log.d(TAG_KIWIX, "reading " + articleZimUrl + "(mime: " + mime.value + ", size: " + size.value + ") finished."); } catch (IOException | NullPointerException e) { - Log.w(TAG_KIWIX, "Exception reading article " + articleZimUrl + " from zim file", + Log.e(TAG_KIWIX, "Exception reading article " + articleZimUrl + " from zim file", e); } finally { try { out.close(); } catch (IOException e) { - Log.w(TAG_KIWIX, + Log.e(TAG_KIWIX, "Custom exception by closing out stream for article " + articleZimUrl, e); } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java index ab424db02..532426b51 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java @@ -60,7 +60,8 @@ public class KiwixTextToSpeech { initialized = true; onInitSucceedListener.onInitSucceed(); } else { - Log.w(TAG_KIWIX, "Initilization of TextToSpeech Failed!"); + Log.e(TAG_KIWIX, "Initialization of TextToSpeech Failed!"); + //TODO: Surface to user } }); } @@ -249,7 +250,8 @@ public class KiwixTextToSpeech { @Override public void onError(String s) { - Log.w(TAG_KIWIX, "TextToSpeech Error: " + s); + Log.e(TAG_KIWIX, "TextToSpeech Error: " + s); + //TODO: Surface to user } }); } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/LanguageUtils.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/LanguageUtils.java index c242636f4..781ff967d 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/utils/LanguageUtils.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/LanguageUtils.java @@ -195,7 +195,7 @@ public class LanguageUtils { field.setBoolean(layoutInflater, false); layoutInflater.setFactory(new LayoutInflaterFactory(mContext, layoutInflater)); } catch (NoSuchFieldException | IllegalAccessException | IllegalArgumentException e) { - Log.w(TAG_KIWIX, "could not access private field of the LayoutInflater"); + Log.w(TAG_KIWIX, "Font Change Failed: Could not access private field of the LayoutInflater", e); } } @@ -264,8 +264,7 @@ public class LanguageUtils { return view; } catch (InflateException | ClassNotFoundException e) { - Log.w(TAG_KIWIX, - "Could not apply the custom font to " + name + " " + e.getMessage()); + Log.w(TAG_KIWIX, "Could not apply the custom font to " + name, e); } } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/NetworkUtils.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/NetworkUtils.java index 1bb935bc3..d282fe3ff 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/utils/NetworkUtils.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/NetworkUtils.java @@ -77,7 +77,7 @@ public class NetworkUtils { details = details.trim().replaceAll(" +", " "); return details; } catch (Exception e) { - Log.d(KiwixMobileActivity.TAG_KIWIX, "Context invalid url: " + url); + Log.d(KiwixMobileActivity.TAG_KIWIX, "Context invalid url: " + url, e); return ""; } } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.java index 07337c990..06a14ab40 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.java @@ -209,7 +209,7 @@ public class ZimFileSelectFragment extends Fragment public void onBookFound(LibraryNetworkEntity.Book book) { if (!mFiles.contains(book)) { context.runOnUiThread(() -> { - Log.i("Scanner", "File Search: Found Book "+book.title); + Log.i("Scanner", "File Search: Found Book " + book.title); mFiles.add(book); mRescanAdapter.notifyDataSetChanged(); checkEmpty();