Skip to content

Commit 64baf6b

Browse files
committed
Globally allowing to set HTTP/HTTPS mode in Samples and clearing sample outputs
1 parent c871ed7 commit 64baf6b

File tree

2 files changed

+44
-1
lines changed

2 files changed

+44
-1
lines changed

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

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import android.graphics.Color;
2424
import android.os.Bundle;
2525
import android.util.Log;
26+
import android.view.Menu;
27+
import android.view.MenuItem;
2628
import android.view.View;
2729
import android.view.ViewGroup;
2830
import android.widget.Button;
@@ -68,7 +70,15 @@ protected AsyncHttpRequest newAsyncHttpRequest(DefaultHttpClient client, HttpCon
6870
private final List<RequestHandle> requestHandles = new LinkedList<RequestHandle>();
6971
private static final String LOG_TAG = "SampleParentActivity";
7072

71-
protected static final String PROTOCOL = "https://";
73+
private static final int MENU_USE_HTTPS = 0;
74+
private static final int MENU_CLEAR_VIEW = 1;
75+
76+
private boolean useHttps = true;
77+
78+
protected static final String PROTOCOL_HTTP = "http://";
79+
protected static final String PROTOCOL_HTTPS = "https://";
80+
81+
protected static String PROTOCOL = PROTOCOL_HTTPS;
7282
protected static final int LIGHTGREEN = Color.parseColor("#00FF66");
7383
protected static final int LIGHTRED = Color.parseColor("#FF3300");
7484
protected static final int YELLOW = Color.parseColor("#FFFF00");
@@ -106,6 +116,36 @@ protected void onCreate(Bundle savedInstanceState) {
106116
}
107117
}
108118

119+
@Override
120+
public boolean onPrepareOptionsMenu(Menu menu) {
121+
MenuItem useHttpsMenuItem = menu.findItem(MENU_USE_HTTPS);
122+
if (useHttpsMenuItem != null) {
123+
useHttpsMenuItem.setChecked(useHttps);
124+
}
125+
return super.onPrepareOptionsMenu(menu);
126+
}
127+
128+
@Override
129+
public boolean onCreateOptionsMenu(Menu menu) {
130+
menu.add(Menu.NONE, MENU_USE_HTTPS, R.string.menu_use_https, Menu.NONE).setCheckable(true);
131+
menu.add(Menu.NONE, MENU_CLEAR_VIEW, R.string.menu_clear_view, Menu.NONE);
132+
return super.onCreateOptionsMenu(menu);
133+
}
134+
135+
@Override
136+
public boolean onOptionsItemSelected(MenuItem item) {
137+
switch (item.getItemId()) {
138+
case MENU_USE_HTTPS:
139+
useHttps = !useHttps;
140+
PROTOCOL = useHttps ? PROTOCOL_HTTPS : PROTOCOL_HTTP;
141+
return true;
142+
case MENU_CLEAR_VIEW:
143+
clearOutputs();
144+
return true;
145+
}
146+
return super.onOptionsItemSelected(item);
147+
}
148+
109149
@Override
110150
public AsyncHttpRequest getHttpRequest(DefaultHttpClient client, HttpContext httpContext, HttpUriRequest uriRequest, String contentType, ResponseHandlerInterface responseHandler, Context context) {
111151
return null;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<string name="button_run">Run</string>
1010
<string name="button_cancel">Cancel</string>
1111

12+
<string name="menu_use_https">Use HTTPS</string>
13+
<string name="menu_clear_view">Clear Outputs</string>
14+
1215
<string name="label_headers">Headers (key=val, one per line)</string>
1316
<string name="label_req_body">Request body</string>
1417
<string name="label_credentials">Server requests authentication.\nTo gain access, enter:\n\nUsername: %1$s\nPassword: %2$s</string>

0 commit comments

Comments
 (0)