kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-24 05:04:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Use AlertDialogShower for EnableWifiP2pServices

Browse Source
This commit is contained in:
Aditya-Sood 2019-07-31 09:44:24 +05:30
parent 58c936b4fe
commit 0a5d924b5f
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt
View File

@ -24,6 +24,10 @@ sealed class KiwixDialog(
null, R.string.request_storage, android.R.string.yes, android.R.string.cancel
)
object EnableWifiP2pServices : KiwixDialog(
null, R.string.request_enable_wifi, R.string.yes, android.R.string.no
)
data class FileTransferConfirmation(override val args: Array<out Any>) : KiwixDialog( // For the local file transfer module
null, R.string.transfer_to, R.string.yes, android.R.string.cancel
), HasBodyFormatArgs {

22
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
View File

@ -12,6 +12,7 @@ import android.net.wifi.p2p.WifiP2pDeviceList;
import android.net.wifi.p2p.WifiP2pInfo;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@ -495,14 +496,29 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
}
private void requestEnableWifiP2pServices() {
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
/*FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
Fragment prev =
getSupportFragmentManager().findFragmentByTag(RequestEnableWifiP2pServicesDialog.TAG);
if (prev == null) {
RequestEnableWifiP2pServicesDialog dialogFragment = new RequestEnableWifiP2pServicesDialog();
dialogFragment.show(fragmentTransaction, RequestEnableWifiP2pServicesDialog.TAG);
}*/
alertDialogShower.show(KiwixDialog.EnableWifiP2pServices.INSTANCE,
new Function0<Unit>() {
@Override public Unit invoke() {
startActivityForResult(new Intent(Settings.ACTION_WIFI_SETTINGS),
REQUEST_ENABLE_WIFI_P2P);
return Unit.INSTANCE;
}
},
new Function0<Unit>() {
@Override public Unit invoke() {
showToast(LocalFileTransferActivity.this, R.string.discovery_needs_wifi,
Toast.LENGTH_SHORT);
return Unit.INSTANCE;
}
});
}
@Override
@ -522,12 +538,12 @@ public class LocalFileTransferActivity extends AppCompatActivity implements
break;
}
case REQUEST_ENABLE_WIFI_P2P: {
/*case REQUEST_ENABLE_WIFI_P2P: {
if (!wifiDirectManager.isWifiP2pEnabled()) {
showToast(this, R.string.discovery_needs_wifi, Toast.LENGTH_LONG);
}
break;
}
}*/
}
}