diff --git a/.gitignore b/.gitignore index 062883804f..0a91f19203 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,6 @@ .externalNativeBuild app/libs/ .idea/vcs.xml -.idea/caches/build_file_checksums.ser +.idea/caches .idea/dictionaries .idea/runConfigurations.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 7b0b31b8ba..7265e631a8 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index b6b410f84d..702fc13ec9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' + static def generateVersionName() { - def gitCount = "git rev-list HEAD --count".execute().text.trim() - def gitBranch = "git branch".execute().text.trim() -// return gitCount.toInteger() + 831 + " " + gitBranch - return gitCount.toInteger() + 831 + def gitCommitsCount = "git rev-list HEAD --count".execute().text.trim() + def gitCurrentBranch = "git rev-parse --abbrev-ref HEAD".execute().text.trim() + return gitCommitsCount.toInteger() + 831 + "\\n" + gitCurrentBranch } android { @@ -49,9 +49,9 @@ dependencies { implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support:cardview-v7:27.1.1' implementation 'com.android.support:support-v4:27.1.1' + implementation 'com.android.volley:volley:1.1.0' implementation 'com.google.zxing:core:3.3.2' -// implementation 'com.google.dagger:dagger:2.13' -// annotationProcessor 'com.google.dagger:dagger-compiler:2.13' + implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.madgag.spongycastle:core:1.56.0.0' implementation 'com.madgag.spongycastle:prov:1.56.0.0' implementation 'com.scottyab:rootbeer-lib:0.0.6' @@ -60,9 +60,4 @@ dependencies { implementation 'org.bitcoinj:bitcoinj-core:0.14.4' implementation 'me.dm7.barcodescanner:zxing:1.9.8' implementation 'info.hoang8f:android-segmented:1.0.6' - implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.android.volley:volley:1.1.0' - testImplementation 'junit:junit:4.12' -// androidTestImplementation 'com.android.support.test:runner:1.0.2' -// androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/data/network/VolleyHelper.kt b/app/src/main/java/com/tangem/data/network/VolleyHelper.kt index 003d129677..8c040a6be6 100644 --- a/app/src/main/java/com/tangem/data/network/VolleyHelper.kt +++ b/app/src/main/java/com/tangem/data/network/VolleyHelper.kt @@ -19,13 +19,13 @@ class VolleyHelper { { response -> val data = GsonBuilder().setPrettyPrinting().create().toJson(JsonParser().parse(response)) val builder = AlertDialog.Builder(context) - builder.setTitle("sxsx") + builder.setTitle(url) .setMessage(data) .setPositiveButton(R.string.ok, null) .setNeutralButton(R.string.send) { _, _ -> val intent = Intent(Intent.ACTION_SEND) intent.type = "text/html" - intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("digest2003@mail.ru")) + intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("erogov@tangem.com")) intent.putExtra(Intent.EXTRA_SUBJECT, url) intent.putExtra(Intent.EXTRA_TEXT, data) context.startActivity(Intent.createChooser(intent, "Send gson")) @@ -47,7 +47,7 @@ class VolleyHelper { } } - stringRequest.retryPolicy = DefaultRetryPolicy(60000, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT) + stringRequest.retryPolicy = DefaultRetryPolicy(30000, DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT) AppController.getInstance().addToRequestQueue(stringRequest) }