arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-29 11:28:19 +00:00
Code Issues Releases Wiki Activity

Upgrade to okhttp 3.3.1

Browse Source
This commit is contained in:
Ricki Hirner 2016-05-30 12:02:04 +02:00
parent 5675e544b5
commit 91234a688f
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -75,6 +75,6 @@ dependencies {
// for tests // for tests
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'com.squareup.okhttp3:mockwebserver:3.3.0' testCompile 'com.squareup.okhttp3:mockwebserver:3.3.1'
androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.3.0' androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.3.1'
} }

22
app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java
View File

@ -64,7 +64,7 @@ public class AboutActivity extends AppCompatActivity {
@RequiredArgsConstructor @RequiredArgsConstructor
private static class ComponentInfo { private static class ComponentInfo {
final String title, version, website, copyright; final String title, version, website, copyright;
final int licenseInfo; final int licenseInfo;
final String licenseTextFile; final String licenseTextFile;
} }
@ -72,32 +72,32 @@ public class AboutActivity extends AppCompatActivity {
private final static ComponentInfo components[] = { private final static ComponentInfo components[] = {
new ComponentInfo( new ComponentInfo(
"DAVdroid", BuildConfig.VERSION_NAME, "https://davdroid.bitfire.at", "DAVdroid", BuildConfig.VERSION_NAME, "https://davdroid.bitfire.at",
"© " + DateFormatUtils.format(BuildConfig.buildTime, "yyyy") + " Ricki Hirner, Bernhard Stockmann (bitfire web engineering)", DateFormatUtils.format(BuildConfig.buildTime, "yyyy") + " Ricki Hirner, Bernhard Stockmann (bitfire web engineering)",
R.string.about_license_info_no_warranty, "gpl-3.0-standalone.html" R.string.about_license_info_no_warranty, "gpl-3.0-standalone.html"
), new ComponentInfo( ), new ComponentInfo(
"AmbilWarna", null, "https://github.com/yukuku/ambilwarna", "AmbilWarna", null, "https://github.com/yukuku/ambilwarna",
"© Yuku", R.string.about_license_info_no_warranty, "apache2.html" "Yuku", R.string.about_license_info_no_warranty, "apache2.html"
), new ComponentInfo( ), new ComponentInfo(
"Apache Commons", null, "http://commons.apache.org/", "Apache Commons", null, "http://commons.apache.org/",
"Apache Software Foundation", R.string.about_license_info_no_warranty, "apache2.html" "Apache Software Foundation", R.string.about_license_info_no_warranty, "apache2.html"
), new ComponentInfo( ), new ComponentInfo(
"dnsjava", null, "http://dnsjava.org/", "dnsjava", null, "http://dnsjava.org/",
"© Brian Wellington", R.string.about_license_info_no_warranty, "bsd.html" "Brian Wellington", R.string.about_license_info_no_warranty, "bsd.html"
), new ComponentInfo( ), new ComponentInfo(
"ez-vcard", Ezvcard.VERSION, "https://github.com/mangstadt/ez-vcard", "ez-vcard", Ezvcard.VERSION, "https://github.com/mangstadt/ez-vcard",
"© Michael Angstadt", R.string.about_license_info_no_warranty, "bsd.html" "Michael Angstadt", R.string.about_license_info_no_warranty, "bsd.html"
), new ComponentInfo( ), new ComponentInfo(
"ical4j", "2.x", "http://ical4j.github.io/", "ical4j", "2.x", "https://ical4j.github.io/",
"© Ben Fortuna", R.string.about_license_info_no_warranty, "bsd-3clause.html" "Ben Fortuna", R.string.about_license_info_no_warranty, "bsd-3clause.html"
), new ComponentInfo( ), new ComponentInfo(
"MemorizingTrustManager", null, "https://github.com/ge0rg/MemorizingTrustManager", "MemorizingTrustManager", null, "https://github.com/ge0rg/MemorizingTrustManager",
"© Georg Lukas", R.string.about_license_info_no_warranty, "mit.html" "Georg Lukas", R.string.about_license_info_no_warranty, "mit.html"
), new ComponentInfo( ), new ComponentInfo(
"OkHttp", null, "https://square.github.io/okhttp/", "OkHttp", null, "https://square.github.io/okhttp/",
"© Square, Inc.", R.string.about_license_info_no_warranty, "apache2.html" "Square, Inc.", R.string.about_license_info_no_warranty, "apache2.html"
), new ComponentInfo( ), new ComponentInfo(
"Project Lombok", null, "https://projectlombok.org/", "Project Lombok", null, "https://projectlombok.org/",
"© The Project Lombok Authors", R.string.about_license_info_no_warranty, "mit.html" "The Project Lombok Authors", R.string.about_license_info_no_warranty, "mit.html"
) )
}; };
@ -152,7 +152,7 @@ public class AboutActivity extends AppCompatActivity {
tv.setText(info.website); tv.setText(info.website);
tv = (TextView)v.findViewById(R.id.copyright); tv = (TextView)v.findViewById(R.id.copyright);
tv.setText(info.copyright); tv.setText("© " + info.copyright);
tv = (TextView)v.findViewById(R.id.license_info); tv = (TextView)v.findViewById(R.id.license_info);
tv.setText(info.licenseInfo); tv.setText(info.licenseInfo);

7
app/src/main/res/layout/about_component.xml
View File

@ -46,10 +46,9 @@
<TextView <TextView
android:id="@+id/license_info" android:id="@+id/license_info"
tools:text="This program comes with ABSOLUTELY NO WARRANTY. It is free software, and you are welcome to redistribute it under certain conditions." tools:text="This program comes with ABSOLUTELY NO WARRANTY. It is free software, and you are welcome to redistribute it under certain conditions."
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"/>
android:layout_gravity="center_horizontal"/>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -68,4 +67,4 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

2
dav4android

@ -1 +1 @@
Subproject commit 7893c474152290fed83db6f907ed911513d54850 Subproject commit 871d62fffc45cbe5aa061b4ed2b3bd5282a64dd1