kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 10:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/macgills/detekt

Browse Source 
# Conflicts:
#	buildSrc/src/main/kotlin/Versions.kt
This commit is contained in:
Sean Mac Gillicuddy 2020-02-24 09:32:32 +00:00
commit 675c861697
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt
View File

@ -23,7 +23,7 @@ import android.app.Service
import android.content.Context
import dagger.Module
import dagger.Provides
import org.kiwix.kiwixlib.JNIKiwixLibrary
import org.kiwix.kiwixlib.Library
import org.kiwix.kiwixlib.JNIKiwixServer
import org.kiwix.kiwixmobile.di.ServiceScope
import org.kiwix.kiwixmobile.webserver.WebServerHelper
@ -38,7 +38,7 @@ class ServiceModule {
@Provides
@ServiceScope
fun providesWebServerHelper(
jniKiwixLibrary: JNIKiwixLibrary,
jniKiwixLibrary: Library,
kiwixServer: JNIKiwixServer,
ipAddressCallbacks: IpAddressCallbacks
): WebServerHelper = WebServerHelper(jniKiwixLibrary, kiwixServer, ipAddressCallbacks)
@ -50,11 +50,11 @@ class ServiceModule {
@Provides
@ServiceScope
fun providesJNIKiwixLibrary(): JNIKiwixLibrary = JNIKiwixLibrary()
fun providesLibrary(): Library = Library()
@Provides
@ServiceScope
fun providesJNIKiwixServer(jniKiwixLibrary: JNIKiwixLibrary): JNIKiwixServer =
fun providesJNIKiwixServer(jniKiwixLibrary: Library): JNIKiwixServer =
JNIKiwixServer(jniKiwixLibrary)
@Provides

6
app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.java
View File

@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import org.kiwix.kiwixlib.JNIKiwixException;
import org.kiwix.kiwixlib.JNIKiwixLibrary;
import org.kiwix.kiwixlib.Library;
import org.kiwix.kiwixlib.JNIKiwixServer;
import org.kiwix.kiwixmobile.core.utils.ServerUtils;
import org.kiwix.kiwixmobile.webserver.wifi_hotspot.IpAddressCallbacks;
@ -41,12 +41,12 @@ import static org.kiwix.kiwixmobile.core.utils.ServerUtils.INVALID_IP;
public class WebServerHelper {
private static final String TAG = "WebServerHelper";
private JNIKiwixLibrary kiwixLibrary;
private Library kiwixLibrary;
private JNIKiwixServer kiwixServer;
private IpAddressCallbacks ipAddressCallbacks;
private boolean isServerStarted;
@Inject public WebServerHelper(@NonNull JNIKiwixLibrary kiwixLibrary,
@Inject public WebServerHelper(@NonNull Library kiwixLibrary,
@NonNull JNIKiwixServer kiwixServer, @NonNull IpAddressCallbacks ipAddressCallbacks) {
this.kiwixLibrary = kiwixLibrary;
this.kiwixServer = kiwixServer;

2
buildSrc/src/main/kotlin/Versions.kt
View File

@ -91,7 +91,7 @@ object Versions {
const val core_ktx: String = "1.2.0"
const val kiwixlib: String = "8.2.1" // available: "8.2.2"
const val kiwixlib: String = "9.0.1"
const val material: String = "1.1.0-beta02" // available: "1.1.0"

2
core/build.gradle.kts
View File

@ -39,7 +39,7 @@ dependencies {
api(Libs.kiwixlib)
} else {
implementation("com.getkeepsafe.relinker:relinker:1.3.1")
implementation(fileTree(mapOf("include" to "*.aar", "dir" to "libs")))
api(fileTree(mapOf("include" to "*.aar", "dir" to "libs")))
}
// Android Support