pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Show connection settings dialog if download was failed and no connection available.

Browse source
This commit is contained in:
vng 2012-09-21 16:16:13 +03:00 • committed by Alex Zolotarev
parent ca9731d34f
commit 8e196ee62a
1 changed files with 49 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
android/src/com/mapswithme/maps/DownloadUI.java
View file

@ -5,10 +5,12 @@ import android.app.AlertDialog;
import android.app.ListActivity;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.Environment;
import android.os.StatFs;
import android.provider.Settings;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@ -21,6 +23,7 @@ import android.widget.ListView;
import android.widget.TextView;
import com.mapswithme.maps.MapStorage.Index;
import com.mapswithme.util.ConnectionState;
public class DownloadUI extends ListActivity implements MapStorage.Listener
@ -553,7 +556,8 @@ public class DownloadUI extends ListActivity implements MapStorage.Listener
return -1;
}
public void onCountryStatusChanged(Index idx)
/// @return Current country status (@see MapStorage).
public int onCountryStatusChanged(Index idx)
{
Log.d(TAG, "onCountryStatusChanged for index: " + idx.toString());
@ -564,7 +568,11 @@ public class DownloadUI extends ListActivity implements MapStorage.Listener
// use this hard reset, because of caching different ViewHolders according to item's type
notifyDataSetChanged();
return m_items[position].m_status;
}
return MapStorage.UNKNOWN;
}
public void onCountryProgress(ListView list, Index idx, long current, long total)
@ -648,9 +656,47 @@ public class DownloadUI extends ListActivity implements MapStorage.Listener
}
@Override
public void onCountryStatusChanged(Index idx)
public void onCountryStatusChanged(final Index idx)
{
getDA().onCountryStatusChanged(idx);
if (getDA().onCountryStatusChanged(idx) == MapStorage.DOWNLOAD_FAILED)
{
// Show wireless settings page if no connection found.
if (ConnectionState.getState(this) == ConnectionState.NOT_CONNECTED)
{
final DownloadUI activity = this;
final MapStorage storage = getDA().m_storage;
runOnUiThread(new Runnable()
{
@Override
public void run()
{
new AlertDialog.Builder(activity)
.setCancelable(false)
.setMessage(String.format(getString(R.string.download_country_failed), storage.countryName(idx)))
.setPositiveButton(getString(R.string.connection_settings), new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dlg, int which)
{
startActivity(new Intent(Settings.ACTION_WIRELESS_SETTINGS));
dlg.dismiss();
}
})
.setNegativeButton(getString(R.string.close), new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dlg, int which)
{
dlg.dismiss();
}
})
.create()
.show();
}
});
}
}
}
@Override