Skip to content

Commit 4c82d0a

Browse files
author
Kaushik Gopal
committed
feat: merge upgrade retrofit + okhttp changes (courtesy: prt2121)
2 parents 3f41658 + d21e1cf commit 4c82d0a

22 files changed

+278
-279
lines changed

‎app/build.gradle‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ dependencies {
1212

1313
compile 'com.jakewharton:butterknife:7.0.1'
1414
compile 'com.jakewharton.timber:timber:2.4.2'
15-
compile 'com.squareup.retrofit:retrofit:1.6.1'
16-
compile 'com.squareup.okhttp:okhttp:2.0.0'
17-
compile 'com.squareup.okhttp:okhttp-urlconnection:2.0.0'
15+
compile 'com.squareup.retrofit2:retrofit:2.0.0-beta3'
16+
compile 'com.squareup.retrofit2:adapter-rxjava:2.0.0-beta3'
17+
compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta3'
18+
compile 'com.squareup.okhttp3:okhttp:3.0.1'
19+
compile 'com.squareup.okhttp3:okhttp-urlconnection:3.0.1'
1820

1921
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
2022
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3'

‎app/src/main/java/com/morihacky/android/rxjava/fragments/BufferDemoFragment.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@
99
import android.view.ViewGroup;
1010
import android.widget.Button;
1111
import android.widget.ListView;
12-
import butterknife.ButterKnife;
13-
import butterknife.Bind;
12+
1413
import com.jakewharton.rxbinding.view.RxView;
1514
import com.jakewharton.rxbinding.view.ViewClickEvent;
1615
import com.morihacky.android.rxjava.R;
1716
import com.morihacky.android.rxjava.wiring.LogAdapter;
17+
1818
import java.util.ArrayList;
1919
import java.util.List;
2020
import java.util.concurrent.TimeUnit;
21+
22+
import butterknife.Bind;
23+
import butterknife.ButterKnife;
2124
import rx.Observer;
2225
import rx.Subscription;
2326
import rx.android.schedulers.AndroidSchedulers;

‎app/src/main/java/com/morihacky/android/rxjava/fragments/ConcurrencyWithSchedulersDemoFragment.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
import android.widget.ArrayAdapter;
1212
import android.widget.ListView;
1313
import android.widget.ProgressBar;
14-
import butterknife.ButterKnife;
15-
import butterknife.Bind;
16-
import butterknife.OnClick;
14+
1715
import com.morihacky.android.rxjava.R;
16+
1817
import java.util.ArrayList;
1918
import java.util.List;
19+
20+
import butterknife.Bind;
21+
import butterknife.ButterKnife;
22+
import butterknife.OnClick;
2023
import rx.Observable;
2124
import rx.Observer;
2225
import rx.Subscription;

‎app/src/main/java/com/morihacky/android/rxjava/fragments/DebounceSearchEmitterFragment.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@
1111
import android.widget.ArrayAdapter;
1212
import android.widget.EditText;
1313
import android.widget.ListView;
14-
import butterknife.ButterKnife;
15-
import butterknife.Bind;
16-
import butterknife.OnClick;
14+
1715
import com.jakewharton.rxbinding.widget.RxTextView;
1816
import com.jakewharton.rxbinding.widget.TextViewTextChangeEvent;
1917
import com.morihacky.android.rxjava.R;
18+
2019
import java.util.ArrayList;
2120
import java.util.List;
2221
import java.util.concurrent.TimeUnit;
22+
23+
import butterknife.Bind;
24+
import butterknife.ButterKnife;
25+
import butterknife.OnClick;
2326
import rx.Observer;
2427
import rx.Subscription;
2528
import rx.android.schedulers.AndroidSchedulers;

‎app/src/main/java/com/morihacky/android/rxjava/fragments/DoubleBindingTextViewFragment.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
import android.view.ViewGroup;
88
import android.widget.EditText;
99
import android.widget.TextView;
10-
import butterknife.ButterKnife;
10+
11+
import com.morihacky.android.rxjava.R;
12+
1113
import butterknife.Bind;
14+
import butterknife.ButterKnife;
1215
import butterknife.OnTextChanged;
13-
import com.morihacky.android.rxjava.R;
1416
import rx.Subscription;
1517
import rx.functions.Action1;
1618
import rx.subjects.PublishSubject;

‎app/src/main/java/com/morihacky/android/rxjava/fragments/ExponentialBackoffFragment.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@
77
import android.view.View;
88
import android.view.ViewGroup;
99
import android.widget.ListView;
10-
import butterknife.ButterKnife;
11-
import butterknife.Bind;
12-
import butterknife.OnClick;
10+
1311
import com.morihacky.android.rxjava.R;
1412
import com.morihacky.android.rxjava.RxUtils;
1513
import com.morihacky.android.rxjava.wiring.LogAdapter;
14+
1615
import java.util.ArrayList;
1716
import java.util.List;
1817
import java.util.concurrent.TimeUnit;
18+
19+
import butterknife.Bind;
20+
import butterknife.ButterKnife;
21+
import butterknife.OnClick;
1922
import rx.Observable;
2023
import rx.Observer;
2124
import rx.functions.Action0;

‎app/src/main/java/com/morihacky/android/rxjava/fragments/FormValidationCombineLatestFragment.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
import android.view.ViewGroup;
88
import android.widget.EditText;
99
import android.widget.TextView;
10-
import butterknife.ButterKnife;
11-
import butterknife.Bind;
10+
1211
import com.jakewharton.rxbinding.widget.RxTextView;
1312
import com.morihacky.android.rxjava.R;
13+
14+
import butterknife.Bind;
15+
import butterknife.ButterKnife;
1416
import rx.Observable;
1517
import rx.Observer;
1618
import rx.Subscription;

‎app/src/main/java/com/morihacky/android/rxjava/fragments/MainFragment.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
import android.view.LayoutInflater;
88
import android.view.View;
99
import android.view.ViewGroup;
10-
import butterknife.ButterKnife;
11-
import butterknife.OnClick;
10+
1211
import com.morihacky.android.rxjava.R;
1312
import com.morihacky.android.rxjava.rxbus.RxBusDemoFragment;
1413

14+
import butterknife.ButterKnife;
15+
import butterknife.OnClick;
16+
1517
public class MainFragment
1618
extends BaseFragment {
1719

‎app/src/main/java/com/morihacky/android/rxjava/fragments/PollingFragment.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@
1010
import android.view.ViewGroup;
1111
import android.widget.ArrayAdapter;
1212
import android.widget.ListView;
13-
import butterknife.ButterKnife;
14-
import butterknife.Bind;
15-
import butterknife.OnClick;
13+
1614
import com.morihacky.android.rxjava.R;
15+
1716
import java.util.ArrayList;
1817
import java.util.List;
1918
import java.util.concurrent.TimeUnit;
19+
20+
import butterknife.Bind;
21+
import butterknife.ButterKnife;
22+
import butterknife.OnClick;
2023
import rx.Observable;
2124
import rx.Subscriber;
2225
import rx.functions.Action0;

‎app/src/main/java/com/morihacky/android/rxjava/fragments/PseudoCacheConcatFragment.java‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,31 @@
22

33
import android.os.Bundle;
44
import android.support.annotation.Nullable;
5-
import android.text.TextUtils;
65
import android.view.LayoutInflater;
76
import android.view.View;
87
import android.view.ViewGroup;
98
import android.widget.ArrayAdapter;
109
import android.widget.ListView;
11-
import butterknife.ButterKnife;
12-
import butterknife.Bind;
13-
import butterknife.OnClick;
10+
1411
import com.morihacky.android.rxjava.R;
1512
import com.morihacky.android.rxjava.retrofit.Contributor;
1613
import com.morihacky.android.rxjava.retrofit.GithubApi;
14+
import com.morihacky.android.rxjava.retrofit.GithubService;
15+
1716
import java.util.ArrayList;
1817
import java.util.HashMap;
1918
import java.util.List;
20-
import retrofit.RequestInterceptor;
21-
import retrofit.RestAdapter;
19+
20+
import butterknife.Bind;
21+
import butterknife.ButterKnife;
22+
import butterknife.OnClick;
2223
import rx.Observable;
2324
import rx.Subscriber;
2425
import rx.Subscription;
2526
import rx.android.schedulers.AndroidSchedulers;
2627
import rx.functions.Func1;
2728
import timber.log.Timber;
2829

29-
import static java.lang.String.format;
30-
3130
public class PseudoCacheConcatFragment
3231
extends BaseFragment {
3332

@@ -113,7 +112,9 @@ private Observable<Contributor> _getCachedData() {
113112
}
114113

115114
private Observable<Contributor> _getFreshData() {
116-
return _createGithubApi().contributors("square", "retrofit")
115+
String githubToken = getResources().getString(R.string.github_oauth_token);
116+
GithubApi githubService = GithubService.createGithubService(githubToken);
117+
return githubService.contributors("square", "retrofit")
117118
.flatMap(new Func1<List<Contributor>, Observable<Contributor>>() {
118119
@Override
119120
public Observable<Contributor> call(List<Contributor> contributors) {
@@ -122,25 +123,6 @@ public Observable<Contributor> call(List<Contributor> contributors) {
122123
});
123124
}
124125

125-
private GithubApi _createGithubApi() {
126-
127-
RestAdapter.Builder builder = new RestAdapter.Builder().setEndpoint(
128-
"https://api.github.com/");
129-
//.setLogLevel(RestAdapter.LogLevel.FULL);
130-
131-
final String githubToken = getResources().getString(R.string.github_oauth_token);
132-
if (!TextUtils.isEmpty(githubToken)) {
133-
builder.setRequestInterceptor(new RequestInterceptor() {
134-
@Override
135-
public void intercept(RequestFacade request) {
136-
request.addHeader("Authorization", format("token %s", githubToken));
137-
}
138-
});
139-
}
140-
141-
return builder.build().create(GithubApi.class);
142-
}
143-
144126
private void _initializeCache() {
145127
_contributionMap = new HashMap<>();
146128
_contributionMap.put("JakeWharton", 0l);

0 commit comments

Comments
 (0)