From fc4ba04544a69ac85388a2c70642ea51f6b13d14 Mon Sep 17 00:00:00 2001 From: Adeel Zafar Date: Fri, 16 Aug 2019 19:11:52 +0500 Subject: [PATCH] Use Alert Dialog Shower --- .gitignore | 2 +- .../main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt | 2 +- .../org/kiwix/kiwixmobile/webserver/ZimHostActivity.java | 3 --- .../org/kiwix/kiwixmobile/webserver/ZimHostModule.java | 8 +++----- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 63aa8666a..ad4f606f5 100644 --- a/.gitignore +++ b/.gitignore @@ -66,4 +66,4 @@ captures/ !/.idea/encodings.xml !/.idea/copyright/ !/.idea/compiler.xml -app/libs + diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt index 7d33c708c..93ca9880c 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt @@ -50,7 +50,7 @@ sealed class KiwixDialog( R.string.hotspot_failed_message, R.string.go_to_wifi_settings_label, R.string.cancel - ); + ) data class FileTransferConfirmation(override val args: Array) : KiwixDialog( null, R.string.transfer_to, R.string.yes, android.R.string.cancel diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java index 355f63a34..217cd3634 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java @@ -38,7 +38,6 @@ import com.google.android.gms.location.LocationSettingsResponse; import com.google.android.gms.location.LocationSettingsStates; import com.google.android.gms.location.LocationSettingsStatusCodes; import com.google.android.gms.tasks.Task; -import dagger.android.AndroidInjection; import java.io.File; import java.lang.reflect.Method; import java.util.ArrayList; @@ -99,8 +98,6 @@ public class ZimHostActivity extends BaseActivity implements super.onCreate(savedInstanceState); setContentView(R.layout.activity_zim_host); - AndroidInjection.inject(this); - setUpToolbar(); if (savedInstanceState != null) { diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostModule.java b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostModule.java index a5c7b7a51..f5300ebfd 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostModule.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostModule.java @@ -1,10 +1,9 @@ package org.kiwix.kiwixmobile.webserver; +import android.app.Activity; import dagger.Module; import dagger.Provides; -import javax.inject.Singleton; import org.kiwix.kiwixmobile.di.PerActivity; -import org.kiwix.kiwixmobile.utils.AlertDialogShower; @Module public class ZimHostModule { @@ -15,9 +14,8 @@ public class ZimHostModule { return zimHostPresenter; } - @Provides - @Singleton AlertDialogShower provideAlertDialogShower(AlertDialogShower alertDialogShower) { - return alertDialogShower; + @Provides Activity providesActivity(ZimHostActivity zimActivity) { + return (Activity) zimActivity; } }