Browse Source

Up OkHttp, Google services

pull/61/merge
Ezerous 6 years ago
parent
commit
4e5e61692a
No known key found for this signature in database GPG Key ID: 262B2954BBA319E3
  1. 2
      app/build.gradle
  2. 2
      app/src/main/assets/apache_libraries.html
  3. 1
      app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
  4. 4
      app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java
  5. 1
      app/src/main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java
  6. 2
      build.gradle

2
app/build.gradle

@ -66,7 +66,7 @@ dependencies {
implementation 'com.google.firebase:firebase-core:16.0.5'
implementation 'com.google.firebase:firebase-messaging:17.3.4'
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.6'
implementation 'com.squareup.okhttp3:okhttp:3.11.0'
implementation 'com.squareup.okhttp3:okhttp:3.12.0'
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
implementation 'org.jsoup:jsoup:1.10.3' //TODO: Warning: upgrading from 1.10.3 will break stuff!

2
app/src/main/assets/apache_libraries.html

@ -39,7 +39,7 @@
<body>
<ul>
<li>
<h5><a href="https://square.github.io/okhttp/">OkHttp</a>&nbsp;v3.11.0 (Copyright ©2016 Square, Inc.)</h5>
<h5><a href="https://square.github.io/okhttp/">OkHttp</a>&nbsp;v3.12.0 (Copyright ©2016 Square, Inc.)</h5>
</li>
<li>
<h5><a href="https://square.github.io/picasso/">Picasso</a>&nbsp;v2.5.2 (Copyright ©2013 Square, Inc.)</h5>

1
app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java

@ -10,7 +10,6 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.text.Editable;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;

4
app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java

@ -103,9 +103,7 @@ public class BaseApplication extends Application {
}
return chain.proceed(request);
})
.connectTimeout(30, TimeUnit.SECONDS)
.writeTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS)
.callTimeout(30, TimeUnit.SECONDS)
.build();
sessionManager = new SessionManager(client, cookieJar, sharedPrefsCookiePersistor, sharedPrefs,draftsPrefs);
Picasso picasso = new Picasso.Builder(getApplicationContext())

1
app/src/main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java

@ -4,7 +4,6 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.preference.PreferenceManager;
import android.text.Editable;
import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.RadioGroup;

2
build.gradle

@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.google.gms:google-services:4.1.0'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'io.fabric.tools:gradle:1.26.1'
classpath 'org.ajoberstar.grgit:grgit-core:3.0.0'
}

Loading…
Cancel
Save