Skip to content

Commit 70df3d0

Browse files
committed
Fixed naming convention deviation
1 parent 627ca53 commit 70df3d0

File tree

7 files changed

+29
-15
lines changed

7 files changed

+29
-15
lines changed

sample/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<activity android:name=".FileSample"/>
2525
<activity android:name=".BinarySample"/>
2626
<activity android:name=".ThreadingTimeoutSample"/>
27-
<activity android:name=".CancelAllRequests"/>
28-
<activity android:name=".CancelRequestHandle"/>
27+
<activity android:name=".CancelAllRequestsSample"/>
28+
<activity android:name=".CancelRequestHandleSample"/>
2929
</application>
3030

3131
</manifest>

sample/src/main/java/com/loopj/android/http/sample/CancelAllRequests.java

-9
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.loopj.android.http.sample;
2+
3+
public class CancelAllRequestsSample extends ThreadingTimeoutSample {
4+
5+
@Override
6+
protected int getSampleTitle() {
7+
return R.string.title_cancel_all;
8+
}
9+
10+
@Override
11+
protected void onCancelButtonPressed() {
12+
getAsyncHttpClient().cancelAllRequests(true);
13+
}
14+
}

sample/src/main/java/com/loopj/android/http/sample/CancelRequestHandle.java sample/src/main/java/com/loopj/android/http/sample/CancelRequestHandleSample.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
import com.loopj.android.http.RequestHandle;
44

5-
public class CancelRequestHandle extends ThreadingTimeoutSample {
5+
public class CancelRequestHandleSample extends ThreadingTimeoutSample {
6+
7+
@Override
8+
protected int getSampleTitle() {
9+
return R.string.title_cancel_handle;
10+
}
611

712
@Override
813
protected void onCancelButtonPressed() {

sample/src/main/java/com/loopj/android/http/sample/ThreadingTimeoutSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ThreadingTimeoutSample extends SampleParentActivity {
1717

1818
@Override
1919
protected int getSampleTitle() {
20-
return R.string.app_name;
20+
return R.string.title_threading_timeout;
2121
}
2222

2323
@Override

sample/src/main/java/com/loopj/android/http/sample/WaypointsActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ protected void onListItemClick(ListView l, View v, int position, long id) {
4747
targetClass = ThreadingTimeoutSample.class;
4848
break;
4949
case 8:
50-
targetClass = CancelAllRequests.class;
50+
targetClass = CancelAllRequestsSample.class;
5151
break;
5252
case 9:
53-
targetClass = CancelRequestHandle.class;
53+
targetClass = CancelRequestHandleSample.class;
5454
break;
5555
}
5656
if (targetClass != null)

sample/src/main/res/values/strings.xml

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<string name="title_delete_sample">DELETE</string>
1010
<string name="title_file_sample">GET to File</string>
1111
<string name="title_binary_sample">GET binary data</string>
12+
<string name="title_cancel_all">Cancel all request</string>
13+
<string name="title_cancel_handle">Cancel request handle</string>
14+
<string name="title_synchronous">Synchronous requests</string>
15+
<string name="title_threading_timeout">Threading timeouts</string>
1216
<string name="button_run">Run</string>
1317
<string name="label_headers">Headers (key=val, one per line)</string>
1418
<string name="label_req_body">Request body</string>

0 commit comments

Comments
 (0)