From 9a3107a39533af54ff186ca6a4edb964a8f66b58 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 1 Jun 2018 13:28:12 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .idea/caches/build_file_checksums.ser | Bin 536 -> 536 bytes app/build.gradle | 2 +- app/src/debug/res/values/strings.xml | 1 + app/src/main/AndroidManifest.xml | 2 +- .../java/com/tangem/data/LogFileProvider.java | 9 +++++++-- .../presentation/activity/LogoActivity.java | 9 ++++++++- .../presentation/activity/MainActivity.java | 4 +--- app/src/release/res/values/strings.xml | 1 + 8 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index cab85c1c8a62638fd1e8e42c433842c25b908243..185694987c959a097d9ffee0ebe49eedeb23ade4 100644 GIT binary patch delta 32 qcmV+*0N?+Z1egSnnFHIqwXvLQ0TH6_;R*k0-F4gL%}~XH7Rh)B&k-vC delta 32 qcmV+*0N?+Z1egSnnFF7}^Rb+30THGGp?6}nzc+EAYk)gwai@6d-VT2N diff --git a/app/build.gradle b/app/build.gradle index b612ab5387..bec96cb7bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { minSdkVersion 21 targetSdkVersion 27 versionCode 26 - versionName "0.85.5.831.dev" + versionName "0.85.5.831" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml index fe9a69b384..700e32affc 100644 --- a/app/src/debug/res/values/strings.xml +++ b/app/src/debug/res/values/strings.xml @@ -2,5 +2,6 @@ DEV + com.tangem.data.LogFileProvider.debug \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 05a32f4545..5c826ea5f9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ android:theme="@style/AppTheme"> diff --git a/app/src/main/java/com/tangem/data/LogFileProvider.java b/app/src/main/java/com/tangem/data/LogFileProvider.java index 34f18df969..0a306387a9 100644 --- a/app/src/main/java/com/tangem/data/LogFileProvider.java +++ b/app/src/main/java/com/tangem/data/LogFileProvider.java @@ -8,8 +8,11 @@ import android.net.Uri; import android.os.ParcelFileDescriptor; import android.util.Log; +import com.tangem.wallet.R; + import java.io.File; import java.io.FileNotFoundException; +import java.util.Objects; /** * Created by dvol on 15.02.2018. @@ -20,7 +23,8 @@ public class LogFileProvider extends ContentProvider { private static final String CLASS_NAME = "LogFileProvider"; // The authority is the symbolic name for the provider class - public static final String AUTHORITY = "com.tangem.LogFileProvider"; +// public static final String AUTHORITY = "com.tangem.LogFileProvider"; +// public static final String AUTHORITY = "com.tangem.LogFileProvider"; // UriMatcher used to match against incoming requests private UriMatcher uriMatcher; @@ -32,7 +36,8 @@ public class LogFileProvider extends ContentProvider { // Add a URI to the matcher which will match against the form // 'content://it.my.app.LogFileProvider/*' // and return 1 in the case that the incoming Uri matches this pattern - uriMatcher.addURI(AUTHORITY, "*", 1); + + uriMatcher.addURI(Objects.requireNonNull(getContext()).getString(R.string.log_file_provider_authorities), "*", 1); return true; } diff --git a/app/src/main/java/com/tangem/presentation/activity/LogoActivity.java b/app/src/main/java/com/tangem/presentation/activity/LogoActivity.java index 7cc9bca29c..e9d5b73e5a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LogoActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/LogoActivity.java @@ -1,5 +1,6 @@ package com.tangem.presentation.activity; +import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; @@ -35,13 +36,19 @@ public class LogoActivity extends AppCompatActivity { imgLogo.setOnClickListener(view -> hide()); } + @SuppressLint("SetTextI18n") @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); // trigger the initial hide() shortly after the activity has been created, to briefly hint to the user that UI controls are available. TextView AppVersion = findViewById(R.id.AppVersion); - AppVersion.setText("BETA v." + BuildConfig.VERSION_NAME); + + if (BuildConfig.DEBUG) + AppVersion.setText("BETA v." + BuildConfig.VERSION_NAME + "\n" + "dev" + "\n" + "build " + BuildConfig.VERSION_CODE); + else + AppVersion.setText("BETA v." + BuildConfig.VERSION_NAME); + if (!getIntent().getBooleanExtra("skipAutoHide", false)) { delayedHide(1000); } diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.java b/app/src/main/java/com/tangem/presentation/activity/MainActivity.java index 86f9b38d0b..ae2f71368a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.java @@ -30,7 +30,6 @@ import android.widget.TextView; import com.scottyab.rootbeer.RootBeer; import com.skyfishjy.library.RippleBackground; -import com.tangem.data.LogFileProvider; import com.tangem.domain.wallet.DeviceNFCAntennaLocation; import com.tangem.domain.wallet.LastSignStorage; import com.tangem.domain.wallet.Logger; @@ -294,8 +293,7 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI Compress compress = new Compress(fileNames, zipFile.getAbsolutePath()); compress.zip(); Log.e(logTag, String.format("Send %d bytes zip with logs", zipFile.length())); - Uri attachment = Uri.parse("content://" + LogFileProvider.AUTHORITY + "/" - + zipFile.getName()); + Uri attachment = Uri.parse("content://" + getString(R.string.log_file_provider_authorities) + "/" + zipFile.getName()); intent.putExtra(Intent.EXTRA_STREAM, attachment); zipFile.deleteOnExit(); diff --git a/app/src/release/res/values/strings.xml b/app/src/release/res/values/strings.xml index 7999593bc8..0b18bb17aa 100644 --- a/app/src/release/res/values/strings.xml +++ b/app/src/release/res/values/strings.xml @@ -2,5 +2,6 @@ Tangem Access + com.tangem.data.LogFileProvider \ No newline at end of file