From 668a4a03eaa072f4bb3461609e908ffdcfadfe54 Mon Sep 17 00:00:00 2001 From: Lyndon Date: Thu, 7 Jun 2018 12:05:27 +0200 Subject: [PATCH] =?UTF-8?q?Updates=20von=20Abh=C3=A4ngigkeiten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bewoplaner-chat-android/app/build.gradle | 16 ++++++++-------- .../beyondsoft/ownchat/data/api/ApiModule.java | 9 +++++---- .../de/beyondsoft/ownchat/utils/Constants.java | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle index df11c84..2049087 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle @@ -26,15 +26,15 @@ repositories { apply plugin: 'realm-android' android { - compileSdkVersion 26 + compileSdkVersion 27 buildToolsVersion '27.0.3' defaultConfig { applicationId "de.beyondsoft.ownchat" minSdkVersion 19 - targetSdkVersion 26 - versionCode 12 - versionName "1.12" + targetSdkVersion 27 + versionCode 13 + versionName "1.13" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true } @@ -97,9 +97,9 @@ dependencies { // emojis // circle progress // event bus - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support:design:26.1.0' - implementation 'com.jakewharton:butterknife:8.4.0' + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:design:27.1.1' + implementation 'com.jakewharton:butterknife:8.8.1' implementation 'com.google.dagger:dagger:2.7' implementation 'io.reactivex:rxjava:1.1.6' implementation 'io.reactivex:rxandroid:1.2.1' @@ -118,7 +118,7 @@ dependencies { implementation 'com.github.lzyzsd:circleprogress:1.2.1' implementation 'org.greenrobot:eventbus:3.0.0' testImplementation 'junit:junit:4.12' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' annotationProcessor 'com.google.dagger:dagger-compiler:2.7' compileOnly 'javax.annotation:jsr250-api:1.0' implementation files('libs/sanselan-0_97-android-1.0.0.jar') diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/ApiModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/ApiModule.java index cbd59e3..0ce6c62 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/ApiModule.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/ApiModule.java @@ -38,6 +38,7 @@ import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory; import retrofit2.converter.gson.GsonConverterFactory; import rx.schedulers.Schedulers; +import static de.beyondsoft.ownchat.utils.Constants.DICTIONARY_PUB_KEY; import static de.beyondsoft.ownchat.utils.Constants.INTERMEDIATE_PUB_KEY; import static de.beyondsoft.ownchat.utils.Constants.LOG_TAG_NETWORK_INTERCEPTOR; @@ -102,7 +103,7 @@ public class ApiModule { Request request = chain.request(); HttpUrl url = request.url(); - Log.d(LOG_TAG_NETWORK_INTERCEPTOR, "Pinning certificate for URL: " + url); + //Log.d(LOG_TAG_NETWORK_INTERCEPTOR, "Pinning certificate for URL: " + url); List certificates = chain.connection().handshake().peerCertificates(); @@ -116,9 +117,9 @@ public class ApiModule { String name = x509Certificate.getIssuerX500Principal().getName(); - Log.d(LOG_TAG_NETWORK_INTERCEPTOR, "Certificate name: " + name + "; serial number: " + serialNumber); + //Log.d(LOG_TAG_NETWORK_INTERCEPTOR, "Certificate name: " + name + "; serial number: " + serialNumber); - if(serialNumber.equals(INTERMEDIATE_PUB_KEY) && name.contains("O=Let's Encrypt")) { + if((serialNumber.equals(INTERMEDIATE_PUB_KEY) || serialNumber.equals(DICTIONARY_PUB_KEY)) && name.contains("O=Let's Encrypt")) { isVerified = true; break; } @@ -126,7 +127,7 @@ public class ApiModule { } if(!isVerified) { - Log.e(LOG_TAG_NETWORK_INTERCEPTOR, "SSL certificates are invalid!"); + //Log.e(LOG_TAG_NETWORK_INTERCEPTOR, "SSL certificates are invalid!"); throw new SSLHandshakeException("Invalid SSL certificates"); } diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Constants.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Constants.java index 5412c64..27cf1a9 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Constants.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Constants.java @@ -44,4 +44,5 @@ public interface Constants { String LOG_TAG_NETWORK_INTERCEPTOR = "NETWORK_INTERCEPTOR"; BigInteger INTERMEDIATE_PUB_KEY = new BigInteger("281431956120940106936008670181301568443719"); + BigInteger DICTIONARY_PUB_KEY = new BigInteger("306629510923814782023122164817648258606804"); } \ No newline at end of file