diff --git a/AIMSICD/build.gradle b/AIMSICD/build.gradle index dbc08351f829f3449a5efd187ce72a9d05db3f1e..91afcc342198b34594c62fcda4b73fe1a6d4e8af 100644 --- a/AIMSICD/build.gradle +++ b/AIMSICD/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'checkstyle' apply plugin: 'com.android.application' -def gitSha = 'na' +def gitSha = null try { gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim() } catch (Exception e) { @@ -30,6 +30,7 @@ android { testApplicationId "com.SecUpwN.AIMSICD.test" buildConfigField 'String', 'BUILD_NUMBER', (buildNumber == null ? 'null' : "\"${buildNumber}\"") + buildConfigField 'String', 'GIT_SHA', (gitSha == null ? 'null' : "\"${gitSha}\"") } buildTypes { debug { @@ -38,18 +39,12 @@ android { } catch (MissingPropertyException e) { buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"' } - if (!gitSha.equals('na')) { - versionNameSuffix '-' + gitSha - } else { - versionNameSuffix '-debug' - } + versionNameSuffix '-debug' } release { buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"' minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - - versionNameSuffix '-release' } } compileOptions { diff --git a/AIMSICD/src/main/AndroidManifest.xml b/AIMSICD/src/main/AndroidManifest.xml index 08b5a8230105bb39d103f95a63d65fa62bad8dae..6e6c2144c614e37f204353c9ae18e3101b24ae1d 100644 --- a/AIMSICD/src/main/AndroidManifest.xml +++ b/AIMSICD/src/main/AndroidManifest.xml @@ -2,7 +2,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - package="com.SecUpwN.AIMSICD"> + package="com.SecUpwN.AIMSICD" + tools:ignore="GoogleAppIndexingWarning"> <!-- Privacy Enthusiasts: Please read our Permissions Statement linked below! @@ -85,6 +86,17 @@ android:configChanges="keyboardHidden|screenLayout|screenSize|orientation"> </activity> + <activity + android:name=".activities.AboutActivity" + android:label="@string/about_aimsicd" + android:parentActivityName=".AIMSICD"> + <intent-filter> + <action android:name="android.intent.action.VIEW"/> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.INFO"/> + </intent-filter> + </activity> + <activity android:name=".activities.DebugLogs" android:icon="@drawable/ic_action_settings" diff --git a/AIMSICD/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java b/AIMSICD/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java index 1cb0fee7e3de615fe06a9cb4863c9fa474ea706a..eaf98b1fc41cd5bea748c4df4c01dfa621357569 100644 --- a/AIMSICD/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java +++ b/AIMSICD/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java @@ -29,6 +29,7 @@ import android.widget.AdapterView; import android.widget.ListView; import android.widget.Toast; +import com.SecUpwN.AIMSICD.activities.AboutActivity; import com.SecUpwN.AIMSICD.activities.BaseActivity; import com.SecUpwN.AIMSICD.activities.DebugLogs; import com.SecUpwN.AIMSICD.activities.MapViewerOsmDroid; @@ -37,7 +38,6 @@ import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter; import com.SecUpwN.AIMSICD.constants.DrawerMenu; import com.SecUpwN.AIMSICD.drawer.DrawerMenuActivityConfiguration; import com.SecUpwN.AIMSICD.drawer.NavDrawerItem; -import com.SecUpwN.AIMSICD.fragments.AboutFragment; import com.SecUpwN.AIMSICD.fragments.AtCommandFragment; import com.SecUpwN.AIMSICD.fragments.DetailsContainerFragment; import com.SecUpwN.AIMSICD.service.AimsicdService; @@ -272,8 +272,8 @@ public class AIMSICD extends BaseActivity implements AsyncResponse { title = getString(R.string.app_name_short); break; case DrawerMenu.ID.APPLICATION.ABOUT: - getSupportFragmentManager().beginTransaction() - .replace(R.id.content_frame, new AboutFragment()).commit(); + Intent aboutIntent = new Intent(this, AboutActivity.class); + startActivity(aboutIntent); break; case DrawerMenu.ID.APPLICATION.UPLOAD_LOCAL_BTS_DATA: // Request uploading here? diff --git a/AIMSICD/src/main/java/com/SecUpwN/AIMSICD/fragments/AboutFragment.java b/AIMSICD/src/main/java/com/SecUpwN/AIMSICD/activities/AboutActivity.java similarity index 66% rename from AIMSICD/src/main/java/com/SecUpwN/AIMSICD/fragments/AboutFragment.java rename to AIMSICD/src/main/java/com/SecUpwN/AIMSICD/activities/AboutActivity.java index e2b1d4ddf4d5cb46eff6b430ed54e7119ae7aa47..a4b1d30764da07a32523ad3a43f2202eb81bde7b 100644 --- a/AIMSICD/src/main/java/com/SecUpwN/AIMSICD/fragments/AboutFragment.java +++ b/AIMSICD/src/main/java/com/SecUpwN/AIMSICD/activities/AboutActivity.java @@ -3,9 +3,9 @@ * LICENSE: http://git.io/vki47 | TERMS: http://git.io/vki4o * ----------------------------------------------------------- */ -package com.SecUpwN.AIMSICD.fragments; +package com.SecUpwN.AIMSICD.activities; -import android.app.Activity; +import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -18,14 +18,13 @@ import android.widget.TextView; import com.SecUpwN.AIMSICD.BuildConfig; import com.SecUpwN.AIMSICD.R; -import com.SecUpwN.AIMSICD.activities.CreditsRollActivity; import io.freefair.android.injection.annotation.InjectView; import io.freefair.android.injection.annotation.XmlLayout; -import io.freefair.android.injection.app.InjectionFragment; +import io.freefair.android.injection.app.InjectionAppCompatActivity; -@XmlLayout(R.layout.about_fragment) -public class AboutFragment extends InjectionFragment { +@XmlLayout(R.layout.activity_about) +public class AboutActivity extends InjectionAppCompatActivity { @InjectView(R.id.aimsicd_credits_link) private Button btncredits; @@ -33,94 +32,98 @@ public class AboutFragment extends InjectionFragment { @InjectView(R.id.aimsicd_version) private TextView versionNumber; - @InjectView(R.id.buildozer_buildnumber) - private TextView BuildozerView; + @InjectView(R.id.build_number) + private TextView buildNumberTextView; - @Override - public void onViewCreated(View v, Bundle savedInstanceState) { - super.onViewCreated(v, savedInstanceState); + @InjectView(R.id.git_sha) + private TextView gitShaTextView; - String version = BuildConfig.VERSION_NAME; - versionNumber.setText(getString(R.string.app_version) + version); - String buildNumber = BuildConfig.BUILD_NUMBER; + @InjectView(R.id.textViewIdle) + private TextView idleTextView; + @InjectView(R.id.textViewOk) + private TextView okTextView; + @InjectView(R.id.textViewMedium) + private TextView mediumTextView; + @InjectView(R.id.textViewHigh) + private TextView highTextView; + @InjectView(R.id.textViewDanger) + private TextView dangerTextView; + @InjectView(R.id.textViewSkull) + private TextView skullTextView; - if (buildNumber != null) { - BuildozerView = (TextView) v.findViewById(R.id.buildozer_buildnumber); - BuildozerView.setText(getString(R.string.buildnumber) + buildNumber); - BuildozerView.setVisibility(View.VISIBLE); - } + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + versionNumber.setText(getString(R.string.app_version, BuildConfig.VERSION_NAME)); + buildNumberTextView.setText(getString(R.string.buildnumber, BuildConfig.BUILD_NUMBER)); + gitShaTextView.setText(getString(R.string.git_sha, BuildConfig.GIT_SHA)); //GitHub WIKI Link - View tv = v.findViewById(R.id.aimsicd_wiki_link); + View tv = findViewById(R.id.aimsicd_wiki_link); setLink(tv, R.string.aimsicd_wiki_link); //GitHub Website Link - tv = v.findViewById(R.id.aimsicd_github_link); + tv = findViewById(R.id.aimsicd_github_link); setLink(tv, R.string.aimsicd_github_link); //Disclaimer Link - tv = v.findViewById(R.id.aimsicd_disclaimer_link); + tv = findViewById(R.id.aimsicd_disclaimer_link); setLink(tv, R.string.disclaimer_link); //GitHub Contribution Link - tv = v.findViewById(R.id.aimsicd_contribute_link); + tv = findViewById(R.id.aimsicd_contribute_link); setLink(tv, R.string.aimsicd_contribute_link); //WIP Release Link - tv = v.findViewById(R.id.aimsicd_release_link); + tv = findViewById(R.id.aimsicd_release_link); setLink(tv, R.string.aimsicd_release_link); //Changelog Link - tv = v.findViewById(R.id.aimsicd_changelog_link); + tv = findViewById(R.id.aimsicd_changelog_link); setLink(tv, R.string.aimsicd_changelog_link); //License Link - tv = v.findViewById(R.id.aimsicd_license_link); + tv = findViewById(R.id.aimsicd_license_link); setLink(tv, R.string.aimsicd_license_link); - View imgView_idle = v.findViewById(R.id.imgView_idle); - imgView_idle.setOnClickListener(new View.OnClickListener() { + idleTextView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { showInfoDialog(Status.IDLE); } }); - View imgView_normal = v.findViewById(R.id.imgView_normal); - imgView_normal.setOnClickListener(new View.OnClickListener() { + okTextView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { showInfoDialog(Status.NORMAL); } }); - View imgView_medium = v.findViewById(R.id.imgView_medium); - imgView_medium.setOnClickListener(new View.OnClickListener() { + mediumTextView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { showInfoDialog(Status.MEDIUM); } }); - View imgView_high = v.findViewById(R.id.imgView_high); - imgView_high.setOnClickListener(new View.OnClickListener() { + highTextView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { showInfoDialog(Status.HIGH); } }); - View imgView_danger = v.findViewById(R.id.imgView_danger); - imgView_danger.setOnClickListener(new View.OnClickListener() { + dangerTextView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { showInfoDialog(Status.DANGER); } }); - View imgView_run = v.findViewById(R.id.imgView_run); - imgView_run.setOnClickListener(new View.OnClickListener() { + skullTextView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { showInfoDialog(Status.RUN); @@ -141,23 +144,24 @@ public class AboutFragment extends InjectionFragment { btncredits.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Intent i = new Intent(getActivity(), CreditsRollActivity.class); + Intent i = new Intent(AboutActivity.this, CreditsRollActivity.class); startActivity(i); } }); } - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - } - private void showInfoDialog(Status status) { - new AlertDialog.Builder(getActivity()) + new AlertDialog.Builder(this) .setIcon(status.getIcon()) .setTitle(getString(R.string.status) + "\t" + getString(status.getName())) .setMessage(status.getDescription()) + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + } + }) .show(); } diff --git a/AIMSICD/src/main/res/layout/about_fragment.xml b/AIMSICD/src/main/res/layout/activity_about.xml similarity index 77% rename from AIMSICD/src/main/res/layout/about_fragment.xml rename to AIMSICD/src/main/res/layout/activity_about.xml index 92ef7e9a17d7615198d1da36d25017ed3bafd7da..f9d1b3038c7a1a342cfec97d869aa1fe1e275c20 100644 --- a/AIMSICD/src/main/res/layout/about_fragment.xml +++ b/AIMSICD/src/main/res/layout/activity_about.xml @@ -33,14 +33,22 @@ android:textSize="16sp"/> <TextView - android:id="@+id/buildozer_buildnumber" + android:id="@+id/build_number" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" android:text="@string/buildnumber" android:textColor="@color/red_text" - android:textSize="16sp" - android:visibility="gone"/> + android:textSize="16sp" /> + + <TextView + android:id="@+id/git_sha" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:text="@string/git_sha" + android:textColor="@color/red_text" + android:textSize="16sp" /> <TextView android:layout_width="wrap_content" @@ -73,33 +81,27 @@ android:layout_height="wrap_content" android:padding="@dimen/small_padding"> - <ImageView - android:layout_width="48dp" - android:layout_height="wrap_content" - android:src="@drawable/sense_idle" - android:id="@+id/imgView_idle" /> - <TextView + android:id="@+id/textViewIdle" android:layout_width="0dp" - android:layout_height="wrap_content" + android:layout_height="48dp" android:layout_gravity="center_vertical" android:layout_weight="1" - android:paddingLeft="@dimen/small_padding" - android:text="@string/about_desc_icon_idle"/> - - <ImageView - android:layout_width="48dp" - android:layout_height="wrap_content" - android:src="@drawable/sense_high" - android:id="@+id/imgView_high" /> + android:drawableLeft="@drawable/sense_idle" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:text="@string/about_desc_icon_idle" /> <TextView + android:id="@+id/textViewHigh" android:layout_width="0dp" - android:layout_height="wrap_content" + android:layout_height="48dp" android:layout_gravity="center_vertical" android:layout_weight="1" - android:paddingLeft="@dimen/small_padding" - android:text="@string/about_desc_icon_active_tracking_near"/> + android:drawableLeft="@drawable/sense_high" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:text="@string/about_desc_icon_active_tracking_near" /> </TableRow> <TableRow @@ -107,33 +109,27 @@ android:layout_height="wrap_content" android:padding="@dimen/small_padding"> - <ImageView - android:layout_width="48dp" - android:layout_height="wrap_content" - android:src="@drawable/sense_ok" - android:id="@+id/imgView_normal" /> - <TextView + android:id="@+id/textViewOk" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - android:paddingLeft="@dimen/small_padding" - android:text="@string/about_desc_icon_ok"/> - - <ImageView - android:layout_width="48dp" - android:layout_height="wrap_content" - android:src="@drawable/sense_danger" - android:id="@+id/imgView_danger" /> + android:drawableLeft="@drawable/sense_ok" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:text="@string/about_desc_icon_ok" /> <TextView + android:id="@+id/textViewDanger" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - android:paddingLeft="@dimen/small_padding" - android:text="@string/about_desc_icon_tracked_down"/> + android:drawableLeft="@drawable/sense_danger" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:text="@string/about_desc_icon_tracked_down" /> </TableRow> <TableRow @@ -141,33 +137,27 @@ android:layout_height="wrap_content" android:padding="@dimen/small_padding"> - <ImageView - android:layout_width="48dp" - android:layout_height="wrap_content" - android:src="@drawable/sense_medium" - android:id="@+id/imgView_medium" /> - <TextView + android:id="@+id/textViewMedium" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - android:paddingLeft="@dimen/small_padding" - android:text="@string/about_desc_icon_insecure_area"/> - - <ImageView - android:layout_width="48dp" - android:layout_height="wrap_content" - android:src="@drawable/sense_skull" - android:id="@+id/imgView_run" /> + android:drawableLeft="@drawable/sense_medium" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:text="@string/about_desc_icon_insecure_area" /> <TextView + android:id="@+id/textViewSkull" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - android:paddingLeft="@dimen/small_padding" - android:text="@string/about_desc_icon_run"/> + android:drawableLeft="@drawable/sense_skull" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:text="@string/about_desc_icon_run" /> </TableRow> </TableLayout> diff --git a/AIMSICD/src/main/res/values-cs/translatable_strings.xml b/AIMSICD/src/main/res/values-cs/translatable_strings.xml index b14a782eb0179cbbb713f9d8f2c9f0c6f4fccc45..ba27d66e0b9de3c0c9408501d6c254b60d91e1af 100644 --- a/AIMSICD/src/main/res/values-cs/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-cs/translatable_strings.xml @@ -34,7 +34,7 @@ <string name="network_type">Typ:</string> <string name="network_lac">LAC:</string> <string name="network_cellid">CID:</string> - <string name="app_version">Verze: </string> + <string name="app_version">Verze: %s</string> <string name="download_error">Chyba pÅ™i stahovánÃ:</string> <string name="status">Stav:</string> <string name="clear_database">Odstranit vÅ¡e z databáze</string> diff --git a/AIMSICD/src/main/res/values-de/translatable_strings.xml b/AIMSICD/src/main/res/values-de/translatable_strings.xml index c0642174d47cde9668efc099df38a971511ea543..fafe2aee733912e6880dc841612f96c36ec5986e 100644 --- a/AIMSICD/src/main/res/values-de/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-de/translatable_strings.xml @@ -77,7 +77,9 @@ <!-- ABOUT LAYOUT --> <string name="about_aimsicd">Über AIMSICD</string> - <string name="app_version">Version: </string> + <string name="app_version">Version: %s</string> + <string name="buildnumber">Build Nummer: %s</string> + <string name="git_sha">Git SHA-Hash: %s</string> <string name="aimsicd_about_info3">Android-basiertes Projekt zur Erkennung und Vermeidung gefälschter Mobilfunkstationen\n(IMSI-Catcher) in GSM/UMTS-Netzwerken.</string> <string name="about_github">AIMSICD auf GitHub</string> <string name="about_wiki">DOKUMENTATION</string> diff --git a/AIMSICD/src/main/res/values-es/translatable_strings.xml b/AIMSICD/src/main/res/values-es/translatable_strings.xml index d97cd5e28f5d2bb80c8a2569597d7dd2e51f6100..0fd7a1e93c6cfc5cce7ce5fd81cb1cfbbd9dd2d3 100644 --- a/AIMSICD/src/main/res/values-es/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-es/translatable_strings.xml @@ -59,7 +59,7 @@ <string name="upload_bts">Subir Datos BTS</string> <string name="about_aimsicd">Sobre AIMSICD</string> - <string name="app_version">versión: </string> + <string name="app_version">versión: %s</string> <string name="aimsicd_about_info3">Projecto basado en Android para detectar y evadir estaciones celulares falsas (IMSI-Catchers) en Redes GSM/UMTS.</string> <string name="about_github">AIMSICD en GitHub</string> <string name="about_wiki">DOCUMENTACIÓN</string> diff --git a/AIMSICD/src/main/res/values-fr/translatable_strings.xml b/AIMSICD/src/main/res/values-fr/translatable_strings.xml index 2d09b75815c93829e9b3e30dd24c26d7b610a627..5317d39af5a903de877a6436ae2fe0b17be07778 100755 --- a/AIMSICD/src/main/res/values-fr/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-fr/translatable_strings.xml @@ -76,7 +76,7 @@ <!-- ABOUT LAYOUT --> <string name="about_aimsicd">À propos de AIMSICD</string> - <string name="app_version">Version: </string> + <string name="app_version">Version: %s</string> <string name="aimsicd_about_info3">Projet Basé sur Android conçu pour détecter et éviter les fausses stations de bases (IMSI-Catchers) sur les réseaux GSM/UMTS.</string> <string name="about_github">AIMSICD sur GitHub</string> <string name="about_wiki">DOCUMENTATION</string> diff --git a/AIMSICD/src/main/res/values-ja/translatable_strings.xml b/AIMSICD/src/main/res/values-ja/translatable_strings.xml index e7fdaa4f8b6f215b59b79431956625004ccdfc79..7b3cc5441b4952cc0ee6db8a610b14d279b6310b 100644 --- a/AIMSICD/src/main/res/values-ja/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-ja/translatable_strings.xml @@ -60,7 +60,7 @@ <string name="upload_bts">BTS データをアップãƒãƒ¼ãƒ‰</string> <string name="about_aimsicd">AIMSICD ã«ã¤ã„ã¦</string> - <string name="app_version">ãƒãƒ¼ã‚¸ãƒ§ãƒ³: </string> + <string name="app_version">ãƒãƒ¼ã‚¸ãƒ§ãƒ³: %s</string> <string name="aimsicd_about_info3">GSM/UMTS ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã§ã€å½ã®åŸºåœ°å±€ (IMSI ã‚ャッãƒãƒ£ãƒ¼) を検出ã—ã¦é¿ã‘ã‚‹ãŸã‚ã® Android ベースã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã€‚</string> <string name="about_github">GitHub 上㮠AIMSICD</string> <string name="about_wiki">ドã‚ュメント</string> diff --git a/AIMSICD/src/main/res/values-nb/translatable_strings.xml b/AIMSICD/src/main/res/values-nb/translatable_strings.xml index 58237742c870dd0bc1b82dfc2df881c385029a28..7d10545303ea800c6a174ba92b31ec7dba1cbd4a 100644 --- a/AIMSICD/src/main/res/values-nb/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-nb/translatable_strings.xml @@ -59,7 +59,7 @@ <string name="upload_bts">Last opp BTS-data</string> <string name="about_aimsicd">Om AIMSICD</string> - <string name="app_version">Versjon: </string> + <string name="app_version">Versjon: %s</string> <string name="aimsicd_about_info3">Android-basert prosjekt for Ã¥ oppdage og unngÃ¥ falske basestasjoner (IMSI-fangere) i GSM/UMTS-nettverk.</string> <string name="about_github">AIMSICD pÃ¥ GitHub</string> <string name="about_wiki">Dokumentasjon (WIKI)</string> diff --git a/AIMSICD/src/main/res/values-nl/translatable_strings.xml b/AIMSICD/src/main/res/values-nl/translatable_strings.xml index 906d47901d71f1c8a547329fcbbf658f10e7f0b8..ef268e4d05dd5a561b828f7dc8931ff6d47e61c4 100644 --- a/AIMSICD/src/main/res/values-nl/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-nl/translatable_strings.xml @@ -57,7 +57,7 @@ <string name="upload_bts">Upload BTS gegevens</string> <string name="about_aimsicd">Over AIMSICD</string> - <string name="app_version">Versie: </string> + <string name="app_version">Versie: %s</string> <string name="aimsicd_about_info3">Android project om valse basisstations (IMSI-catchers) te vinden in GSM/UMTS netwerken.</string> <string name="about_github">AIMSICD op GitHub</string> <string name="about_wiki">DOCUMENTATIE</string> diff --git a/AIMSICD/src/main/res/values-pl/translatable_strings.xml b/AIMSICD/src/main/res/values-pl/translatable_strings.xml index 7f262aa29cf0e1876c3b493833613451e8505b0c..055e2761742ecc97cffe79a98a37cffae17e87e9 100644 --- a/AIMSICD/src/main/res/values-pl/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-pl/translatable_strings.xml @@ -69,7 +69,7 @@ <!-- ABOUT LAYOUT --> <string name="about_aimsicd">O AIMSICD</string> - <string name="app_version">Wersja: </string> + <string name="app_version">Wersja: %s</string> <string name="aimsicd_about_info3">Projekt na Android pozwalajÄ…cy wykrywać faÅ‚szywe stacje bazowe (IMSI-catchery) w sieci GSM/UMTS.</string> <string name="about_github">AIMSICD na Githubie</string> <string name="about_wiki">DOKUMENTACJA</string> diff --git a/AIMSICD/src/main/res/values-ru/translatable_strings.xml b/AIMSICD/src/main/res/values-ru/translatable_strings.xml index abe4f5d08a0e9f222dbda04579938b681fc42283..e6fca18489f132072c9f151bf992e0dff56e3c52 100644 --- a/AIMSICD/src/main/res/values-ru/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-ru/translatable_strings.xml @@ -86,7 +86,7 @@ <!-- ABOUT LAYOUT --> <string name="about_aimsicd">Об AIMSICD</string> - <string name="app_version">ВерÑиÑ: </string> + <string name="app_version">ВерÑиÑ: %s</string> <string name="aimsicd_about_info3">Проект Ð´Ð»Ñ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð¸ Ð¸Ð·Ð±ÐµÐ³Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÐ»ÑŒÐ½Ñ‹Ñ… базовых Ñтанций (IMSI-перехватчики) в GSM / UMTS Ñети на оÑнове Android.</string> <string name="about_github">AIMSICD на GitHub</string> <string name="about_wiki">ДОКУМЕÐТÐЦИЯ</string> diff --git a/AIMSICD/src/main/res/values-sq/translatable_strings.xml b/AIMSICD/src/main/res/values-sq/translatable_strings.xml index 4fa0d9e66977095f09bddf7eec68bd3282711a0b..e802686e0286643d79093ec14a6d6ac0db1e8228 100644 --- a/AIMSICD/src/main/res/values-sq/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-sq/translatable_strings.xml @@ -59,7 +59,7 @@ <string name="upload_bts">Ngarko të dhënat e BTS</string> <string name="about_aimsicd">Rreth AIMSICD</string> - <string name="app_version">Versioni: </string> + <string name="app_version">Versioni: %s</string> <string name="aimsicd_about_info3">Projekt i bazuar në sistemin android për të identifukuar dhe mënjanuar kulla të gabuara/ të rrema (IMSI-Catchers) në rrjetet GSM/UMTS.</string> <string name="about_github">AIMSICD në GitHub</string> <string name="about_wiki">DOKUMENTACIONI</string> diff --git a/AIMSICD/src/main/res/values-uk/translatable_strings.xml b/AIMSICD/src/main/res/values-uk/translatable_strings.xml index 4754a9ebf84cd92342b4e19fd16d617a7207cac1..fa4b82960cc10ada9d73b794663a9db8bf4739e8 100644 --- a/AIMSICD/src/main/res/values-uk/translatable_strings.xml +++ b/AIMSICD/src/main/res/values-uk/translatable_strings.xml @@ -46,7 +46,7 @@ <string name="upload_bts">Вивантажити дані базових Ñтанцій</string> <string name="about_aimsicd">Про AIMSICD</string> - <string name="app_version">ВерÑÑ–Ñ: </string> + <string name="app_version">ВерÑÑ–Ñ: %s</string> <string name="about_github">AIMSICD на GitHub</string> <string name="about_wiki">ДОКУМЕÐТÐЦІЯ</string> <string name="about_desc_icon_idle">ОчікуваннÑ/ЗавантаженнÑ.</string> diff --git a/AIMSICD/src/main/res/values/translatable_strings.xml b/AIMSICD/src/main/res/values/translatable_strings.xml index ef664d020753d1689fbf3c3776fa3b9b7de31bec..5f3d2e2c6ce7e400302b1813143c067deb20bfe4 100644 --- a/AIMSICD/src/main/res/values/translatable_strings.xml +++ b/AIMSICD/src/main/res/values/translatable_strings.xml @@ -75,7 +75,9 @@ <!-- ABOUT LAYOUT --> <string name="about_aimsicd">About AIMSICD</string> - <string name="app_version">Version: </string> + <string name="app_version">Version: %s</string> + <string name="buildnumber">Build Number: %s</string> + <string name="git_sha">Git SHA-Hash: %s</string> <string name="aimsicd_about_info3">Android-based project to detect and avoid fake base stations (IMSI-Catchers) in GSM/UMTS Networks.</string> <string name="about_github">AIMSICD on GitHub</string> <string name="about_wiki">DOCUMENTATION</string> diff --git a/AIMSICD/src/main/res/values/untranslatable_strings.xml b/AIMSICD/src/main/res/values/untranslatable_strings.xml index d67c73e6770d835ad8f6911ae29b0a5cd461fe60..10a5f8e9b7add18f8e42a887488aed6d5b593bd4 100644 --- a/AIMSICD/src/main/res/values/untranslatable_strings.xml +++ b/AIMSICD/src/main/res/values/untranslatable_strings.xml @@ -8,7 +8,6 @@ <string name="aimsicd_about_info" translatable="false">Android IMSI-Catcher Detector (AIMSICD)</string> - <string name="buildnumber" translatable="false">Build Number: </string> <string name="aimsicd_wiki_link" translatable="false">https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki</string> <string name="aimsicd_contribute_link" translatable="false">https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/HEAD/CONTRIBUTING.md</string> <string name="disclaimer_link" translatable="false">https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/HEAD/DISCLAIMER</string>