Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bro #100

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bro #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd7f1c1
Volley class has been made
dextroxd Mar 2, 2019
8131c85
Login Done
dextroxd Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ dependencies {
compile 'com.google.firebase:firebase-core:11.8.0'
compile 'com.firebaseui:firebase-ui-auth:3.2.2'
compile 'de.hdodenhof:circleimageview:2.2.0'
compile 'com.android.volley:volley:1.1.1'
testCompile 'junit:junit:4.12'
}

Expand All @@ -64,4 +65,4 @@ dependencies {



apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.gms.google-services'
28 changes: 10 additions & 18 deletions app/google-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,35 @@
{
"project_info": {
"project_number": "88547491108",
"firebase_url": "https://nimbus2k18-test.firebaseio.com",
"project_id": "nimbus2k18-test",
"storage_bucket": "nimbus2k18-test.appspot.com"
"project_number": "946635561974",
"firebase_url": "https://nimbus-e7594.firebaseio.com",
"project_id": "nimbus-e7594",
"storage_bucket": "nimbus-e7594.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:88547491108:android:3574d68da7d17e16",
"mobilesdk_app_id": "1:946635561974:android:3574d68da7d17e16",
"android_client_info": {
"package_name": "com.nith.appteam.nimbus"
}
},
"oauth_client": [
{
"client_id": "88547491108-fc5fdjqk003iqieqkemrkeugd9au44st.apps.googleusercontent.com",
"client_id": "946635561974-nnn2bf2i67cm6ru7q002mtdih4uandpk.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.nith.appteam.nimbus",
"certificate_hash": "4fe28cfbfe79663bb883c8078e551127999a1b8c"
"certificate_hash": "0d761d951e9483e00f3f67afce6d132386621545"
}
},
{
"client_id": "88547491108-rn5n9lhpmt9rootp05es7h9ou7nan1jq.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.nith.appteam.nimbus",
"certificate_hash": "dd856e767db85312d495205a4d7239b76ada77c2"
}
},
{
"client_id": "88547491108-8m5ptmqvq7mgs01v4i09fvo2eupmemii.apps.googleusercontent.com",
"client_id": "946635561974-v4tl1fd5lgb3oqfndf5ailibpsmc277q.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyB6_eIIhI8nPoaylUWc_4TsoHy8TvdRdBY"
"current_key": "AIzaSyCl3J5r0-T4cKy20zaNMTXNwHwXf2GMqZg"
}
],
"services": {
Expand All @@ -48,7 +40,7 @@
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "88547491108-8m5ptmqvq7mgs01v4i09fvo2eupmemii.apps.googleusercontent.com",
"client_id": "946635561974-v4tl1fd5lgb3oqfndf5ailibpsmc277q.apps.googleusercontent.com",
"client_type": 3
}
]
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@
android:exported="true" />
<activity
android:name=".Activity.ProfileActivityEdit"
android:parentActivityName=".Activity.ProfileActivity"
android:exported="true" />
android:exported="true"
android:parentActivityName=".Activity.ProfileActivity" />
<activity
android:name=".Activity.NewsfeedTry"
android:exported="true"
Expand All @@ -215,7 +215,7 @@
android:name=".Activity.RegisterEvent"
android:parentActivityName=".Activity.TeamEventActivity" />
<activity android:name=".Activity.HomescreenNew" />

<activity android:name=".Activity.UserInfoActivity"></activity>
</application>

</manifest>
131 changes: 106 additions & 25 deletions app/src/main/java/com/nith/appteam/nimbus/Activity/FirebaseLoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@
import android.widget.TextView;
import android.widget.Toast;

import com.android.volley.AuthFailureError;
import com.android.volley.DefaultRetryPolicy;
import com.android.volley.NetworkResponse;
import com.android.volley.Request;
import com.android.volley.RequestQueue;
import com.android.volley.VolleyError;
import com.android.volley.VolleyLog;
import com.android.volley.toolbox.HttpHeaderParser;
import com.android.volley.toolbox.StringRequest;
import com.android.volley.toolbox.Volley;
import com.firebase.ui.auth.AuthUI;
import com.firebase.ui.auth.IdpResponse;
import com.google.firebase.auth.FirebaseAuth;
Expand All @@ -18,8 +28,14 @@
import com.nith.appteam.nimbus.R;
import com.nith.appteam.nimbus.Utils.SharedPref;
import com.nith.appteam.nimbus.Utils.Util;
import com.nith.appteam.nimbus.Utils.Volleycustom;

import org.json.JSONException;
import org.json.JSONObject;

import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;

import retrofit2.Call;
Expand All @@ -29,13 +45,15 @@
public class FirebaseLoginActivity extends AppCompatActivity {

private static final int RC_SIGN_IN = 138;

private String requestBody;
private Button loginBtn;
private ProgressBar progressBar;
private List<AuthUI.IdpConfig> providers;
private TextView textView;
private SharedPref sharedPref;

private JSONObject jsonObject1;
private String HashedValue;
private FirebaseUser user;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down Expand Up @@ -80,10 +98,72 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {

if (resultCode == RESULT_OK) {
// Successfully signed in
FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
user = FirebaseAuth.getInstance().getCurrentUser();
Log.d("pno.: ", user.getPhoneNumber());
Log.d("uid: ", user.getUid());
saveUserLoginData(user.getPhoneNumber(), user.getUid());
final JSONObject jsonObject = new JSONObject();
try {
jsonObject.put("mobile",user.getPhoneNumber());
jsonObject.put("firebase_id",user.getUid());
} catch (JSONException e) {
e.printStackTrace();
}
// Volleycustom volleycustom = new Volleycustom(this);
// String hashed_value = volleycustom.postsimpleJsonObject(jsonObject,"https://nimbus19.herokuapp.com/auth/signup");
// Toast.makeText(FirebaseLoginActivity.this,hashed_value,Toast.LENGTH_SHORT).show();
RequestQueue queue = Volley.newRequestQueue(this);
requestBody = jsonObject.toString();
StringRequest stringRequest = new StringRequest(Request.Method.POST,"https://nimbus19.herokuapp.com/auth/signup", new com.android.volley.Response.Listener<String>() {
@Override
public void onResponse(String response)
{
try {
jsonObject1 = new JSONObject(response);
} catch (JSONException e) {
e.printStackTrace();
}
try {
HashedValue = jsonObject1.getString("authId");
} catch (JSONException e) {
e.printStackTrace();
}
Toast.makeText(FirebaseLoginActivity.this,HashedValue,Toast.LENGTH_SHORT).show();
saveUserLoginData(user.getPhoneNumber(), user.getUid(),HashedValue);


}


}, new com.android.volley.Response.ErrorListener() {
@Override
public void onErrorResponse(VolleyError error) {
Log.e("VOLLEY", error.toString());
}
}) {
@Override
public String getBodyContentType() {
return "application/json; charset=utf-8";
}

@Override
public byte[] getBody() throws AuthFailureError {
try {
return requestBody == null ? null : requestBody.getBytes("utf-8");
} catch (UnsupportedEncodingException uee) {
VolleyLog.wtf("Unsupported Encoding while trying to get the bytes of %s using %s", requestBody, "utf-8");
return null;
}
}

@Override
protected com.android.volley.Response<String> parseNetworkResponse(NetworkResponse response) {
return super.parseNetworkResponse(response);
}
};
stringRequest.setRetryPolicy(new DefaultRetryPolicy(5000,
DefaultRetryPolicy.DEFAULT_MAX_RETRIES,
DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
queue.add(stringRequest);
} else {
// Sign in failed, check response for error code
Toast.makeText(this, "Login Failed", Toast.LENGTH_SHORT).show();
Expand All @@ -93,7 +173,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
}


private void saveUserLoginData(final String phone_no, String fb_id) {
private void saveUserLoginData(final String phone_no, String fb_id, final String hashedValue) {

Call<FirebaseLoginActivity.UserSentResponse> userSentResponseCall = Util.getRetrofitService().sendUserLoginData(phone_no, fb_id);
userSentResponseCall.enqueue(new Callback<FirebaseLoginActivity.UserSentResponse>() {
Expand All @@ -106,6 +186,7 @@ public void onResponse(Call<FirebaseLoginActivity.UserSentResponse> call, Respon
sharedPref.setSkipStatus(false);// as user has login succesfully and we make sure that screen does not come again
sharedPref.setUserId(userSentResponse.getUserId());
sharedPref.setUserPhone(phone_no);
sharedPref.setHashedValue(hashedValue);

if (userSentResponse.getBranch().isEmpty() || userSentResponse.getYear().isEmpty() || userSentResponse.getEmail().isEmpty() ||
userSentResponse.getName().isEmpty() || userSentResponse.getRoll_no().isEmpty()) {
Expand All @@ -114,29 +195,29 @@ public void onResponse(Call<FirebaseLoginActivity.UserSentResponse> call, Respon
}
else {

sharedPref.setUserBranch(userSentResponse.getBranch());
sharedPref.setUserYearPos(userSentResponse.getYear());
// sharePref.setUserYearText(userSentResponse.getYearText());
sharedPref.setUserEmail(userSentResponse.getEmail());
sharedPref.setUserName(userSentResponse.getName());
sharedPref.setUserRollno(userSentResponse.getRoll_no());
sharedPref.setProfileStatus(true);
Log.d("aa", userSentResponse.getBranch());
Log.d("bb", userSentResponse.getRoll_no());
Log.d("cc", userSentResponse.getName());
Log.d("dd", userSentResponse.getEmail());
}
sharedPref.setUserBranch(userSentResponse.getBranch());
sharedPref.setUserYearPos(userSentResponse.getYear());
// sharePref.setUserYearText(userSentResponse.getYearText());
sharedPref.setUserEmail(userSentResponse.getEmail());
sharedPref.setUserName(userSentResponse.getName());
sharedPref.setUserRollno(userSentResponse.getRoll_no());
sharedPref.setProfileStatus(true);
Log.d("aa", userSentResponse.getBranch());
Log.d("bb", userSentResponse.getRoll_no());
Log.d("cc", userSentResponse.getName());
Log.d("dd", userSentResponse.getEmail());
}

progressBar.setVisibility(View.GONE);
progressBar.setVisibility(View.GONE);

Intent intent = new Intent(FirebaseLoginActivity.this, HomescreenNew.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
finish();
} else{
Toast.makeText(FirebaseLoginActivity.this, "Check Internet connection", Toast.LENGTH_SHORT).show();
}
Intent intent = new Intent(FirebaseLoginActivity.this, UserInfoActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
finish();
} else{
Toast.makeText(FirebaseLoginActivity.this, "Check Internet connection", Toast.LENGTH_SHORT).show();
}
}


@Override
Expand Down
Loading