tidy up: remove unneeded dependencies, random debug logs etc...
This commit is contained in:
parent
1b690d3a7c
commit
bbef2725fb
5 changed files with 20 additions and 26 deletions
|
|
@ -10,7 +10,6 @@ import android.support.v7.app.AppCompatActivity;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.KeyEvent;
|
import android.view.KeyEvent;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.View.OnClickListener;
|
import android.view.View.OnClickListener;
|
||||||
|
|
@ -161,12 +160,12 @@ public class LoginActivity extends AppCompatActivity implements AsyncTaskCallbac
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTaskComplete(String response) {
|
public void onTaskComplete(String response) {
|
||||||
|
//Callback called when RequestHandler finished request
|
||||||
if (!response.isEmpty()) {
|
if (!response.isEmpty()) {
|
||||||
try {
|
try {
|
||||||
JSONObject jObject = new JSONObject(response);
|
JSONObject jObject = new JSONObject(response);
|
||||||
JSONObject userObject = jObject.getJSONObject("user");
|
JSONObject userObject = jObject.getJSONObject("user");
|
||||||
String loginkey = userObject.getString("loginkey");
|
String loginkey = userObject.getString("loginkey");
|
||||||
Log.d("DEBUG", loginkey);
|
|
||||||
SharedPreferences sharedPref = getSharedPreferences("persistence", MODE_PRIVATE);
|
SharedPreferences sharedPref = getSharedPreferences("persistence", MODE_PRIVATE);
|
||||||
SharedPreferences.Editor editor = sharedPref.edit();
|
SharedPreferences.Editor editor = sharedPref.edit();
|
||||||
editor.putString("loginKey", loginkey);
|
editor.putString("loginKey", loginkey);
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,8 @@ import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.design.widget.FloatingActionButton;
|
import android.support.design.widget.FloatingActionButton;
|
||||||
import android.support.design.widget.Snackbar;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.support.v7.widget.Toolbar;
|
import android.support.v7.widget.Toolbar;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
|
@ -21,7 +19,6 @@ import org.json.JSONException;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
public class MainActivity extends AppCompatActivity implements AsyncTaskCallbacks<String> {
|
public class MainActivity extends AppCompatActivity implements AsyncTaskCallbacks<String> {
|
||||||
private RequestHandler getBikesTask = null;
|
private RequestHandler getBikesTask = null;
|
||||||
|
|
@ -53,6 +50,7 @@ public class MainActivity extends AppCompatActivity implements AsyncTaskCallback
|
||||||
SharedPreferences sharedPref = getSharedPreferences("persistence", MODE_PRIVATE);
|
SharedPreferences sharedPref = getSharedPreferences("persistence", MODE_PRIVATE);
|
||||||
String defaultValue = "nokey";
|
String defaultValue = "nokey";
|
||||||
String loginKey = sharedPref.getString("loginKey", defaultValue);
|
String loginKey = sharedPref.getString("loginKey", defaultValue);
|
||||||
|
//if not, go to LoginActivity
|
||||||
if (loginKey.equals("nokey")) {
|
if (loginKey.equals("nokey")) {
|
||||||
Intent intent = new Intent(this, LoginActivity.class);
|
Intent intent = new Intent(this, LoginActivity.class);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
|
|
@ -102,14 +100,13 @@ public class MainActivity extends AppCompatActivity implements AsyncTaskCallback
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTaskComplete(String response) {
|
public void onTaskComplete(String response) {
|
||||||
|
//Callback called when RequestHandler finished request
|
||||||
final Context context = this;
|
final Context context = this;
|
||||||
|
|
||||||
if (!response.isEmpty()) {
|
if (!response.isEmpty()) {
|
||||||
final ArrayList<String> list = new ArrayList<>();
|
final ArrayList<String> list = new ArrayList<>();
|
||||||
try {
|
try {
|
||||||
JSONObject jObject = new JSONObject(response);
|
JSONObject jObject = new JSONObject(response);
|
||||||
JSONArray bikesArray = jObject.getJSONArray("rentalCollection");
|
JSONArray bikesArray = jObject.getJSONArray("rentalCollection");
|
||||||
|
|
||||||
for (int i = 0; i < bikesArray.length(); i++) {
|
for (int i = 0; i < bikesArray.length(); i++) {
|
||||||
String entry;
|
String entry;
|
||||||
JSONObject bike = bikesArray.getJSONObject(i);
|
JSONObject bike = bikesArray.getJSONObject(i);
|
||||||
|
|
@ -117,10 +114,11 @@ public class MainActivity extends AppCompatActivity implements AsyncTaskCallback
|
||||||
+ " with lock code " + bike.getString("code");
|
+ " with lock code " + bike.getString("code");
|
||||||
list.add(entry);
|
list.add(entry);
|
||||||
}
|
}
|
||||||
Log.d("DEBUG", list.toString());
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Create and fill list
|
||||||
final ListView listview = findViewById(R.id.listview);
|
final ListView listview = findViewById(R.id.listview);
|
||||||
final ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
|
final ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
|
||||||
android.R.layout.simple_list_item_1, list);
|
android.R.layout.simple_list_item_1, list);
|
||||||
|
|
@ -129,7 +127,7 @@ public class MainActivity extends AppCompatActivity implements AsyncTaskCallback
|
||||||
try {
|
try {
|
||||||
final JSONObject jObject = new JSONObject(response);
|
final JSONObject jObject = new JSONObject(response);
|
||||||
final JSONArray bikesArray = jObject.getJSONArray("rentalCollection");
|
final JSONArray bikesArray = jObject.getJSONArray("rentalCollection");
|
||||||
listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(AdapterView<?> parent, final View view, int position, long id) {
|
public void onItemClick(AdapterView<?> parent, final View view, int position, long id) {
|
||||||
Intent intent = new Intent(context, ReturnActivity.class);
|
Intent intent = new Intent(context, ReturnActivity.class);
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ public class RentActivity extends AppCompatActivity implements AsyncTaskCallback
|
||||||
}
|
}
|
||||||
|
|
||||||
void rentRequest() {
|
void rentRequest() {
|
||||||
|
//Prepare request to rent bike
|
||||||
TextView mBikeInput;
|
TextView mBikeInput;
|
||||||
mBikeInput = findViewById(R.id.bike_id);
|
mBikeInput = findViewById(R.id.bike_id);
|
||||||
String bikeID = mBikeInput.getText().toString();
|
String bikeID = mBikeInput.getText().toString();
|
||||||
|
|
@ -45,6 +46,7 @@ public class RentActivity extends AppCompatActivity implements AsyncTaskCallback
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTaskComplete(String response) {
|
public void onTaskComplete(String response) {
|
||||||
|
//get back to main activity
|
||||||
//TODO: *any* response handling
|
//TODO: *any* response handling
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
package com.example.hochi.nextcompanion;
|
package com.example.hochi.nextcompanion;
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.res.Resources;
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
|
|
@ -20,7 +17,8 @@ public class RequestHandler extends AsyncTask<Void, Void, String> {
|
||||||
private AsyncTaskCallbacks<String> callback;
|
private AsyncTaskCallbacks<String> callback;
|
||||||
private String[] mCredentials;
|
private String[] mCredentials;
|
||||||
|
|
||||||
RequestHandler(AsyncTaskCallbacks<String> act, String HTTPmethod, String endpoint, String[] credentials) {
|
RequestHandler(AsyncTaskCallbacks<String> act, String HTTPmethod,
|
||||||
|
String endpoint, String[] credentials) {
|
||||||
mHTTPmethod = HTTPmethod;
|
mHTTPmethod = HTTPmethod;
|
||||||
mEndpoint = endpoint;
|
mEndpoint = endpoint;
|
||||||
mCredentials = credentials;
|
mCredentials = credentials;
|
||||||
|
|
@ -33,12 +31,14 @@ public class RequestHandler extends AsyncTask<Void, Void, String> {
|
||||||
StringBuilder urlParameters = new StringBuilder();
|
StringBuilder urlParameters = new StringBuilder();
|
||||||
int i=0;
|
int i=0;
|
||||||
while (i<mCredentials.length) {
|
while (i<mCredentials.length) {
|
||||||
urlParameters.append("&").append(mCredentials[i]).append(URLEncoder.encode(mCredentials[i+1]));
|
urlParameters.append("&").append(mCredentials[i])
|
||||||
|
.append(URLEncoder.encode(mCredentials[i+1]));
|
||||||
i=i+2;
|
i=i+2;
|
||||||
}
|
}
|
||||||
|
|
||||||
HttpURLConnection connection = null;
|
HttpURLConnection connection = null;
|
||||||
try {
|
try {
|
||||||
|
|
||||||
//Create connection
|
//Create connection
|
||||||
URL url = new URL("https://api.nextbike.net/" + mEndpoint);
|
URL url = new URL("https://api.nextbike.net/" + mEndpoint);
|
||||||
connection = (HttpURLConnection) url.openConnection();
|
connection = (HttpURLConnection) url.openConnection();
|
||||||
|
|
@ -55,6 +55,7 @@ public class RequestHandler extends AsyncTask<Void, Void, String> {
|
||||||
connection.setDoInput(true);
|
connection.setDoInput(true);
|
||||||
connection.setDoOutput(true);
|
connection.setDoOutput(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Send request
|
//Send request
|
||||||
DataOutputStream wr = new DataOutputStream (
|
DataOutputStream wr = new DataOutputStream (
|
||||||
connection.getOutputStream ());
|
connection.getOutputStream ());
|
||||||
|
|
@ -71,30 +72,27 @@ public class RequestHandler extends AsyncTask<Void, Void, String> {
|
||||||
response.append('\r');
|
response.append('\r');
|
||||||
}
|
}
|
||||||
rd.close();
|
rd.close();
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
|
|
||||||
if(connection != null) {
|
if(connection != null) {
|
||||||
connection.disconnect();
|
connection.disconnect();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return response.toString();
|
return response.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPostExecute(final String response) {
|
protected void onPostExecute(final String response) {
|
||||||
//mAuthTask = null;
|
//TODO: reimplement progress or remove support for it
|
||||||
//showProgress(false);
|
|
||||||
callback.onTaskComplete(response);
|
callback.onTaskComplete(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCancelled() {
|
protected void onCancelled() {
|
||||||
//mAuthTask = null;
|
//TODO: proper handling if needed
|
||||||
//showProgress(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -4,15 +4,11 @@ import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
public class ReturnActivity extends AppCompatActivity implements AsyncTaskCallbacks<String> {
|
public class ReturnActivity extends AppCompatActivity implements AsyncTaskCallbacks<String> {
|
||||||
private RequestHandler returnRequestTask = null;
|
|
||||||
private String[] bikeArray;
|
private String[] bikeArray;
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
@ -48,14 +44,15 @@ public class ReturnActivity extends AppCompatActivity implements AsyncTaskCallba
|
||||||
"station=", stationID,
|
"station=", stationID,
|
||||||
"comment=", "return bike"
|
"comment=", "return bike"
|
||||||
};
|
};
|
||||||
returnRequestTask = new RequestHandler(this, "POST",
|
RequestHandler returnRequestTask = new RequestHandler(this, "POST",
|
||||||
"api/return.json", params);
|
"api/return.json", params);
|
||||||
returnRequestTask.execute((Void) null);
|
returnRequestTask.execute((Void) null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTaskComplete(String response) {
|
public void onTaskComplete(String response) {
|
||||||
Log.d("DEBUG", response);
|
//get back to main activity
|
||||||
|
//TODO: *any* response handling
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue