mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-18 03:45:33 -04:00
More linting
This commit is contained in:
Rashiq
parent
78ef919652
commit
6a07e27bb6
@ -1,29 +1,19 @@
|
||||
package org.kiwix.kiwixmobile;
|
||||
|
||||
import android.app.IntentService;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.ServiceConnection;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.Network;
|
||||
import android.net.NetworkInfo;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Environment;
|
||||
import android.os.Handler;
|
||||
import android.os.IBinder;
|
||||
import android.os.Message;
|
||||
import android.os.StatFs;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentActivity;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.support.v7.widget.Toolbar;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
@ -35,30 +25,19 @@ import android.widget.ProgressBar;
|
||||
import android.widget.RelativeLayout;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
|
||||
import java.io.File;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.MathContext;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import org.kiwix.kiwixmobile.database.BookDao;
|
||||
import org.kiwix.kiwixmobile.database.KiwixDatabase;
|
||||
import org.kiwix.kiwixmobile.downloader.DownloadIntent;
|
||||
import org.kiwix.kiwixmobile.downloader.DownloadService;
|
||||
import org.kiwix.kiwixmobile.library.LibraryAdapter;
|
||||
import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity;
|
||||
import org.kiwix.kiwixmobile.network.KiwixService;
|
||||
import org.kiwix.kiwixmobile.utils.LanguageUtils;
|
||||
import org.kiwix.kiwixmobile.utils.ShortcutUtils;
|
||||
|
||||
import rx.android.schedulers.AndroidSchedulers;
|
||||
|
||||
import static org.kiwix.kiwixmobile.utils.ShortcutUtils.stringsGetter;
|
||||
@ -91,8 +70,6 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
|
||||
|
||||
private ConnectivityManager conMan;
|
||||
|
||||
private BookDao bookDao;
|
||||
|
||||
private ZimManageActivity faActivity;
|
||||
|
||||
@Override
|
||||
@ -110,7 +87,6 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
|
||||
kiwixService = ((KiwixApplication) super.getActivity().getApplication()).getKiwixService();
|
||||
conMan = (ConnectivityManager) super.getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
NetworkInfo network = conMan.getActiveNetworkInfo();
|
||||
bookDao = new BookDao(KiwixDatabase.getInstance(super.getActivity()));
|
||||
if (network != null && network.isConnected()) {
|
||||
if (isWiFi()) {
|
||||
getLibraryData();
|
||||
@ -177,9 +153,7 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
|
||||
if (mBound) {
|
||||
super.getActivity().unbindService(mConnection.downloadServiceInterface);
|
||||
mBound = false;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -197,7 +171,6 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
|
||||
} else {
|
||||
mobileDownloadDialog(position, parent);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public boolean isWiFi(){
|
||||
@ -218,22 +191,21 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
|
||||
}
|
||||
}
|
||||
|
||||
public static String bytesToHuman (long size)
|
||||
{
|
||||
long KB = 1 * 1024;
|
||||
public static String bytesToHuman(long size) {
|
||||
long KB = 1 * 1024;
|
||||
long MB = KB * 1024;
|
||||
long GB = MB * 1024;
|
||||
long TB = GB * 1024;
|
||||
long PB = TB * 1024;
|
||||
long EB = PB * 1024;
|
||||
|
||||
if (size < KB) return size + " Bytes";
|
||||
if (size >= KB && size < MB) return round3SF((double)size / KB) + " KB";
|
||||
if (size >= MB && size < GB) return round3SF((double)size / MB) + " MB";
|
||||
if (size >= GB && size < TB) return round3SF((double)size / GB) + " GB";
|
||||
if (size >= TB && size < PB) return round3SF((double)size / TB) + " TB";
|
||||
if (size >= PB && size < EB) return round3SF((double)size / PB) + " PB";
|
||||
if (size >= EB) return round3SF((double)size / EB) + " EB";
|
||||
if (size < KB) { return size + " Bytes"; }
|
||||
if (size >= KB && size < MB) { return round3SF((double) size / KB) + " KB"; }
|
||||
if (size >= MB && size < GB) { return round3SF((double) size / MB) + " MB"; }
|
||||
if (size >= GB && size < TB) { return round3SF((double) size / GB) + " GB"; }
|
||||
if (size >= TB && size < PB) { return round3SF((double) size / TB) + " TB"; }
|
||||
if (size >= PB && size < EB) { return round3SF((double) size / PB) + " PB"; }
|
||||
if (size >= EB) { return round3SF((double) size / EB) + " EB"; }
|
||||
|
||||
return "???";
|
||||
}
|
||||
@ -290,8 +262,7 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
|
||||
public class DownloadServiceInterface implements ServiceConnection {
|
||||
|
||||
@Override
|
||||
public void onServiceConnected(ComponentName className,
|
||||
IBinder service) {
|
||||
public void onServiceConnected(ComponentName className, IBinder service) {
|
||||
// We've bound to LocalService, cast the IBinder and get LocalService instance
|
||||
DownloadService.LocalBinder binder = (DownloadService.LocalBinder) service;
|
||||
mService = binder.getService();
|
||||
|
||||
@ -20,8 +20,6 @@
|
||||
package org.kiwix.kiwixmobile;
|
||||
|
||||
import android.content.ContentProvider;
|
||||
import android.content.SharedPreferences;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
import android.database.Cursor;
|
||||
@ -30,10 +28,6 @@ import android.os.ParcelFileDescriptor;
|
||||
import android.os.ParcelFileDescriptor.AutoCloseOutputStream;
|
||||
import android.util.Log;
|
||||
import android.webkit.MimeTypeMap;
|
||||
|
||||
import org.kiwix.kiwixmobile.settings.Constants;
|
||||
import org.kiwix.kiwixmobile.utils.files.FileUtils;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
@ -41,10 +35,9 @@ import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.Arrays;
|
||||
import java.util.function.BooleanSupplier;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import org.kiwix.kiwixmobile.utils.files.FileUtils;
|
||||
|
||||
public class ZimContentProvider extends ContentProvider {
|
||||
|
||||
@ -66,8 +59,6 @@ public class ZimContentProvider extends ContentProvider {
|
||||
|
||||
private static JNIKiwix jniKiwix;
|
||||
|
||||
private Matcher matcher;
|
||||
|
||||
private static String getFulltextIndexPath(String file){
|
||||
String[] names = {file, file};
|
||||
|
||||
@ -349,10 +340,9 @@ public class ZimContentProvider extends ContentProvider {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ParcelFileDescriptor openFile(Uri uri, String mode)
|
||||
throws FileNotFoundException {
|
||||
public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
|
||||
|
||||
matcher = PATTERN.matcher(uri.toString());
|
||||
Matcher matcher = PATTERN.matcher(uri.toString());
|
||||
if (matcher.matches()) {
|
||||
try {
|
||||
return saveVideoToCache(uri);
|
||||
|
||||
@ -28,7 +28,6 @@ import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentActivity;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.util.Log;
|
||||
@ -77,7 +76,7 @@ public class ZimFileSelectFragment extends Fragment
|
||||
|
||||
|
||||
public static void finishResult(String path) {
|
||||
ZimManageActivity zimManageActivity = (ZimManageActivity) context;
|
||||
ZimManageActivity zimManageActivity = context;
|
||||
if (path != null) {
|
||||
File file = new File(path);
|
||||
Uri uri = Uri.fromFile(file);
|
||||
@ -127,7 +126,6 @@ public class ZimFileSelectFragment extends Fragment
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
FragmentActivity faActivity = (FragmentActivity) super.getActivity();
|
||||
context = (ZimManageActivity) super.getActivity();
|
||||
// Replace LinearLayout by the type of the root element of the layout you're trying to load
|
||||
llLayout = (RelativeLayout) inflater.inflate(R.layout.zim_list, container, false);
|
||||
@ -136,7 +134,7 @@ public class ZimFileSelectFragment extends Fragment
|
||||
mFileMessage = (TextView) llLayout.findViewById(R.id.file_management_no_files);
|
||||
mZimFileList = (ListView) llLayout.findViewById(R.id.zimfilelist);
|
||||
|
||||
mFiles = new ArrayList<LibraryNetworkEntity.Book>();
|
||||
mFiles = new ArrayList<>();
|
||||
progressBar = (RelativeLayout) super.getActivity().getLayoutInflater().inflate(R.layout.progress_bar, null);
|
||||
|
||||
mRescanAdapter = new RescanDataAdapter(ZimFileSelectFragment.context, 0, mFiles);
|
||||
|
||||
@ -285,11 +285,8 @@ public class ZimManageActivity extends AppCompatActivity {
|
||||
|
||||
private class LanguageArrayAdapter extends ArrayAdapter<LibraryAdapter.Language> {
|
||||
|
||||
private ArrayList<LibraryAdapter.Language> mLanguages;
|
||||
|
||||
public LanguageArrayAdapter(Context context, int textViewResourceId, ArrayList<LibraryAdapter.Language> objects) {
|
||||
super(context, textViewResourceId, objects);
|
||||
mLanguages = objects;
|
||||
public LanguageArrayAdapter(Context context, int textViewResourceId, ArrayList<LibraryAdapter.Language> languages) {
|
||||
super(context, textViewResourceId, languages);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -311,7 +308,6 @@ public class ZimManageActivity extends AppCompatActivity {
|
||||
holder.checkBox.setChecked(getItem(position).active);
|
||||
holder.checkBox.setOnCheckedChangeListener((compoundButton, b) -> getItem(position).active = b);
|
||||
return convertView;
|
||||
|
||||
}
|
||||
|
||||
// We are using the ViewHolder pattern in order to optimize the ListView by reusing
|
||||
|
||||
@ -3,12 +3,8 @@ package org.kiwix.kiwixmobile.database;
|
||||
|
||||
import com.yahoo.squidb.data.SquidCursor;
|
||||
import com.yahoo.squidb.sql.Query;
|
||||
|
||||
import org.kiwix.kiwixmobile.database.entity.Bookmarks;
|
||||
import org.kiwix.kiwixmobile.database.entity.RecentSearch;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.kiwix.kiwixmobile.database.entity.Bookmarks;
|
||||
|
||||
/**
|
||||
* Dao class for bookmarks.
|
||||
@ -22,7 +18,6 @@ public class BookmarksDao {
|
||||
this.mDb = kiwikDatabase;
|
||||
}
|
||||
|
||||
|
||||
public ArrayList<String> getBookmarks(String ZimId) {
|
||||
SquidCursor<Bookmarks> bookmarkCursor = mDb.query(
|
||||
Bookmarks.class,
|
||||
|
||||
@ -21,34 +21,21 @@ package org.kiwix.kiwixmobile.database;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.Log;
|
||||
|
||||
import com.yahoo.squidb.data.SquidCursor;
|
||||
import com.yahoo.squidb.data.SquidDatabase;
|
||||
import com.yahoo.squidb.data.adapter.SQLiteDatabaseWrapper;
|
||||
import com.yahoo.squidb.sql.Order;
|
||||
import com.yahoo.squidb.sql.Property;
|
||||
import com.yahoo.squidb.sql.Query;
|
||||
import com.yahoo.squidb.sql.Table;
|
||||
|
||||
import org.kiwix.kiwixmobile.KiwixMobileActivity;
|
||||
import org.kiwix.kiwixmobile.ZimContentProvider;
|
||||
import org.kiwix.kiwixmobile.database.entity.BookDataSource;
|
||||
import org.kiwix.kiwixmobile.database.entity.BookDatabaseEntity;
|
||||
import org.kiwix.kiwixmobile.database.entity.Bookmarks;
|
||||
import org.kiwix.kiwixmobile.database.entity.LibraryDatabaseEntity;
|
||||
import org.kiwix.kiwixmobile.database.entity.NetworkLanguageDatabaseEntity;
|
||||
import org.kiwix.kiwixmobile.database.entity.RecentSearch;
|
||||
import org.kiwix.kiwixmobile.database.entity.RecentSearchSpec;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.kiwix.kiwixmobile.KiwixMobileActivity;
|
||||
import org.kiwix.kiwixmobile.ZimContentProvider;
|
||||
import org.kiwix.kiwixmobile.database.entity.BookDatabaseEntity;
|
||||
import org.kiwix.kiwixmobile.database.entity.Bookmarks;
|
||||
import org.kiwix.kiwixmobile.database.entity.LibraryDatabaseEntity;
|
||||
import org.kiwix.kiwixmobile.database.entity.NetworkLanguageDatabaseEntity;
|
||||
import org.kiwix.kiwixmobile.database.entity.RecentSearch;
|
||||
|
||||
public class KiwixDatabase extends SquidDatabase {
|
||||
|
||||
@ -56,13 +43,11 @@ public class KiwixDatabase extends SquidDatabase {
|
||||
private Context context;
|
||||
private static KiwixDatabase instance = null;
|
||||
|
||||
|
||||
protected KiwixDatabase(Context context) {
|
||||
super(context);
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
|
||||
public static KiwixDatabase getInstance(Context context) {
|
||||
if(instance == null) {
|
||||
instance = new KiwixDatabase(context);
|
||||
|
||||
@ -42,7 +42,9 @@ public class NetworkLanguageDao {
|
||||
ArrayList<LibraryAdapter.Language> result = new ArrayList<>();
|
||||
try {
|
||||
while (languageCursor.moveToNext()) {
|
||||
result.add(new LibraryAdapter.Language(languageCursor.get(NetworkLanguageDatabaseEntity.LANGUAGE_I_S_O_3), languageCursor.get(NetworkLanguageDatabaseEntity.ENABLED)));
|
||||
String languageCode = languageCursor.get(NetworkLanguageDatabaseEntity.LANGUAGE_I_S_O_3);
|
||||
boolean enabled = languageCursor.get(NetworkLanguageDatabaseEntity.ENABLED);
|
||||
result.add(new LibraryAdapter.Language(languageCode, enabled));
|
||||
}
|
||||
} finally {
|
||||
languageCursor.close();
|
||||
|
||||
@ -2,13 +2,10 @@ package org.kiwix.kiwixmobile.database;
|
||||
|
||||
import com.yahoo.squidb.data.SquidCursor;
|
||||
import com.yahoo.squidb.sql.Query;
|
||||
|
||||
import org.kiwix.kiwixmobile.ZimContentProvider;
|
||||
import org.kiwix.kiwixmobile.database.entity.RecentSearch;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.ResourceBundle;
|
||||
import org.kiwix.kiwixmobile.ZimContentProvider;
|
||||
import org.kiwix.kiwixmobile.database.entity.RecentSearch;
|
||||
|
||||
/**
|
||||
* Dao class for recent searches.
|
||||
@ -62,6 +59,4 @@ public class RecentSearchDao {
|
||||
public void deleteSearchHistory() {
|
||||
mDb.deleteWhere(RecentSearch.class, RecentSearch.ID.isNotNull());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -19,18 +19,13 @@ import android.widget.ListView;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.RelativeLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import org.kiwix.kiwixmobile.KiwixMobileActivity;
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedHashMap;
|
||||
import org.kiwix.kiwixmobile.LibraryFragment;
|
||||
import org.kiwix.kiwixmobile.R;
|
||||
import org.kiwix.kiwixmobile.ZimContentProvider;
|
||||
import org.kiwix.kiwixmobile.ZimFileSelectFragment;
|
||||
import org.kiwix.kiwixmobile.ZimManageActivity;
|
||||
import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity;
|
||||
import org.w3c.dom.Text;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
|
||||
public class DownloadFragment extends Fragment {
|
||||
@ -46,7 +41,7 @@ public class DownloadFragment extends Fragment {
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
faActivity = (FragmentActivity) super.getActivity();
|
||||
faActivity = super.getActivity();
|
||||
relLayout = (RelativeLayout) inflater.inflate(R.layout.download_management, container, false);
|
||||
|
||||
zimManageActivity = (ZimManageActivity) super.getActivity();
|
||||
@ -60,22 +55,17 @@ public class DownloadFragment extends Fragment {
|
||||
@Override
|
||||
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
updateNoDownloads();
|
||||
|
||||
}
|
||||
|
||||
private static void updateNoDownloads() {
|
||||
TextView noDownloadsText = (TextView) faActivity.findViewById(R.id.download_management_no_downloads);
|
||||
if (noDownloadsText == null) {
|
||||
return;
|
||||
}
|
||||
if (noDownloadsText == null) return;
|
||||
if (listView.getCount() == 0) {
|
||||
noDownloadsText.setVisibility(View.VISIBLE);
|
||||
} else if (listView.getCount() > 0) {
|
||||
noDownloadsText.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public class DownloadAdapter extends BaseAdapter {
|
||||
|
||||
@ -58,7 +58,6 @@ public class LibraryAdapter extends ArrayAdapter<Book> {
|
||||
public static Map<String, Locale> mLocaleMap;
|
||||
public static ArrayList<Language> mLanguages = new ArrayList<>();
|
||||
private static ImmutableList<Book> allBooks;
|
||||
private static ArrayList<Book> arrayBooks;
|
||||
private BookFilter filter;
|
||||
private static ZimManageActivity mActivity;
|
||||
private static ArrayList<String> bookLanguages;
|
||||
@ -68,7 +67,6 @@ public class LibraryAdapter extends ArrayAdapter<Book> {
|
||||
public LibraryAdapter(Context context, ArrayList<Book> books) {
|
||||
super(context, 0, books);
|
||||
allBooks = ImmutableList.copyOf(books);
|
||||
arrayBooks = books;
|
||||
mActivity = (ZimManageActivity) context;
|
||||
networkLanguageDao = new NetworkLanguageDao(KiwixDatabase.getInstance(mActivity));
|
||||
bookDao = new BookDao( KiwixDatabase.getInstance(context));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user