added a popup on startup when no configuration file exists and no wifi is available.
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 179246d..c5a6571 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -61,5 +61,6 @@
<string name="fairphone_os_info">Este sistema operativo consiste numa adaptação do Android para o Fairphone com funcionalidades como o Peace of Mind, Edge Swipe e Your Apps Widget.\n\nRecomendamos a instalação do Android para o Fairphone no seu dispositivo para que tenha a melhor experiência.</string>
<string name="android_os_info">Este sistema operativo é a mais pura experência Android sem qualquer modificação para o Fairphone.</string>
<string name="about">Sobre</string>
+ <string name="wifi_discaimer_message_startup">Necessita de acesso à internet para verificar e instalar atualizações. Por favor ligue-se ao Wi-Fi.</string>
</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ff1034..717c5d7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -55,6 +55,7 @@
<string name="warning">Warning</string>
<string name="wifi_disabled">Wi-Fi disabled</string>
<string name="wifi_discaimer_message">The file you\'re trying to download is too large for mobile connections (~200MB). Please enable Wi-Fi connection and try again.</string>
+ <string name="wifi_discaimer_message_startup">You need internet access to check for updates or install software. Please enable Wi-Fi connection.</string>
<string name="your_are_about_to_install">You are about to install</string>
<string name="your_current_os_version">Your current operating system version</string>
<string name="your_os_is_up_to_date">Your operating system is up-to-date</string>
diff --git a/src/com/fairphone/updater/FairphoneUpdater.java b/src/com/fairphone/updater/FairphoneUpdater.java
index 7f9f596..d2edf80 100644
--- a/src/com/fairphone/updater/FairphoneUpdater.java
+++ b/src/com/fairphone/updater/FairphoneUpdater.java
@@ -1,8 +1,13 @@
package com.fairphone.updater;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
+import android.content.res.Resources;
+import android.net.ConnectivityManager;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
@@ -171,7 +176,33 @@
initHeaderViews();
setupFragments(savedInstanceState);
+
+ if (!Utils.isWiFiEnabled(this) &&
+ UpdaterData.getInstance().isAppStoreListEmpty() &&
+ !UpdaterData.getInstance().isAOSPVersionListNotEmpty() &&
+ !UpdaterData.getInstance().isFairphoneVersionListNotEmpty() )
+ {
+ Resources resources = getResources();
+
+ AlertDialog.Builder wifiOffDialog = new AlertDialog.Builder(this);
+
+ wifiOffDialog.setTitle(resources.getString(R.string.wifi_disabled));
+
+ // Setting Dialog Message
+ wifiOffDialog.setMessage(resources.getString(R.string.wifi_discaimer_message_startup));
+ wifiOffDialog.setPositiveButton(resources.getString(android.R.string.ok), new DialogInterface.OnClickListener()
+ {
+ public void onClick(DialogInterface dialog, int id)
+ {
+ // do nothing, since the state is still the same
+ }
+ });
+ wifiOffDialog.create();
+ wifiOffDialog.show();
+ }
}
+
+
void setupBetaStatus()
{
diff --git a/src/com/fairphone/updater/fragments/VersionDetailFragment.java b/src/com/fairphone/updater/fragments/VersionDetailFragment.java
index 6615e82..0632ed6 100644
--- a/src/com/fairphone/updater/fragments/VersionDetailFragment.java
+++ b/src/com/fairphone/updater/fragments/VersionDetailFragment.java
@@ -232,14 +232,6 @@
}
}
- private boolean isWiFiEnabled()
- {
-
- ConnectivityManager manager = (ConnectivityManager) mainActivity.getSystemService(Context.CONNECTIVITY_SERVICE);
-
- return manager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnectedOrConnecting();
- }
-
private Request createDownloadRequest(String url, String fileName, String downloadTitle)
{
@@ -272,7 +264,7 @@
{
DownloadableItem item = mIsVersion ? mSelectedVersion : mSelectedStore;
// use only on WiFi
- if (isWiFiEnabled())
+ if (Utils.isWiFiEnabled(mainActivity))
{
if (item != null)
{
diff --git a/src/com/fairphone/updater/tools/Utils.java b/src/com/fairphone/updater/tools/Utils.java
index 5c5cf79..f0edad9 100644
--- a/src/com/fairphone/updater/tools/Utils.java
+++ b/src/com/fairphone/updater/tools/Utils.java
@@ -25,6 +25,7 @@
import android.content.Intent;
import android.content.res.Resources;
import android.database.Cursor;
+import android.net.ConnectivityManager;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
@@ -722,4 +723,12 @@
return filePath;
}
+
+ public static boolean isWiFiEnabled(Context context)
+ {
+
+ ConnectivityManager manager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+ return manager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnectedOrConnecting();
+ }
}