From 928b438aa2691654b3dc61b71699aaae1fe803fe Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 31 Jan 2019 18:19:07 +0100 Subject: [PATCH 1/5] Ripristinate vecchie librerie android --- .idea/caches/build_file_checksums.ser | Bin 729 -> 729 bytes app/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 2dc95449fef9d4ca9ba00d0a0d8ee515a87adc15..d6d60bc5977bb95c28fc62328ee1a100de61329f 100644 GIT binary patch delta 35 tcmV+;0NnrC1=$6VnFH&V7m=K`5E3Hj@Ao}FR(kEO3otrCQL|wIcmX0i4)Fj0 delta 35 tcmV+;0NnrC1=$6VnFGNssgazu5SrQv=EiK6LUn_@tj^vjKeJ&0cmX)85a0j+ diff --git a/app/build.gradle b/app/build.gradle index fe0901fe..a72e99dd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -95,10 +95,10 @@ dependencies { implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8' implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.1.0-alpha03' + implementation 'com.google.android.material:material:1.1.0-alpha02' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha02' + implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01' implementation 'androidx.preference:preference:1.1.0-alpha02' implementation 'com.squareup.okhttp3:okhttp:3.12.1' implementation 'com.squareup.retrofit2:retrofit:2.3.0' From 84b5b878093a6a464bcd0b4acd93ddbc90b24181 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 1 Feb 2019 09:25:29 +0100 Subject: [PATCH 2/5] Customizzato builder del service per le chiamate REST. --- .../integrywmsnative/core/REST/RESTBuilder.java | 13 +++++++++---- .../gest/login/core/LoginHelper.java | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java index 2fc0b9b3..3bf124ae 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/RESTBuilder.java @@ -20,14 +20,19 @@ public class RESTBuilder { } public static T getService(final Class service, int timeout) { // return getService(service, "192.168.2.13", 8080); - return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true, timeout); + return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true, true, timeout); } + public static T getService(final Class service, String host, int port, boolean addInterceptors) { - return getService(service, host, port, addInterceptors, 30); + return getService(service, host, port, addInterceptors, true, 30); } - public static T getService(final Class service, String host, int port, boolean addInterceptors, int timeout){ + public static T getService(final Class service, String host, int port, boolean addInterceptors, boolean addEmsApi) { + return getService(service, host, port, addInterceptors, addEmsApi, 30); + } + + public static T getService(final Class service, String host, int port, boolean addInterceptors, boolean addEmsApi, int timeout){ OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder(); clientBuilder.connectTimeout(timeout, TimeUnit.SECONDS); @@ -38,7 +43,7 @@ public class RESTBuilder { OkHttpClient client = clientBuilder.build(); - String endpoint = "http://" + host + ":" + port + "/ems-api/"; + String endpoint = "http://" + host + ":" + port + "/" + (addEmsApi ? "ems-api/" : ""); Retrofit retrofit = new Retrofit.Builder() .baseUrl(endpoint) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java index 86228f37..cbf13c39 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java @@ -38,7 +38,7 @@ public class LoginHelper { String host = CommonConst.Login.Azienda.host; int port = CommonConst.Login.Azienda.port; - LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, host, port, false); + LoginRESTConsumerService service = RESTBuilder.getService(LoginRESTConsumerService.class, host, port, false, true); service.loginAzienda(mCodAzienda).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { From 4681f48976f9823d2bba50fd323b3e6253f1a271 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 1 Feb 2019 19:03:01 +0100 Subject: [PATCH 3/5] Abilitato clearText per android 9. --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 696160d5..e32bacf7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,6 +16,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" + android:usesCleartextTraffic="true" android:theme="@style/AppTheme"> Date: Tue, 5 Feb 2019 11:10:36 +0100 Subject: [PATCH 4/5] Aggiunto text aggiuntivo nel log degli errori. --- .../core/REST/consumers/SystemRESTConsumer.java | 2 +- .../integrywmsnative/core/utility/UtilityLogger.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumer.java index 70876090..41bc5eca 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/SystemRESTConsumer.java @@ -66,7 +66,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer { public void onFailure(Call> call, Throwable t) { Log.e("ProcessSql", t.toString()); callback.onFailed(new Exception(t)); - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.errorMe(new Exception(t), nativeSql); } }); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java index f0fe6bae..04517ac1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java @@ -31,16 +31,22 @@ public class UtilityLogger { } public static void errorMe(Exception ex) { - errorMe(ex, null, null); + errorMe(ex, null, null, null); } - public static void errorMe(Exception ex, Runnable onComplete, RunnableArgs onFailed) { + public static void errorMe(Exception ex, String additionalText) { + errorMe(ex, additionalText, null, null); + } + + public static void errorMe(Exception ex, String additionalText, Runnable onComplete, RunnableArgs onFailed) { String message = UtilityResources.readRawTextFile(R.raw.error_mail); message = message.replace("#exception_name#", ex.getMessage()); StringWriter sw = new StringWriter(); ex.printStackTrace(new PrintWriter(sw)); + + if(additionalText != null) sw.append("\n").append(additionalText); message = message.replace("#stacktrace#", sw.toString()); String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : SettingsManager.i().userSession.profileDB; From 9846daa45d6c9106dd3c50894d3e321e0b28e362 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 5 Feb 2019 11:11:49 +0100 Subject: [PATCH 5/5] -> v1.0.31 (34) --- .idea/caches/build_file_checksums.ser | Bin 729 -> 729 bytes app/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d6d60bc5977bb95c28fc62328ee1a100de61329f..f10bffcdd548abebf97c49d0e1da39dc467bac28 100644 GIT binary patch delta 36 ucmV+<0NelB1=$6Vm;}8fKZ%i?wGfZY5Djx@*!fBGfM=)dshhK50eAs8MG-Fm delta 36 ucmV+<0NelB1=$6Vm;|KjmKTwnwGa{_=