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

reduced potential memory leaks

Browse Source
This commit is contained in:
Elad Keyshawn 2016-12-29 17:12:56 +02:00
parent 185e0c2a08
commit 773cc45dcd
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/kiwix/kiwixmobile/LibraryFragment.java
View File

@ -75,6 +75,7 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
private ZimManageActivity faActivity; private ZimManageActivity faActivity;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
faActivity = (ZimManageActivity) super.getActivity(); faActivity = (ZimManageActivity) super.getActivity();
@ -86,7 +87,7 @@ public class LibraryFragment extends Fragment implements AdapterView.OnItemClick
// Don't use this method, it's handled by inflater.inflate() above : // Don't use this method, it's handled by inflater.inflate() above :
// setContentView(R.layout.activity_layout); // setContentView(R.layout.activity_layout);
ButterKnife.bind(this, llLayout); ButterKnife.bind(this, llLayout);
mService.setDownloadFragment(faActivity.mSectionsPagerAdapter.getDownloadFragment());
kiwixService = ((KiwixApplication) super.getActivity().getApplication()).getKiwixService(); kiwixService = ((KiwixApplication) super.getActivity().getApplication()).getKiwixService();
conMan = (ConnectivityManager) super.getActivity().getSystemService(Context.CONNECTIVITY_SERVICE); conMan = (ConnectivityManager) super.getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo network = conMan.getActiveNetworkInfo(); NetworkInfo network = conMan.getActiveNetworkInfo();

4
src/org/kiwix/kiwixmobile/ZimManageActivity.java
View File

@ -244,6 +244,10 @@ public class ZimManageActivity extends AppCompatActivity {
private DownloadFragment downloadFragment = new DownloadFragment(); private DownloadFragment downloadFragment = new DownloadFragment();
public DownloadFragment getDownloadFragment() {
return downloadFragment;
}
public SectionsPagerAdapter(FragmentManager fm) { public SectionsPagerAdapter(FragmentManager fm) {
super(fm); super(fm);
} }

8
src/org/kiwix/kiwixmobile/downloader/DownloadFragment.java
View File

@ -33,11 +33,11 @@ public class DownloadFragment extends Fragment {
public static LinkedHashMap<Integer, LibraryNetworkEntity.Book> mDownloads = new LinkedHashMap<>(); public static LinkedHashMap<Integer, LibraryNetworkEntity.Book> mDownloads = new LinkedHashMap<>();
public static LinkedHashMap<Integer, String> mDownloadFiles = new LinkedHashMap<>(); public static LinkedHashMap<Integer, String> mDownloadFiles = new LinkedHashMap<>();
public RelativeLayout relLayout; public RelativeLayout relLayout;
public static ListView listView; public ListView listView;
public static DownloadAdapter downloadAdapter; public static DownloadAdapter downloadAdapter;
private ZimManageActivity zimManageActivity; private ZimManageActivity zimManageActivity;
CoordinatorLayout mainLayout; CoordinatorLayout mainLayout;
private static FragmentActivity faActivity; private FragmentActivity faActivity;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@ -58,7 +58,7 @@ public class DownloadFragment extends Fragment {
updateNoDownloads(); updateNoDownloads();
} }
private static void updateNoDownloads() { private void updateNoDownloads() {
TextView noDownloadsText = (TextView) faActivity.findViewById(R.id.download_management_no_downloads); TextView noDownloadsText = (TextView) faActivity.findViewById(R.id.download_management_no_downloads);
if (noDownloadsText == null) return; if (noDownloadsText == null) return;
if (listView.getCount() == 0) { if (listView.getCount() == 0) {
@ -204,7 +204,7 @@ public class DownloadFragment extends Fragment {
} }
public static void addDownload(int position, LibraryNetworkEntity.Book book, String fileName) { public void addDownload(int position, LibraryNetworkEntity.Book book, String fileName) {
mDownloads.put(position, book); mDownloads.put(position, book);
mDownloadFiles.put(position, fileName); mDownloadFiles.put(position, fileName);
downloadAdapter.notifyDataSetChanged(); downloadAdapter.notifyDataSetChanged();

14
src/org/kiwix/kiwixmobile/downloader/DownloadService.java
View File

@ -61,17 +61,21 @@ public class DownloadService extends Service {
private static String SD_CARD; private static String SD_CARD;
public static String KIWIX_ROOT; public static String KIWIX_ROOT;
public static int notificationCount = 1; public static int notificationCount = 1;
public static ArrayList<String> notifications = new ArrayList<String>(); public static ArrayList<String> notifications = new ArrayList<>();
public String notificationTitle; public String notificationTitle;
private HashMap<Integer, NotificationCompat.Builder> notification = new HashMap<>(); private HashMap<Integer, NotificationCompat.Builder> notification = new HashMap<>();
private NotificationManager notificationManager; private NotificationManager notificationManager;
public HashMap<Integer, Integer> downloadStatus = new HashMap<Integer, Integer>(); public HashMap<Integer, Integer> downloadStatus = new HashMap<>();
public HashMap<Integer, Integer> downloadProgress = new HashMap<Integer, Integer>(); public HashMap<Integer, Integer> downloadProgress = new HashMap<>();
public static Object pauseLock = new Object(); public static Object pauseLock = new Object();
public static BookDao bookDao; public static BookDao bookDao;
private static DownloadFragment downloadFragment;
Handler handler = new Handler(Looper.getMainLooper()); Handler handler = new Handler(Looper.getMainLooper());
public static void setDownloadFragment(DownloadFragment dFragment) {
downloadFragment = dFragment;
}
@Override @Override
public void onCreate() { public void onCreate() {
kiwixService = ((KiwixApplication) getApplication()).getKiwixService(); kiwixService = ((KiwixApplication) getApplication()).getKiwixService();
@ -158,7 +162,7 @@ public class DownloadService extends Service {
} }
private void downloadBook(String url, int notificationID, LibraryNetworkEntity.Book book) { private void downloadBook(String url, int notificationID, LibraryNetworkEntity.Book book) {
DownloadFragment.addDownload(notificationID, book, KIWIX_ROOT + StorageUtils.getFileNameFromUrl(book.getUrl())); downloadFragment.addDownload(notificationID, book, KIWIX_ROOT + StorageUtils.getFileNameFromUrl(book.getUrl()));
kiwixService.getMetaLinks(url) kiwixService.getMetaLinks(url)
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.flatMap(metaLink -> getMetaLinkContentLength(metaLink.getRelevantUrl().getValue())) .flatMap(metaLink -> getMetaLinkContentLength(metaLink.getRelevantUrl().getValue()))