From 22232e378c3c5377d3bbbdd3e6a06f657ffe1069 Mon Sep 17 00:00:00 2001 From: Lukas Renggli Date: Fri, 30 Jun 2017 20:02:59 +0200 Subject: [PATCH] Remove unused code --- .../kiwix/kiwixmobile/tests/DownloadTest.java | 3 - .../kiwix/kiwixmobile/tests/NetworkTest.java | 1 - .../kiwix/kiwixmobile/ZimContentProvider.java | 20 ----- .../bookmarks_view/BookmarksActivity.java | 7 -- .../bookmarks_view/BookmarksViewCallback.java | 2 - .../kiwixmobile/database/BookmarksDao.java | 5 -- .../downloader/DownloadFragment.java | 11 --- .../settings/KiwixSettingsActivity.java | 5 -- .../kiwix/kiwixmobile/utils/DimenUtils.java | 14 --- .../kiwixmobile/utils/RateAppCounter.java | 4 - .../kiwix/kiwixmobile/utils/StorageUtils.java | 87 +------------------ .../views/AutoCompleteAdapter.java | 4 - .../views/CompatFindActionModeCallback.java | 6 -- .../kiwixmobile/views/SliderPreference.java | 4 - .../zim_manager/ZimManageActivity.java | 7 -- .../ZimFileSelectFragment.java | 5 -- .../ZimFileSelectViewCallback.java | 5 -- .../library_view/LibraryFragment.java | 25 +----- .../java/org/kiwix/kiwixlib/JNIKiwixBool.java | 25 ------ 19 files changed, 2 insertions(+), 238 deletions(-) delete mode 100644 kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/DownloadTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/DownloadTest.java index 31c5f8d6f..20727ef87 100644 --- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/DownloadTest.java +++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/DownloadTest.java @@ -41,9 +41,6 @@ import static org.kiwix.kiwixmobile.utils.StandardActions.enterHelp; @RunWith(AndroidJUnit4.class) public class DownloadTest { - @Inject KiwixIdlingResource kiwixIdlingResource; - - @Rule public ActivityTestRule mActivityTestRule = new ActivityTestRule<>( SplashActivity.class); diff --git a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java index 590f5918e..1208d584c 100644 --- a/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java +++ b/app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java @@ -56,7 +56,6 @@ import static org.kiwix.kiwixmobile.utils.StandardActions.enterHelp; public class NetworkTest { - @Inject OkHttpClient okHttpClient; @Inject MockWebServer mockWebServer; diff --git a/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java b/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java index ceedd0050..e555b1730 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java @@ -154,23 +154,6 @@ public class ZimContentProvider extends ContentProvider { } } - public static int getArticleCount() { - if (jniKiwix == null || zimFileName == null) { - return 0; - } else { - return jniKiwix.getArticleCount(); - - } - } - public static int getMediaCount() { - if (jniKiwix == null || zimFileName == null) { - return 0; - } else { - return jniKiwix.getMediaCount(); - - } - } - public static String getCreator() { if (jniKiwix == null || zimFileName == null) { return null; @@ -443,8 +426,6 @@ public class ZimContentProvider extends ContentProvider { static class TransferThread extends Thread { - Uri articleUri; - String articleZimUrl; OutputStream out; @@ -452,7 +433,6 @@ public class ZimContentProvider extends ContentProvider { JNIKiwix jniKiwix; TransferThread(JNIKiwix jniKiwix, Uri articleUri, OutputStream out) throws IOException { - this.articleUri = articleUri; this.jniKiwix = jniKiwix; Log.d(TAG_KIWIX, "Retrieving: " + articleUri.toString()); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/bookmarks_view/BookmarksActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/bookmarks_view/BookmarksActivity.java index 9cb7e5168..054a77557 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/bookmarks_view/BookmarksActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/bookmarks_view/BookmarksActivity.java @@ -183,13 +183,6 @@ public class BookmarksActivity extends BaseActivity setNoBookmarksState(); } - - @Override - public void updateAdapter() { - adapter.notifyDataSetChanged(); - setNoBookmarksState(); - } - @Override public void popDeleteBookmarksSnackbar() { Snackbar bookmarkDeleteSnackbar = diff --git a/app/src/main/java/org/kiwix/kiwixmobile/bookmarks_view/BookmarksViewCallback.java b/app/src/main/java/org/kiwix/kiwixmobile/bookmarks_view/BookmarksViewCallback.java index b16aaa814..c5673c40b 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/bookmarks_view/BookmarksViewCallback.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/bookmarks_view/BookmarksViewCallback.java @@ -11,7 +11,5 @@ import java.util.ArrayList; public interface BookmarksViewCallback extends ViewCallback { void showBookmarks(ArrayList bookmarks, ArrayList bookmarkUrls); - void updateAdapter(); - void popDeleteBookmarksSnackbar(); } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/database/BookmarksDao.java b/app/src/main/java/org/kiwix/kiwixmobile/database/BookmarksDao.java index 48fb9e805..831d4f083 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/database/BookmarksDao.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/database/BookmarksDao.java @@ -77,9 +77,4 @@ public class BookmarksDao { mDb.deleteWhere(Bookmarks.class, Bookmarks.BOOKMARK_URL.eq(favArticle).and(Bookmarks.ZIM_ID.eq(ZimId).or(Bookmarks.ZIM_NAME.eq(ZimName))) ); } - - public void deleteAll(){ - mDb.clear(); - } - } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java index e916e795d..73d9eb7b3 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/downloader/DownloadFragment.java @@ -268,17 +268,6 @@ public class DownloadFragment extends Fragment { } } - public static class Download { - public String title; - public int progress; - - public Download(String title) { - this.title = title; - progress = 0; - } - - } - public void addDownload(int position, LibraryNetworkEntity.Book book, String fileName) { mDownloads.put(position, book); mDownloadFiles.put(position, fileName); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java index 83fd503b4..6da74ec74 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java @@ -84,12 +84,8 @@ public class KiwixSettingsActivity extends AppCompatActivity { public static final String PREF_NIGHTMODE = "pref_nightmode"; - public static final String PREF_HIDETOOLBAR = "pref_hidetoolbar"; - public static final String PREF_WIFI_ONLY = "pref_wifi_only"; - public static String zimFile; - public static boolean allHistoryCleared = false; @@ -107,7 +103,6 @@ public class KiwixSettingsActivity extends AppCompatActivity { setContentView(R.layout.settings); allHistoryCleared = false; - zimFile = getIntent().getStringExtra("zim_file"); getFragmentManager() .beginTransaction(). diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/DimenUtils.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/DimenUtils.java index 757cedf5f..d6ff95e7d 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/utils/DimenUtils.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/DimenUtils.java @@ -36,18 +36,4 @@ public class DimenUtils { return DimenUtils.getToolbarHeight(context) + DimenUtils.getTranslucentStatusBarHeight(context); } - - public static void resizeToolbar(Context context, Toolbar toolbar, ViewGroup toolbarContainer) { - int statusBarHeight = DimenUtils.getTranslucentStatusBarHeight(context); - - ViewGroup.LayoutParams toolbarContainerParams = toolbarContainer.getLayoutParams(); - toolbarContainerParams.height += statusBarHeight; - toolbarContainer.setLayoutParams(toolbarContainerParams); - - ViewGroup.LayoutParams toolbarParams = toolbar.getLayoutParams(); - toolbarParams.height += statusBarHeight; - toolbar.setLayoutParams(toolbarParams); - - toolbar.setPadding(0, statusBarHeight, 0, 0); - } } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/RateAppCounter.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/RateAppCounter.java index af00f1764..0041e5ecd 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/utils/RateAppCounter.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/RateAppCounter.java @@ -46,10 +46,6 @@ public class RateAppCounter { CounterEditor.apply(); } - public SharedPreferences.Editor getEditor() { - return visitCounter.edit(); - } - public int getCount() { return visitCounter.getInt("count", 0); } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/StorageUtils.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/StorageUtils.java index ab390c809..a2fd44afe 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/utils/StorageUtils.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/StorageUtils.java @@ -12,94 +12,9 @@ import java.util.UUID; public class StorageUtils { - private static final String SDCARD_ROOT = - Environment.getExternalStorageDirectory().getAbsolutePath(); - - public static final String FILE_ROOT = SDCARD_ROOT + "/kiwix/"; - - private static final long LOW_STORAGE_THRESHOLD = 1024 * 1024 * 10; - - public static boolean isSdCardWritable() { - return Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED); - } - - public static long getAvailableStorage(File path) { - - String storageDirectory; - storageDirectory = path.getPath(); - try { - StatFs stat = new StatFs(storageDirectory); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { - return (stat.getAvailableBlocksLong() * stat.getBlockSizeLong()); - } - return ((long) stat.getAvailableBlocks() * (long) stat.getBlockSize()); - } catch (RuntimeException ex) { - return 0; - } - } - - public static boolean checkAvailableStorage(File path) { - return getAvailableStorage(path) >= LOW_STORAGE_THRESHOLD; - } - - public static boolean isSDCardAvailable() { - return Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED); - } - - public static boolean createKiwixRootDir() throws IOException { - File file = new File(FILE_ROOT); - return (!file.exists() || !file.isDirectory()) && file.mkdir(); - } - - public static String size(long size) { - if (size / (1024 * 1024) > 0) { - float tmpSize = (float) (size) / (float) (1024 * 1024); - DecimalFormat df = new DecimalFormat("#.##"); - return "" + df.format(tmpSize) + "MB"; - } else if (size / 1024 > 0) { - return "" + (size / (1024)) + "KB"; - } else { - return "" + size + "B"; - } - } - - public static boolean delete(File path) { - boolean result = true; - if (path.exists()) { - if (path.isDirectory()) { - for (File child : path.listFiles()) { - result &= delete(child); - } - result &= path.delete(); // Delete empty directory. - } - if (path.isFile()) { - result &= path.delete(); - } - if (!result) { - Log.e(null, "Delete failed;"); - } - return result; - } else { - Log.e(null, "File does not exist."); - return false; - } - } - public static String getFileNameFromUrl(String url) { - - int index = url.lastIndexOf('?'); - String filename; - if (index > 1) { - filename = url.substring(url.lastIndexOf('/') + 1, index); - } else { - filename = url.substring(url.lastIndexOf('/') + 1); - } - - if ("".equals(filename.trim())) { - filename = String.valueOf(UUID.randomUUID()); - } + String filename = NetworkUtils.getFileNameFromUrl(url); filename = filename.replace(".meta4",""); - return filename; } } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java b/app/src/main/java/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java index 412e6a7a5..d0488d8f7 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java @@ -62,10 +62,6 @@ public class AutoCompleteAdapter extends ArrayAdapter implements Filtera } else return a; } - public String getItemRaw(int index) { - return mData.get(index); - } - @Override public Filter getFilter() { return mFilter; diff --git a/app/src/main/java/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java b/app/src/main/java/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java index 53cf1e821..ed38d56a0 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/views/CompatFindActionModeCallback.java @@ -50,8 +50,6 @@ public class CompatFindActionModeCallback private InputMethodManager mInput; - private boolean mMatchesFound; - private ActionMode mActionMode; public CompatFindActionModeCallback(Context context) { @@ -87,7 +85,6 @@ public class CompatFindActionModeCallback // Necessary each time we set the text, so that this will watch // changes to it. span.setSpan(this, 0, length, Spannable.SPAN_INCLUSIVE_INCLUSIVE); - mMatchesFound = false; } // Set the WebView to search. Must be non null, and set before calling startActionMode. @@ -119,10 +116,8 @@ public class CompatFindActionModeCallback CharSequence find = mEditText.getText(); if (find.length() == 0) { mWebView.clearMatches(); - mMatchesFound = false; mWebView.findAll(null); } else { - mMatchesFound = true; mWebView.findAll(find.toString()); // Enable word highlighting with reflection @@ -164,7 +159,6 @@ public class CompatFindActionModeCallback mActionMode = mode; Editable edit = mEditText.getText(); Selection.setSelection(edit, edit.length()); - mMatchesFound = false; mEditText.requestFocus(); return true; } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/views/SliderPreference.java b/app/src/main/java/org/kiwix/kiwixmobile/views/SliderPreference.java index 48a82ce0d..64e112041 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/views/SliderPreference.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/views/SliderPreference.java @@ -92,10 +92,6 @@ public class SliderPreference extends DialogPreference { } } - public float getValue() { - return mSeekBarValue; - } - public void setValue(float value) { if (shouldPersist()) { persistFloat(value); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java index 241fb89b7..9f7c29d8e 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivity.java @@ -60,8 +60,6 @@ public class ZimManageActivity extends AppCompatActivity { */ private ViewPager mViewPager; - public boolean downloading = false; - public Toolbar toolbar; public MenuItem refeshItem; @@ -159,15 +157,10 @@ public class ZimManageActivity extends AppCompatActivity { public void displayDownloadInterface() { - downloading = true; mSectionsPagerAdapter.notifyDataSetChanged(); mViewPager.setCurrentItem(2); } - public void displayLocalTab() { - mViewPager.setCurrentItem(0); - } - @Override public void onBackPressed() { int value = Settings.System.getInt(getContentResolver(), Settings.System.ALWAYS_FINISH_ACTIVITIES, 0); 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 ee794422b..cbf093d82 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 @@ -158,11 +158,6 @@ public class ZimFileSelectFragment extends Fragment checkPermissions(); } - @Override - public void updateFilesAdapter() { - - } - public void refreshFragment(){ if (mZimFileList == null) return; diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectViewCallback.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectViewCallback.java index e1b09428e..63a00cba5 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectViewCallback.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectViewCallback.java @@ -10,9 +10,4 @@ import java.util.ArrayList; */ public interface ZimFileSelectViewCallback extends ViewCallback { void showFiles(ArrayList books); - - void updateFilesAdapter(); - - - } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.java index 517fe7fef..3fa29bd3e 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.java @@ -83,8 +83,6 @@ public class LibraryFragment extends Fragment private boolean mBound; - private boolean active; - public LibraryAdapter libraryAdapter; private DownloadServiceConnection mConnection = new DownloadServiceConnection(); @@ -148,7 +146,6 @@ public class LibraryFragment extends Fragment @Override public void showBooks(LinkedList books) { - active = true; libraryAdapter.setAllBooks(books); if (faActivity.searchView != null) { libraryAdapter.getFilter().filter( @@ -196,7 +193,6 @@ public class LibraryFragment extends Fragment @Override public void onDestroyView() { super.onDestroyView(); - active = false; if (mBound) { super.getActivity().unbindService(mConnection.downloadServiceInterface); mBound = false; @@ -252,22 +248,6 @@ public class LibraryFragment extends Fragment } } - - public void mobileDownloadDialog(int position, AdapterView parent) { - new AlertDialog.Builder(super.getActivity(), dialogStyle()) - .setMessage(getString(R.string.download_over_network)) - .setPositiveButton(getResources().getString(android.R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - downloadFile((Book) parent.getAdapter().getItem(position)); - } - }) - .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - } - }) - .show(); - } - @Override public void downloadFile(Book book) { downloadingBooks.add(book); @@ -311,7 +291,6 @@ public class LibraryFragment extends Fragment public class DownloadServiceConnection { public DownloadServiceInterface downloadServiceInterface; - public boolean bound; public DownloadServiceConnection() { downloadServiceInterface = new DownloadServiceInterface(); @@ -328,9 +307,7 @@ public class LibraryFragment extends Fragment } @Override - public void onServiceDisconnected(ComponentName arg0) { - bound = false; - } + public void onServiceDisconnected(ComponentName arg0) { } } } diff --git a/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java b/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java deleted file mode 100644 index 7cf645460..000000000 --- a/kiwixlib/src/main/java/org/kiwix/kiwixlib/JNIKiwixBool.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2013 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ - -package org.kiwix.kiwixlib; - -public class JNIKiwixBool { - - public boolean value; -}