--- android/People/src/com/grundfos/android/people/PeopleList.java 2009/08/05 09:44:11 231 +++ android/People/src/com/grundfos/android/people/PeopleList.java 2009/08/05 10:56:02 232 @@ -11,6 +11,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.database.Cursor; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -50,6 +52,7 @@ super.onCreate(savedInstanceState); setContentView(R.layout.main); + peopleDB = new PeopleDatabase(this); @@ -168,7 +171,7 @@ SharedPreferences settings = getSharedPreferences(PREFS, 0); StringBuffer message = new StringBuffer(); message.append("Grundfos People v0.1\n"); - message.append("By Torben Hørup Nielsen\n"); + message.append("By Torben Hørup Nielsen\n"); message.append("Database size: ").append(peopleDB.getPeopleCount()).append("\n"); message.append("Last DB update: ").append( settings.getString(PREF_LAST_DB_UPDATE, " - never -")); @@ -188,9 +191,34 @@ .show(); } - + public void loadDatabase() { + ConnectivityManager cm = (ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE); + if (cm.getActiveNetworkInfo().getType() != ConnectivityManager.TYPE_WIFI) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setMessage("You are not connected to a WiFi network. It is not recommended to load a DB via mobile network") + .setCancelable(false) + .setPositiveButton("Continue", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + startLoadDatabase(); + } + }) + .setNegativeButton("Abort", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + }) + .show(); + } else { + startLoadDatabase(); + } + } + + + public void startLoadDatabase() + { dialog = new ProgressDialog(this); ((ProgressDialog)dialog).setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); ((ProgressDialog)dialog).setMessage("Loading...");