diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..6b2986c --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_24_2_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_24_2_0_jar.xml index 519ef20..344e561 100644 --- a/.idea/libraries/Gradle__com_android_support_support_annotations_24_2_0_jar.xml +++ b/.idea/libraries/Gradle__com_android_support_support_annotations_24_2_0_jar.xml @@ -1,13 +1,11 @@ - + - - - + - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_compat_24_2_0.xml deleted file mode 100644 index e21eb44..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_compat_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_24_2_0.xml deleted file mode 100644 index 9f232f7..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_core_ui_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_24_2_0.xml deleted file mode 100644 index 9776304..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_core_utils_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_24_2_0.xml deleted file mode 100644 index 2937fa1..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_fragment_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_24_2_0.xml deleted file mode 100644 index 81eef81..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_media_compat_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_24_2_0.xml b/.idea/libraries/Gradle__com_android_support_support_v4_24_2_0.xml deleted file mode 100644 index 3732e71..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_v4_24_2_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_http_legacy_android_23.xml b/.idea/libraries/Gradle__org_apache_http_legacy_android_23.xml index ef3cdef..b31da2c 100644 --- a/.idea/libraries/Gradle__org_apache_http_legacy_android_23.xml +++ b/.idea/libraries/Gradle__org_apache_http_legacy_android_23.xml @@ -1,7 +1,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..0d45e8d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/CAT-Android.iml b/CAT-Android.iml index ab98d2e..d804407 100644 --- a/CAT-Android.iml +++ b/CAT-Android.iml @@ -1,72 +1,76 @@ - + - - - + + + - + - - - - + + + - - - + + + - + + + + + + + - - - @@ -74,51 +78,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 416a096..d37e09d 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.2.1' } } -apply plugin: 'android' +apply plugin: 'com.android.application' dependencies { implementation fileTree(dir: 'libs', include: '*.jar') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b48915c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Oct 04 11:57:06 BST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/res/layout/fragment_connect.xml b/res/layout/fragment_connect.xml index d9d6073..5e5843f 100644 --- a/res/layout/fragment_connect.xml +++ b/res/layout/fragment_connect.xml @@ -292,7 +292,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:text="@string/username_label" /> + android:text="@string/username_label" + android:labelFor="@id/username"/> + android:nextFocusForward="@+id/password"> @@ -322,7 +323,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:text="@string/password_label" /> + android:text="@string/password_label" + android:labelFor="@id/password"/> + android:nextFocusForward="@+id/connect"/> diff --git a/res/layout/fragment_status.xml b/res/layout/fragment_status.xml index 3c8bdbf..a1d425e 100644 --- a/res/layout/fragment_status.xml +++ b/res/layout/fragment_status.xml @@ -11,13 +11,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > - + @@ -26,7 +27,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|start" - android:maxWidth="100dp" + android:minWidth="100dp" + android:maxWidth="115dp" android:textOff="@string/debug_toggle_off" android:textOn="@string/debug_toggle_on" /> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 5dd403d..eb6e660 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Опции за напреднали Относно приложението Поддръжка @@ -135,10 +135,10 @@ Покажи всички Ръчно търсене Търсене - Търсене на конфигурация ... + Търсене на конфигурация … Търсенето на конфигурация в мрежата е неуспешно. - Търсене на конфигурация с локализация ... - Опитва да намери местоположението, използвайки мрежа ... + Търсене на конфигурация с локализация … + Опитва да намери местоположението, използвайки мрежа … Недостатъчно точна локация. Няма активна услуга за локация. Моля включете Location Services и рестартирайте приложението, за да работи автоматичното откриване. Няма близки конфигурации diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index bc8884f..8bba2cf 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -1,6 +1,7 @@ - - eduroamCAT + + eduroam CAT Opcions avançades Quant a l\'app Obtenir ajuda @@ -133,10 +134,10 @@ Mostrar-los tots Cerca manual Cerca - Exploració de la configuració... + Exploració de la configuració… Ha fallat l\'exploració de la configuració per xarxa - Exploració de la configuració amb localització... - Provant la localització per xarxa... + Exploració de la configuració amb localització… + Provant la localització per xarxa… Manca precissió en la localització. Cap servei de localització actiu. Sisplau activeu els serveis de localització i reinicieu la app per a que l\'exploració automàtica funcioni. No hi ha configuracions properes diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 3a7c118..c7d1245 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Pokročilé možnosti O aplikaci Kontaktujte podporu @@ -34,7 +34,7 @@ Duplicitní profil Výpis stavu pro pokročilé:\n WiFi log: - Chyba... + Chyba… Informace o verzi Instalací profilu budou nahrazena veškerá existující nastavení eduroamu Tato aplikace byla vytvořena jako součást projektu GN3+ OpenCall, SENSE. Připomínky a problémy s aplikací jako takovou (nikoliv však problémy s připojením k síti) nám popište na playstore@eduroam.org . @@ -136,10 +136,10 @@ Zobrazit všechny Ruční vyhledávání Vyhledávání - Vyhledávání konfigurace... + Vyhledávání konfigurace… Vyhledávání konfigurace na základě selhání sítě - Vyhledávání konfigurace s lokalizací... - Pokus o vyhledání lokalizace pomocí sítě... + Vyhledávání konfigurace s lokalizací… + Pokus o vyhledání lokalizace pomocí sítě… Nedostatečná přesnost umístění. Služba pro vyhledávání polohy není aktivní. Prosím spusťte službu určování polohy a restartujte aplikaci. Žádné konfigurace poblíž diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 2e11d58..b2ef408 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Fortgeschrittene Optionen Über die App Unterstützung bekommen @@ -135,10 +135,10 @@ Alle anzeigen Manuelle Suche Suche - Konfigurationssuche... + Konfigurationssuche… Konfigurationssuche basierend auf Networkinformationen fehlgeschlagen Positionsbasierte Konfigurationssuche - Positionsbestimmung mit Netzwerkinformationen... + Positionsbestimmung mit Netzwerkinformationen… Position zu ungenau. Keine Standortdienste verfügbar. Bitte schalten Sie Standortdienst ein und starten Sie die App neu, damit die Erkennung anhand der Position funktioniert. Keine Konfigurationen in der Nähe diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 5845a8a..34e863c 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Επιλογές για Προχωρημένους Σχετικά με την εφαρμογή Λήψη Υποστήριξης @@ -136,10 +136,10 @@ Εμφάνιση όλων Χειροκίνητη αναζήτηση Αναζήτηση - Αναζήτηση Ρυθμίσεων... + Αναζήτηση Ρυθμίσεων… Αναζήτηση Ρυθμίσεων βάσει δικτύου απέτυχε - Αναζήτηση Ρυθμίσεων με εντοπισμό... - Προσπάθεια εντοπισμού μέσω δικτύου... + Αναζήτηση Ρυθμίσεων με εντοπισμό… + Προσπάθεια εντοπισμού μέσω δικτύου… Ανεπαρκής ακρίβεια τοποθεσίας. Δεν είναι ενεργή καμία υπηρεσία τοποθεσίας. Παρακαλώ ενεργοποιήστε τις Υπηρεσίες Τοποθεσίας και επανεκκινήστε την εφαρμογή ώστε να λειτουργήσει ο αυτόματος εντοπισμός. Δεν υπάρχουν φορείς με ρυθμίσεις σε κοντινή απόσταση diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c379733..58d2ed1 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Opciones avanzadas Sobre esta aplicación Recibir soporte @@ -136,10 +136,10 @@ Listar todo Búsqueda manual Búsqueda - Descubrimiento de configuración... + Descubrimiento de configuración… Error en el descubrimiento de configuración basado en la red - Descubrimiento de configuración basado en la localización... - Intentando consultar la localización usando la red... + Descubrimiento de configuración basado en la localización… + Intentando consultar la localización usando la red… Precisión de la localización insuficiente. No hay ningún servicio de localización activo. Por favor active los Servicios de Localización y reinicie la aplicación para que el descubrimiento automático funcione. Ninguna configuración cercana diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 814a66f..4f15768 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Lisäasetukset Tietoja Tuki @@ -135,10 +135,10 @@ Näytä kaikki Manuaalinen haku Haku - Määritysten etsintä... + Määritysten etsintä… Määritysten etsintä verkosta epäonnistui - Määritysten etsintä lokalisoinnin perusteella... - Etsitään määrityksiä verkosta... + Määritysten etsintä lokalisoinnin perusteella… + Etsitään määrityksiä verkosta… Paikannus on liian epätarkka. Paikannuspalvelu ei ole päällä. Ole hyvä ja salli paikannus ja käynnistä haku sen jälkeen uudelleen. Määrityksiä ei löytynyt läheltä diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index f877902..5c378a3 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Options avancées À propos de cette application Obtenez de l\'aide diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index e9ce19d..750c158 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Napredne opcije O aplikaciji Podrška @@ -137,7 +137,7 @@ Pretraži Pretraga postavki Pronalaženje lokacije temeljem mrežne povezanosti nije uspijelo - Pronalaženje konfiguracije lokacijskim sustavom... + Pronalaženje konfiguracije lokacijskim sustavom… Pokušaj pronalaska lokalnih postavki temeljem mrežne povezanosti Nedovoljna točnost lokacije No location service active. Please turn on Location Services and restart the app for auto discovery to work. diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index a4a192b..993a75c 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Opzioni Avanzate Informazioni sull\'App Ottieni Assistenza @@ -136,10 +136,10 @@ Elenca tutto Ricerca manuale Cerca - Ricerca Configurazioni... + Ricerca Configurazioni… Ricerca Configurazione basata sulla rete: fallita. - Ricerca Configurazioni tramite localizzazione... - Tentativo di localizzazione usando la rete... + Ricerca Configurazioni tramite localizzazione… + Tentativo di localizzazione usando la rete… Accuratezza della geo-localizzazione insufficiente. Servizio di geo-localizzazione non attivo. Si prega di attivare i Servizi di Geo-localizzazione e riavviare l\'applicazione perché il rilevamento automatico funzioni. Nessuna configurazione nelle vicinanze diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 55d4a04..2413cd7 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Avanserte valg Om app\'en Få hjelp @@ -135,10 +135,10 @@ List alle Manuelt søk Søk - Konfigurasjonssøk... + Konfigurasjonssøk… Nettverksbasert konfigurasjonssøk feilet - Lokalisert konfigurasjonssøk... - Prøver lokalisert oppslag via nettverket... + Lokalisert konfigurasjonssøk… + Prøver lokalisert oppslag via nettverket… Ikke nøyaktig nok lokasjon. Ingen lokasjonstjeneste er aktiv. Slå på lokasjonstjeneste og restart app\'en slik at posisjon kan finnes. Ingen tilbydere med konfigurasjon i nærheten diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index a4b26a0..4e059ab 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Zawwanswane O programie Kontakt ze wsparciem @@ -135,10 +135,10 @@ Pokaż wszystko Wyszukanie ręczne Szukaj - Wyszukiwanie konfiguracji ... + Wyszukiwanie konfiguracji … Wyszukiwanie konfiguracji na podstawie sieci nie powiodło się - Wyszukiwanie konfiguracji na podstawie lokalizacji ... - Próbuję wyszukania poprzez lokalizację na podstawie sieci ... + Wyszukiwanie konfiguracji na podstawie lokalizacji … + Próbuję wyszukania poprzez lokalizację na podstawie sieci … Niewystarczająca dokładność lokalizacji. Nieaktywna usługa lokalizacji. Aby skorzystać z automatycznego wyszukania włącz Usługi Lokalizacji i zrestartuj aplikację. Brak pobliskich konfiguracji diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 8d1850f..d4d12f2 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -1,6 +1,6 @@ - eduroamCAT + eduroam CAT Opções Avançadas Sobre a App Obter suporte @@ -133,10 +133,10 @@ Ver Todos Pesquisa Manual Pesquisa - Descoberta de Configuração... + Descoberta de Configuração… Descoberta de Configuração baseada na rede falhou - Descoberta de Configuração com localização... - A tentar obter localização usando a rede... + Descoberta de Configuração com localização… + A tentar obter localização usando a rede… Precisão da localização insuficiente Sem serviços de localização activos. Por favor active os Serviços de Localização e reinicie a aplicação para a descoberta automática funcionar. Sem Configurações Próximas diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 7fc99a7..356df22 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Rozšírené nastavenia O aplikácii Kontaktovať podporu @@ -135,10 +135,10 @@ Zobraziť všetko Manuálne vyhľadávanie Vyhľadávanie - Vyhľadávanie konfigurácie... + Vyhľadávanie konfigurácie… Vyhľadávanie konfigurácie na základe informácií o sieti zlyhalo - Vyhľadávanie konfigurácie na základe polohy... - Určovanie polohy podľa siete... + Vyhľadávanie konfigurácie na základe polohy… + Určovanie polohy podľa siete… Nedostatočná presnosť určovania polohy. Služba určovania polohy nie je aktívna. Prosím, zapnite službu určovania polohy a reštartujte aplikáciu. Žiadne konfigurácie nablízku diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index bbd0d33..d31e807 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Napredne opcije O aplikaciji Podrška @@ -136,10 +136,10 @@ Prikaži sve Ručna pretraga Traži - Pronalaženje konfiguracije... + Pronalaženje konfiguracije… Pronalaženje konfiguracije uz pomoć mreže je neuspešno - Pronalaženje konfiguracije sa lokaliazacijom... - Pokušaj pronalaženja lokalizacije uz pomoć mreže... + Pronalaženje konfiguracije sa lokaliazacijom… + Pokušaj pronalaženja lokalizacije uz pomoć mreže… Nedovoljno precizna informacija o lokaciji. Deljenje lokacije nije aktivirano. Molimo vas da uključite ovu opciju i restartujete aplikaciju kako bi radilo automatsko pronalaženje vaše lokacije. Ne postoje konfiguracije u blizini diff --git a/res/values/strings.xml b/res/values/strings.xml index 8c5cdd8..31f834b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" > - eduroamCAT + eduroam CAT Advanced Options About App Get Support @@ -38,7 +38,7 @@ Version Information Installing a profile will replace any existing eduroam settings This app was made as part of the GN3+ OpenCall Project, SENSE. Any app specific (not eduroam connectivity) problems/bugs or comments can be submitted to playstore@eduroam.org - No WiFi Pofile Found + No WiFi Profile Found Please load a profile file. Support Information Email Address: @@ -56,15 +56,15 @@ Configuration File Summary Provider Name: Description: - Wifi enabled but no wifi networks connected + WiFi enabled but no WiFi networks connected Please download an appropriate profile. Profile Error Error with Profile: No EAP/WiFi Profiles Found - Wifi enabled and manually connected to %1$s + WiFi enabled and manually connected to %1$s Please download an appropriate profile. - These can either be found at your home institutions instruction pages or at the eduroamCAT website: %1$s + These can either be found at your home institutions instruction pages or at the eduroam CAT website: %1$s Manual Configuration Checks Remove Profile @@ -88,13 +88,13 @@ Are you sure you want to install the profile? Are you sure you want to install profile?\nBy doing so, you agree to the following Terms of Use:\n Install Profile - Wifi Adapter and Supplicant OK. - Wifi Adapter or Supplicant problem. - Wifi currently Disabled! + WiFi Adapter and Supplicant OK. + WiFi Adapter or Supplicant problem. + WiFi currently Disabled! Advanced Mode On Advanced Mode Off - The eduroamCAT app requires the use of a .eap-config profile from your home institution. Once you download this profile, you can load it from the Downloads app and it will install. - The eduroamCAT app has installed a profile from %1$s + The eduroam CAT app requires the use of a .eap-config profile from your home institution. Once you download this profile, you can load it from the Downloads app and it will install. + The eduroam CAT app has installed a profile from %1$s to configure eduroam. If you need help: Email: @@ -136,10 +136,10 @@ List All Manual Search Search - Configuration Discovery... + Configuration Discovery… Configuration Discovery based on network failed - Configuration Discovery with localisation... - Trying localisation lookup using network... + Configuration Discovery with localisation… + Trying localisation lookup using network… Insufficient location accuracy. No location service active. Please turn on Location Services and restart the app for auto discovery to work. No Configs Nearby diff --git a/src/uk/ac/swansea/eduroamcat/ConfigureFragment.java b/src/uk/ac/swansea/eduroamcat/ConfigureFragment.java index cdfcb48..b0eab7c 100644 --- a/src/uk/ac/swansea/eduroamcat/ConfigureFragment.java +++ b/src/uk/ac/swansea/eduroamcat/ConfigureFragment.java @@ -81,10 +81,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa String web = ""; if (aProfile.getHelpdeskURL()!=null) web = aProfile.getHelpdeskURL().toString(); supportHTML="

"+getString(R.string.supportHTML_text1)+"

"+ - ""+getString(R.string.supportHTML_text_email)+"" + aProfile.getSupportEmails() + "
" + - ""+getString(R.string.supportHTML_text_phone)+"" + aProfile.getHelpdeskPhoneNumber("") + "
" + - ""+getString(R.string.supportHTML_text_tou)+"" + aProfile.getTermsOfUse() + "
" + - ""+getString(R.string.supportHTML_text_web)+"" + web+ "
"; + ""+getString(R.string.supportHTML_text_email)+" " + aProfile.getSupportEmails() + "
" + + ""+getString(R.string.supportHTML_text_phone)+" " + aProfile.getHelpdeskPhoneNumber("") + "
" + + ""+getString(R.string.supportHTML_text_tou)+" " + aProfile.getTermsOfUse() + "
" + + ""+getString(R.string.supportHTML_text_web)+" " + web+ "
"; } String authMethods=""; @@ -171,8 +171,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa } summary_template = "

"+getString(R.string.summary_text_title)+"


" + - "

"+getString(R.string.summary_text_provider)+"" + aProfile.getDisplayName() + "
" + - ""+getString(R.string.summary_text_description)+"" + aProfile.getDescription() + "
" + + "

"+getString(R.string.summary_text_provider)+" " + aProfile.getDisplayName() + "
" + + ""+getString(R.string.summary_text_description)+" " + aProfile.getDescription() + "
" + //"IdentityProvider:" + aProfile.getEAPIdP_ID() + "
" + wifiText + authMethods + @@ -180,7 +180,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa } else { summary_template = "

" + getString(R.string.profileMissing_title) + "


" + - "

" + getString(R.string.profileMissing_text1) + "" + aProfile.getError() + "
" + "

"; + "

" + getString(R.string.profileMissing_text1) + " " + aProfile.getError() + "
" + "

"; } } else diff --git a/src/uk/ac/swansea/eduroamcat/ConnectFragment.java b/src/uk/ac/swansea/eduroamcat/ConnectFragment.java index 432c192..eb3422b 100644 --- a/src/uk/ac/swansea/eduroamcat/ConnectFragment.java +++ b/src/uk/ac/swansea/eduroamcat/ConnectFragment.java @@ -60,7 +60,7 @@ public class ConnectFragment extends Fragment implements OnClickListener public static void setStatus(String status) { if (progressText!=null && status!=null) { - progressText.setText("Status:" + status); + progressText.setText("Status: " + status); showCurrentState(); // if (status.contains("CONNECTED")) // { @@ -427,7 +427,7 @@ public void onNothingSelected(AdapterView parent) { } else setSSIDSpinnerVisible(false); isNetworkOnline(); - //progressText.setText("Status:\n"); + //progressText.setText("Status: \n"); //return inflater.inflate(R.layout.fragment_connect, container, false); return v; } @@ -441,19 +441,19 @@ public boolean isNetworkOnline() { if (netInfo != null && netInfo.getState()==NetworkInfo.State.CONNECTED) { status= true; String sSID=eduroamCAT.wifiCon.getCurrentSSID(); - setStatus(getString(R.string.wifi_toggle_on)+":"+eduroamCAT.state+":"+sSID); + setStatus(getString(R.string.wifi_toggle_on)+" : "+eduroamCAT.state+" : "+sSID); }else { netInfo = cm.getNetworkInfo(1); if(netInfo!=null && netInfo.getState()==NetworkInfo.State.CONNECTED) status= true; String sSID=eduroamCAT.wifiCon.getCurrentSSID(); - setStatus(getString(R.string.wifi_toggle_on)+":"+eduroamCAT.state+":"+sSID); + setStatus(getString(R.string.wifi_toggle_on)+" : "+eduroamCAT.state+" : "+sSID); } }catch(Exception e){ e.printStackTrace(); return false; } - if (!status) setStatus(getString(R.string.wifi_toggle_off)+":"+eduroamCAT.state); + if (!status) setStatus(getString(R.string.wifi_toggle_off)+" : "+eduroamCAT.state); return status; } diff --git a/src/uk/ac/swansea/eduroamcat/ProfileAdapter.java b/src/uk/ac/swansea/eduroamcat/ProfileAdapter.java index f2b1243..b4ff995 100644 --- a/src/uk/ac/swansea/eduroamcat/ProfileAdapter.java +++ b/src/uk/ac/swansea/eduroamcat/ProfileAdapter.java @@ -48,7 +48,7 @@ public View getView(int position, View convertView, ViewGroup parent) { // Populate the data into the template view using the data object firstLine.setText(aIdP.getName()); if (aIdP.getDistance() < 1000) - secondLine.setText(getContext().getString(R.string.distance) + "=" + aIdP.getDistance() + "Km"); + secondLine.setText(getContext().getString(R.string.distance) + ": " + aIdP.getDistance() + " Km"); else secondLine.setText(""); if (aIdP.profileID.size() > 1) { diff --git a/src/uk/ac/swansea/eduroamcat/StatusFragment.java b/src/uk/ac/swansea/eduroamcat/StatusFragment.java index 78eede3..048a213 100644 --- a/src/uk/ac/swansea/eduroamcat/StatusFragment.java +++ b/src/uk/ac/swansea/eduroamcat/StatusFragment.java @@ -66,7 +66,7 @@ public String latestSummary() String reason=eduroamCAT.wifiCon.getFailReason(); String failReason=""; if (reason!=null) failReason=getActivity().getString(R.string.status_failure)+reason+"
"; - String linkSpeed=eduroamCAT.wifiCon.getLinkSpeed()+"Mbs"; + String linkSpeed=eduroamCAT.wifiCon.getLinkSpeed()+" Mbps"; String ip=eduroamCAT.wifiCon.getIPAddress(); String mac=eduroamCAT.wifiCon.getDeviceWiFiMac(); String supState=eduroamCAT.wifiCon.getSupplicantState(); @@ -74,13 +74,14 @@ public String latestSummary() String supDetailed = eduroamCAT.wifiCon.getDetailedSupplicantState(); if (supDetailed==null || supDetailed.length()<1) supDetailed="Unknown"; summaryText="

"+getActivity().getString(R.string.status_title)+"

"; - summaryText+="SSID:"+currentSSID+" BSSID :"+bSSID+"
Signal Strength:"+rss+"dBm Link Speed:"+linkSpeed+"
"; - summaryText+=getActivity().getString(R.string.status_connection)+""+eduroamCAT.wifiCon.getWifiState()+" ("+eduroamCAT.wifiCon.getWifiStateDetailed()+")
"; - summaryText+=getActivity().getString(R.string.status_supplicant)+""+supState+"("+supDetailed+")
"; - summaryText+=getActivity().getString(R.string.status_wifi)+""+eduroamCAT.wifiCon.checkWifiEnabled()+""+getActivity().getString(R.string.status_supplicant_ok)+""+ eduroamCAT.wifiCon.isSupplicantOK()+"
"; + summaryText+="SSID: "+currentSSID+" - BSSID: "+bSSID+"
"; + summaryText+="Signal Strength: "+rss+"dBm - Link Speed: "+linkSpeed+"
"; + summaryText+=getActivity().getString(R.string.status_connection)+" "+eduroamCAT.wifiCon.getWifiState()+" ("+eduroamCAT.wifiCon.getWifiStateDetailed()+")
"; + summaryText+=getActivity().getString(R.string.status_supplicant)+" "+supState+" ("+supDetailed+")
"; + summaryText+=getActivity().getString(R.string.status_wifi)+" "+eduroamCAT.wifiCon.checkWifiEnabled()+" - "+getActivity().getString(R.string.status_supplicant_ok)+" "+ eduroamCAT.wifiCon.isSupplicantOK()+"
"; summaryText+=failReason; - if (eduroamCAT.currentapiVersion<23) summaryText+=getActivity().getString(R.string.status_ip)+""+ip+""+getActivity().getString(R.string.status_mac)+""+mac+"
"; - else summaryText+=getActivity().getString(R.string.status_ip)+""+ip+"
"; + if (eduroamCAT.currentapiVersion<23) summaryText+=getActivity().getString(R.string.status_ip)+" "+ip+""+getActivity().getString(R.string.status_mac)+" "+mac+"
"; + else summaryText+=getActivity().getString(R.string.status_ip)+" "+ip+"
"; summaryText+="
"; Spanned statusSummary = Html.fromHtml(summaryText); if (statusInfo!=null) statusInfo.setText(statusSummary); diff --git a/src/uk/ac/swansea/eduroamcat/WifiController.java b/src/uk/ac/swansea/eduroamcat/WifiController.java index 7beac15..424d6ad 100644 --- a/src/uk/ac/swansea/eduroamcat/WifiController.java +++ b/src/uk/ac/swansea/eduroamcat/WifiController.java @@ -553,7 +553,7 @@ public String checkEduroamCA() //start=currentConfig.enterpriseConfig.toString().indexOf("ca_cert"); //finish=currentConfig.enterpriseConfig.toString().indexOf("\"", start+10); //if (start>0 && finish>0) - message+="CA Certificate OK"; + message+="CA Certificate is valid"; } else {