mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-08-03 18:56:44 -04:00
Some minute fixes but crash still occurs
This commit is contained in:
parent
4fb6d60d96
commit
307d7807a5
@ -89,6 +89,7 @@ import java.text.SimpleDateFormat;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import kotlin.Unit;
|
import kotlin.Unit;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@ -753,10 +754,15 @@ public abstract class CoreReaderFragment extends BaseFragment
|
|||||||
}
|
}
|
||||||
|
|
||||||
private KiwixWebView initalizeWebView(String url) {
|
private KiwixWebView initalizeWebView(String url) {
|
||||||
AttributeSet attrs = StyleUtils.getAttributes(requireActivity(), R.xml.webview);
|
//if(requireContext() != null) {
|
||||||
|
AttributeSet attrs = StyleUtils.getAttributes(getActivity(), R.xml.webview);
|
||||||
KiwixWebView webView = createWebView(attrs);
|
KiwixWebView webView = createWebView(attrs);
|
||||||
loadUrl(url, webView);
|
loadUrl(url, webView);
|
||||||
return webView;
|
return webView;
|
||||||
|
//} else{
|
||||||
|
// Log.e("KIWIX", "initalizeWebView: CONTEXXT NOT FOUND, NULL");
|
||||||
|
// return null;
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull protected ToolbarScrollingKiwixWebView createWebView(AttributeSet attrs) {
|
@NotNull protected ToolbarScrollingKiwixWebView createWebView(AttributeSet attrs) {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<Blacklist></Blacklist>
|
<Blacklist></Blacklist>
|
||||||
<Whitelist>
|
<Whitelist>
|
||||||
<ID>LongParameterList:DownloadCustom.kt$DownloadCustom$( id: String = "", title: String = "", description: String = "", language: String = "", creator: String = "", publisher: String = "", date: String = "", url: String = "", articleCount: String = "", mediaCount: String = "", size: String = "", name: String = "", favIcon: String = "" )</ID>
|
<ID>LongParameterList:DownloadCustom.kt$DownloadCustom$( id: String = "", title: String = "", description: String = "", language: String = "", creator: String = "", publisher: String = "", date: String = "", url: String = "", articleCount: String = "", mediaCount: String = "", size: String = "", name: String = "", favIcon: String = "" )</ID>
|
||||||
<ID>MagicNumber:CustomDownloadFragment.kt$CustomDownloadActivity$3</ID>
|
<ID>MagicNumber:CustomDownloadFragment.kt$CustomDownloadFragment$3</ID>
|
||||||
<ID>TooGenericExceptionThrown:ActivityExtensions.kt$throw RuntimeException( """ applicationContext is ${applicationContext::class.java.simpleName} application is ${application::class.java.simpleName} """.trimIndent() )</ID>
|
<ID>TooGenericExceptionThrown:ActivityExtensions.kt$throw RuntimeException( """ applicationContext is ${applicationContext::class.java.simpleName} application is ${application::class.java.simpleName} """.trimIndent() )</ID>
|
||||||
</Whitelist>
|
</Whitelist>
|
||||||
</SmellBaseline>
|
</SmellBaseline>
|
||||||
|
@ -67,11 +67,7 @@ class CustomDownloadFragment : BaseFragment() {
|
|||||||
savedInstanceState: Bundle?
|
savedInstanceState: Bundle?
|
||||||
): View? {
|
): View? {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
return inflater.inflate(R.layout.activity_custom_download, container, false)
|
val root = inflater.inflate(R.layout.activity_custom_download, container, false)
|
||||||
}
|
|
||||||
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
|
||||||
super.onViewCreated(view, savedInstanceState)
|
|
||||||
val activity = requireActivity() as CoreMainActivity
|
val activity = requireActivity() as CoreMainActivity
|
||||||
downloadViewModel.state.observe(viewLifecycleOwner, Observer(::render))
|
downloadViewModel.state.observe(viewLifecycleOwner, Observer(::render))
|
||||||
compositeDisposable.add(
|
compositeDisposable.add(
|
||||||
@ -80,6 +76,11 @@ class CustomDownloadFragment : BaseFragment() {
|
|||||||
Throwable::printStackTrace
|
Throwable::printStackTrace
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
return root
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
|
super.onViewCreated(view, savedInstanceState)
|
||||||
cd_download_button.setOnClickListener { downloadViewModel.actions.offer(ClickedDownload) }
|
cd_download_button.setOnClickListener { downloadViewModel.actions.offer(ClickedDownload) }
|
||||||
cd_retry_button.setOnClickListener { downloadViewModel.actions.offer(ClickedRetry) }
|
cd_retry_button.setOnClickListener { downloadViewModel.actions.offer(ClickedRetry) }
|
||||||
}
|
}
|
||||||
|
@ -36,10 +36,10 @@ import androidx.appcompat.app.AppCompatActivity
|
|||||||
import androidx.core.app.ActivityCompat
|
import androidx.core.app.ActivityCompat
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.drawerlayout.widget.DrawerLayout
|
import androidx.drawerlayout.widget.DrawerLayout
|
||||||
|
import androidx.navigation.fragment.findNavController
|
||||||
import org.kiwix.kiwixmobile.core.base.BaseActivity
|
import org.kiwix.kiwixmobile.core.base.BaseActivity
|
||||||
import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions.Super
|
import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions.Super
|
||||||
import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions.Super.ShouldCall
|
import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions.Super.ShouldCall
|
||||||
import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.navigate
|
|
||||||
import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setupDrawerToggle
|
import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setupDrawerToggle
|
||||||
import org.kiwix.kiwixmobile.core.main.CoreReaderFragment
|
import org.kiwix.kiwixmobile.core.main.CoreReaderFragment
|
||||||
import org.kiwix.kiwixmobile.core.main.MainMenu
|
import org.kiwix.kiwixmobile.core.main.MainMenu
|
||||||
@ -133,8 +133,9 @@ class CustomReaderFragment : CoreReaderFragment() {
|
|||||||
requestPermissions(arrayOf(READ_EXTERNAL_STORAGE), REQUEST_READ_FOR_OBB)
|
requestPermissions(arrayOf(READ_EXTERNAL_STORAGE), REQUEST_READ_FOR_OBB)
|
||||||
} else {
|
} else {
|
||||||
activity?.finish()
|
activity?.finish()
|
||||||
|
// val acct = requireActivity() as AppCompatActivity
|
||||||
// trans?.apply { add(R.id.custom_drawer_container, fragment).commit() }
|
// trans?.apply { add(R.id.custom_drawer_container, fragment).commit() }
|
||||||
with(activity as AppCompatActivity) { navigate(R.id.customDownloadFragment) }
|
findNavController().navigate(R.id.customDownloadFragment)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
@ -28,6 +28,9 @@
|
|||||||
android:name="pageUrl"
|
android:name="pageUrl"
|
||||||
android:defaultValue=""
|
android:defaultValue=""
|
||||||
app:argType="string" />
|
app:argType="string" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_customReaderFragment_to_customDownloadFragment"
|
||||||
|
app:destination="@id/customDownloadFragment" />
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/historyFragment"
|
android:id="@+id/historyFragment"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user