From a007499fd8d4a4622ce68dc0d580985ed3b7e0ae Mon Sep 17 00:00:00 2001 From: Justin Biggs Date: Sun, 28 Jul 2019 17:22:30 -0500 Subject: [PATCH 01/10] changed rate-us dialog launch to 10 from original 5 per issue #1235 --- app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java index e98a1d826..1c6222a72 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java @@ -573,7 +573,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback, ++tempVisitCount; visitCounterPref.setCount(tempVisitCount); - if (tempVisitCount >= 5 + if (tempVisitCount >= 10 && !visitCounterPref.getNoThanksState() && NetworkUtils.isNetworkAvailable(this) && !BuildConfig.DEBUG) { showRateDialog(); From 6fe60fe9c6f81bac5fb91ac01994892710304a58 Mon Sep 17 00:00:00 2001 From: Kelson Date: Wed, 7 Aug 2019 14:56:05 +0200 Subject: [PATCH 02/10] Add Codefactor badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5651c16a1..71ea9feef 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ Kiwix is written in [Kotlin](https://kotlinlang.org/) (with a few old pieces in [![Build Status](https://travis-ci.org/kiwix/kiwix-android.svg?branch=master)](https://travis-ci.org/kiwix/kiwix-android) [![IRC Web](https://img.shields.io/badge/chat-on%20freenode-brightgreen.svg)](http://chat.kiwix.org) [![codecov](https://codecov.io/gh/kiwix/kiwix-android/branch/master/graph/badge.svg)](https://codecov.io/gh/kiwix/kiwix-android) +[![CodeFactor](https://www.codefactor.io/repository/github/kiwix/kiwix-android/badge)](https://www.codefactor.io/repository/github/kiwix/kiwix-android) --- ## Build Instructions From ca1fff31cfbeee77957967137c11603f75380899 Mon Sep 17 00:00:00 2001 From: Kelson Date: Wed, 7 Aug 2019 15:21:02 +0200 Subject: [PATCH 03/10] Remove individual Jabber contact --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 71ea9feef..aa45cee96 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,8 @@ You can use IRC web interface on [http://chat.kiwix.org/](http://chat.kiwix.org/ Our other sources of communications include -- Email: kiwix-developer@lists.sourceforge.net or contact@kiwix.org -- Jabber: kelson@kiwix.org +- Email: contact@kiwix.org +- Mailing list: kiwix-developer@lists.sourceforge.net For more information, please refer to [https://wiki.kiwix.org/wiki/Communication](https://wiki.kiwix.org/wiki/Communication). From a6fba676355534127006246a1ed59b06f85a6d38 Mon Sep 17 00:00:00 2001 From: Justin Biggs Date: Wed, 7 Aug 2019 21:47:33 -0500 Subject: [PATCH 04/10] #960 updated external link warning popup icon to match others --- .../java/org/kiwix/kiwixmobile/main/MainActivity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java index 628b37445..c5f37e489 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java @@ -1112,6 +1112,12 @@ public class MainActivity extends BaseActivity implements WebViewCallback, } private void externalLinkPopup(Intent intent) { + int warningResId; + if (sharedPreferenceUtil.nightMode()) { + warningResId = R.drawable.ic_warning_white; + } else { + warningResId = R.drawable.ic_warning_black; + } new AlertDialog.Builder(this, dialogStyle()) .setTitle(R.string.external_link_popup_dialog_title) .setMessage(R.string.external_link_popup_dialog_message) @@ -1125,7 +1131,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback, startActivity(intent); }) .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> startActivity(intent)) - .setIcon(android.R.drawable.ic_dialog_alert) + .setIcon(warningResId) .show(); } From 70f26a75dd64851fe3b5e99dc6ab11fae330c21c Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 9 Aug 2019 12:19:46 +0100 Subject: [PATCH 05/10] #1294 Landing page is not displayed on Wikimedia zims develop fix --- .../java/org/kiwix/kiwixmobile/data/ZimContentProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java b/app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java index 01e305b3f..5b2823e68 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/data/ZimContentProvider.java @@ -342,7 +342,7 @@ public class ZimContentProvider extends ContentProvider { // This is the code which retrieve the mimeType from the libzim // "slow" and still bugyy - if (mimeType.isEmpty()) { + if (mimeType == null || mimeType.isEmpty()) { String t = uri.toString(); int pos = uri.toString().indexOf(CONTENT_URI.toString()); if (pos != -1) { From 2f4be9c97b33aa0d7ad800670149cc7b5968d1a9 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 9 Aug 2019 12:26:32 +0100 Subject: [PATCH 06/10] #1294 bump version --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 61206e82d..25c2668ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -177,7 +177,7 @@ def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: "dev" ext { versionMajor = 2 versionMinor = 5 - versionPatch = 1 + versionPatch = 2 } private String generateVersionName() { From b2d4c3502e953a78c871f3a5f59cdd47f0f9b490 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 9 Aug 2019 12:28:09 +0100 Subject: [PATCH 07/10] Revert "#1294 bump version" This reverts commit 2f4be9c97b33aa0d7ad800670149cc7b5968d1a9. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 25c2668ed..61206e82d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -177,7 +177,7 @@ def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: "dev" ext { versionMajor = 2 versionMinor = 5 - versionPatch = 2 + versionPatch = 1 } private String generateVersionName() { From d2bbb3fe67c0eff08b00a8b2cea6320c5d5e613b Mon Sep 17 00:00:00 2001 From: Justin Biggs Date: Sat, 10 Aug 2019 06:27:13 -0500 Subject: [PATCH 08/10] update warning icon using ternary operator --- .../java/org/kiwix/kiwixmobile/main/MainActivity.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java index c5f37e489..2bf206b75 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java @@ -1112,12 +1112,9 @@ public class MainActivity extends BaseActivity implements WebViewCallback, } private void externalLinkPopup(Intent intent) { - int warningResId; - if (sharedPreferenceUtil.nightMode()) { - warningResId = R.drawable.ic_warning_white; - } else { - warningResId = R.drawable.ic_warning_black; - } + int warningResId = (sharedPreferenceUtil.nightMode()) + ? R.drawable.ic_warning_white : R.drawable.ic_warning_black; + new AlertDialog.Builder(this, dialogStyle()) .setTitle(R.string.external_link_popup_dialog_title) .setMessage(R.string.external_link_popup_dialog_message) From fc3187d6273f368e82b6b33233846f3590dbd521 Mon Sep 17 00:00:00 2001 From: Abdul Wadood Date: Sun, 11 Aug 2019 11:07:20 +0200 Subject: [PATCH 09/10] #1342 Add only distinct zims to local database --- .../java/org/kiwix/kiwixmobile/database/newdb/dao/NewBookDao.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/NewBookDao.kt b/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/NewBookDao.kt index 42d62d8fb..fbef5c8b5 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/NewBookDao.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/NewBookDao.kt @@ -41,7 +41,7 @@ class NewBookDao @Inject constructor(private val box: Box) { inValues(BookOnDiskEntity_.bookId, booksOnDisk.map { it.book.id }.toTypedArray()) } .remove() - box.put(booksOnDisk.map(::BookOnDiskEntity)) + box.put(booksOnDisk.distinctBy { it.book.id }.map(::BookOnDiskEntity)) } } From 421cfc25947595b0ca78fbf0f6bbbbc531806844 Mon Sep 17 00:00:00 2001 From: Siddharth Sharma Date: Sun, 11 Aug 2019 11:08:26 +0200 Subject: [PATCH 10/10] Rename LoadBooks method and add instance in onResume --- .../main/java/org/kiwix/kiwixmobile/main/MainActivity.java | 3 ++- .../main/java/org/kiwix/kiwixmobile/main/MainContract.java | 2 +- .../main/java/org/kiwix/kiwixmobile/main/MainPresenter.java | 6 ++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java index 628b37445..d3923d375 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java @@ -1403,6 +1403,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback, webViewList.get(currentWebViewIndex).findViewById(R.id.get_content_card).setEnabled(true); } updateBottomToolbarVisibility(); + presenter.loadBooks(); Log.d(TAG_KIWIX, "action" + getIntent().getAction()); Intent intent = getIntent(); @@ -2097,7 +2098,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback, @Override public void setHomePage(View view) { RecyclerView homeRecyclerView = view.findViewById(R.id.recycler_view); - presenter.showHome(); + presenter.loadBooks(); homeRecyclerView.setAdapter(booksAdapter); downloadBookButton = view.findViewById(R.id.content_main_card_download_button); downloadBookButton.setOnClickListener(v -> manageZimFiles(1)); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainContract.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainContract.java index d3e7d5474..5aa973afe 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainContract.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainContract.java @@ -19,7 +19,7 @@ class MainContract { } interface Presenter extends BaseContract.Presenter { - void showHome(); + void loadBooks(); void saveBooks(List books); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainPresenter.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainPresenter.java index fd61893f6..8e678f5ff 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainPresenter.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainPresenter.java @@ -9,10 +9,8 @@ import javax.inject.Inject; import org.kiwix.kiwixmobile.base.BasePresenter; import org.kiwix.kiwixmobile.bookmark.BookmarkItem; import org.kiwix.kiwixmobile.data.DataSource; -import org.kiwix.kiwixmobile.data.local.entity.Bookmark; import org.kiwix.kiwixmobile.di.PerActivity; import org.kiwix.kiwixmobile.history.HistoryListItem; -import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity; import org.kiwix.kiwixmobile.zim_manager.fileselect_view.adapter.BooksOnDiskListItem; /** @@ -30,7 +28,7 @@ class MainPresenter extends BasePresenter implements MainCont } @Override - public void showHome() { + public void loadBooks() { dataSource.getLanguageCategorizedBooks() .subscribe(new SingleObserver>() { @Override @@ -61,7 +59,7 @@ class MainPresenter extends BasePresenter implements MainCont @Override public void onComplete() { - showHome(); + loadBooks(); } @Override