onny/nextcompanion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add login activity

Browse source
This commit is contained in:
ikarulus 2019-01-06 03:09:14 +01:00
parent 89d4b09ec3
commit 4183fccce1
5 changed files with 118 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View file

@ -3,9 +3,7 @@
package="com.example.hochi.nextcompanion">
<!-- To auto-complete the email text field in the login form with the user's emails -->
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.INTERNET" />
<application
android:allowBackup="true"

212
app/src/main/java/com/example/hochi/nextcompanion/LoginActivity.java
View file

@ -3,6 +3,7 @@ package com.example.hochi.nextcompanion;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.annotation.TargetApi;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
@ -19,6 +20,7 @@ import android.os.Build;
import android.os.Bundle;
import android.provider.ContactsContract;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
@ -29,6 +31,16 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.DataOutputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
@ -39,26 +51,14 @@ import static android.Manifest.permission.READ_CONTACTS;
*/
public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<Cursor> {
/**
* Id to identity READ_CONTACTS permission request.
*/
private static final int REQUEST_READ_CONTACTS = 0;
/**
* A dummy authentication store containing known user names and passwords.
* TODO: remove after connecting to a real authentication system.
*/
private static final String[] DUMMY_CREDENTIALS = new String[]{
"foo@example.com:hello", "bar@example.com:world"
};
/**
* Keep track of the login task to ensure we can cancel it if requested.
*/
private UserLoginTask mAuthTask = null;
// UI references.
private AutoCompleteTextView mEmailView;
private EditText mPasswordView;
private TextView mPhoneView;
private EditText mPinView;
private View mProgressView;
private View mLoginFormView;
@ -67,11 +67,10 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login);
// Set up the login form.
mEmailView = (AutoCompleteTextView) findViewById(R.id.email);
populateAutoComplete();
mPhoneView = findViewById(R.id.phone);
mPasswordView = (EditText) findViewById(R.id.password);
mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
mPinView = findViewById(R.id.pin);
mPinView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) {
if (id == EditorInfo.IME_ACTION_DONE || id == EditorInfo.IME_NULL) {
@ -82,7 +81,7 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
}
});
Button mEmailSignInButton = (Button) findViewById(R.id.email_sign_in_button);
Button mEmailSignInButton = findViewById(R.id.phone_sign_in_button);
mEmailSignInButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
@ -94,50 +93,6 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
mProgressView = findViewById(R.id.login_progress);
}
private void populateAutoComplete() {
if (!mayRequestContacts()) {
return;
}
getLoaderManager().initLoader(0, null, this);
}
private boolean mayRequestContacts() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
return true;
}
if (checkSelfPermission(READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
return true;
}
if (shouldShowRequestPermissionRationale(READ_CONTACTS)) {
Snackbar.make(mEmailView, R.string.permission_rationale, Snackbar.LENGTH_INDEFINITE)
.setAction(android.R.string.ok, new View.OnClickListener() {
@Override
@TargetApi(Build.VERSION_CODES.M)
public void onClick(View v) {
requestPermissions(new String[]{READ_CONTACTS}, REQUEST_READ_CONTACTS);
}
});
} else {
requestPermissions(new String[]{READ_CONTACTS}, REQUEST_READ_CONTACTS);
}
return false;
}
/**
* Callback received when a permissions request has been completed.
*/
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
@NonNull int[] grantResults) {
if (requestCode == REQUEST_READ_CONTACTS) {
if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
populateAutoComplete();
}
}
}
/**
* Attempts to sign in or register the account specified by the login form.
* If there are form errors (invalid email, missing fields, etc.), the
@ -149,31 +104,27 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
}
// Reset errors.
mEmailView.setError(null);
mPasswordView.setError(null);
mPhoneView.setError(null);
mPinView.setError(null);
// Store values at the time of the login attempt.
String email = mEmailView.getText().toString();
String password = mPasswordView.getText().toString();
String email = mPhoneView.getText().toString();
String password = mPinView.getText().toString();
boolean cancel = false;
View focusView = null;
// Check for a valid password, if the user entered one.
if (!TextUtils.isEmpty(password) && !isPasswordValid(password)) {
mPasswordView.setError(getString(R.string.error_invalid_password));
focusView = mPasswordView;
mPinView.setError(getString(R.string.error_invalid_pin));
focusView = mPinView;
cancel = true;
}
// Check for a valid email address.
if (TextUtils.isEmpty(email)) {
mEmailView.setError(getString(R.string.error_field_required));
focusView = mEmailView;
cancel = true;
} else if (!isEmailValid(email)) {
mEmailView.setError(getString(R.string.error_invalid_email));
focusView = mEmailView;
mPhoneView.setError(getString(R.string.error_field_required));
focusView = mPhoneView;
cancel = true;
}
@ -190,14 +141,9 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
}
}
private boolean isEmailValid(String email) {
//TODO: Replace this with your own logic
return email.contains("@");
}
private boolean isPasswordValid(String password) {
//TODO: Replace this with your own logic
return password.length() > 4;
return password.length() == 6;
}
/**
@ -254,15 +200,8 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
}
@Override
public void onLoadFinished(Loader<Cursor> cursorLoader, Cursor cursor) {
List<String> emails = new ArrayList<>();
cursor.moveToFirst();
while (!cursor.isAfterLast()) {
emails.add(cursor.getString(ProfileQuery.ADDRESS));
cursor.moveToNext();
}
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
addEmailsToAutoComplete(emails);
}
@Override
@ -270,16 +209,6 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
}
private void addEmailsToAutoComplete(List<String> emailAddressCollection) {
//Create adapter to tell the AutoCompleteTextView what to show in its dropdown list.
ArrayAdapter<String> adapter =
new ArrayAdapter<>(LoginActivity.this,
android.R.layout.simple_dropdown_item_1line, emailAddressCollection);
mEmailView.setAdapter(adapter);
}
private interface ProfileQuery {
String[] PROJECTION = {
ContactsContract.CommonDataKinds.Email.ADDRESS,
@ -296,34 +225,79 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
*/
public class UserLoginTask extends AsyncTask<Void, Void, Boolean> {
private final String mEmail;
private final String mPassword;
private final String mPhone;
private final String mPin;
UserLoginTask(String email, String password) {
mEmail = email;
mPassword = password;
UserLoginTask(String phone, String pin) {
mPhone = URLEncoder.encode(phone);
mPin = pin;
}
@Override
protected Boolean doInBackground(Void... params) {
// TODO: attempt authentication against a network service.
Boolean success = false;
String urlParameters = "apikey=rXXqTgQZUPZ89lzB&mobile=" + mPhone + "&pin=" + mPin;
HttpURLConnection connection = null;
try {
// Simulate network access.
Thread.sleep(2000);
} catch (InterruptedException e) {
return false;
}
//Create connection
URL url = new URL("https://api.nextbike.net/api/login.json");
connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("POST");
connection.setRequestProperty("Content-Type",
"application/x-www-form-urlencoded");
for (String credential : DUMMY_CREDENTIALS) {
String[] pieces = credential.split(":");
if (pieces[0].equals(mEmail)) {
// Account exists, return true if the password matches.
return pieces[1].equals(mPassword);
connection.setRequestProperty("Content-Length", "" +
Integer.toString(urlParameters.getBytes().length));
connection.setRequestProperty("Content-Language", "en-US");
connection.setUseCaches (false);
connection.setDoInput(true);
connection.setDoOutput(true);
//Send request
DataOutputStream wr = new DataOutputStream (
connection.getOutputStream ());
wr.writeBytes (urlParameters);
wr.flush ();
wr.close ();
//Get Response
InputStream is = connection.getInputStream();
BufferedReader rd = new BufferedReader(new InputStreamReader(is));
String line;
StringBuilder response = new StringBuilder();
while((line = rd.readLine()) != null) {
response.append(line);
response.append('\r');
}
rd.close();
try {
JSONObject jObject = new JSONObject(response.toString());
JSONObject userObject = jObject.getJSONObject("user");
String loginkey = userObject.getString("loginkey");
Log.d("DEBUG", loginkey);
success=true;
SharedPreferences sharedPref = getSharedPreferences("persistence", MODE_PRIVATE);
SharedPreferences.Editor editor = sharedPref.edit();
editor.putString("loginKey", loginkey);
editor.apply();
}
catch (Exception e) {
e.printStackTrace();
success=false;
}
} catch (Exception e) {
e.printStackTrace();
} finally {
if(connection != null) {
connection.disconnect();
}
}
// TODO: register the new account here.
return true;
}
@ -335,8 +309,8 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
if (success) {
finish();
} else {
mPasswordView.setError(getString(R.string.error_incorrect_password));
mPasswordView.requestFocus();
mPinView.setError(getString(R.string.error_incorrect_pin));
mPinView.requestFocus();
}
}

25
app/src/main/java/com/example/hochi/nextcompanion/MainActivity.java
View file

@ -16,17 +16,6 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
//pre-condition: Is there a login key?
Context context = this;
SharedPreferences persistence = context.getSharedPreferences(
"loginKey", Context.MODE_PRIVATE);
String defaultValue = "nokey";
String loginKey = persistence.getString("loginKey", defaultValue);
if (loginKey.equals("nokey")) {
Intent intent = new Intent(this, LoginActivity.class);
startActivity(intent);
}
//now this "every android activity" stuff
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
@ -36,6 +25,20 @@ public class MainActivity extends AppCompatActivity {
FloatingButton();
}
@Override
protected void onStart() {
super.onStart();
//pre-condition: Is there a login key?
Context context = this;
SharedPreferences sharedPref = getSharedPreferences("persistence", MODE_PRIVATE);
String defaultValue = "nokey";
String loginKey = sharedPref.getString("loginKey", defaultValue);
if (loginKey.equals("nokey")) {
Intent intent = new Intent(this, LoginActivity.class);
startActivity(intent);
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.

18
app/src/main/res/layout/activity_login.xml
View file

@ -26,7 +26,7 @@
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/email_login_form"
android:id="@+id/phone_login_form"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@ -35,12 +35,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<AutoCompleteTextView
android:id="@+id/email"
<EditText
android:id="@+id/phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_email"
android:inputType="textEmailAddress"
android:hint="@string/prompt_phone"
android:inputType="phone"
android:maxLines="1"
android:singleLine="true" />
@ -51,21 +51,21 @@
android:layout_height="wrap_content">
<EditText
android:id="@+id/password"
android:id="@+id/pin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_password"
android:hint="@string/prompt_pin"
android:imeActionId="6"
android:imeActionLabel="@string/action_sign_in_short"
android:imeOptions="actionUnspecified"
android:inputType="textPassword"
android:inputType="numberPassword"
android:maxLines="1"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/email_sign_in_button"
android:id="@+id/phone_sign_in_button"
style="?android:textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"