Skip to content

Krishna Vemulavada / vera_2.1_app

Go to a project
Commit a4b21be6 by Krishna Vemulawada
Options

logout issue reslove

parent 0b9ca7bc
Expand all
Inline Side-by-side
Showing with 43 additions and 71 deletions
app/build.gradle
...@@ -72,7 +72,7 @@ android { ...@@ -72,7 +72,7 @@ android {
vportal { vportal {
applicationId "com.vsoft.vera.vportal" applicationId "com.vsoft.vera.vportal"
versionCode 1 versionCode 1
versionName "0.1.4" versionName "0.1.5"
} }
} }
} }
......
app/src/main/java/com/vsoft/vera/ui/ADALActivity.java
...@@ -83,6 +83,7 @@ public class ADALActivity extends AppCompatActivity { ...@@ -83,6 +83,7 @@ public class ADALActivity extends AppCompatActivity {
private static final int API_SUCCESS_USER_DETAIL = 3; private static final int API_SUCCESS_USER_DETAIL = 3;
private static final int API_FAIL_USER_DETAIL = 4; private static final int API_FAIL_USER_DETAIL = 4;
private List<UserApiValues> mUserDetails; private List<UserApiValues> mUserDetails;
private ProgressDialog mProgressDlg;
/* Azure AD Constants */ /* Azure AD Constants */
/* Authority is in the form of https://login.microsoftonline.com/yourtenant.onmicrosoft.com */ /* Authority is in the form of https://login.microsoftonline.com/yourtenant.onmicrosoft.com */
...@@ -140,6 +141,7 @@ public class ADALActivity extends AppCompatActivity { ...@@ -140,6 +141,7 @@ public class ADALActivity extends AppCompatActivity {
setContentView(R.layout.adal_main); setContentView(R.layout.adal_main);
mainLayt = (LinearLayout) findViewById(R.id.activity_main); mainLayt = (LinearLayout) findViewById(R.id.activity_main);
logo_banner = findViewById(R.id.logo_banner);
Glide.with(this).load(R.drawable.fulton_bg).into(new SimpleTarget<Drawable>() { Glide.with(this).load(R.drawable.fulton_bg).into(new SimpleTarget<Drawable>() {
@Override @Override
public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) { public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
...@@ -162,14 +164,16 @@ public class ADALActivity extends AppCompatActivity { ...@@ -162,14 +164,16 @@ public class ADALActivity extends AppCompatActivity {
callGraphButton = (Button) findViewById(R.id.callGraph); callGraphButton = (Button) findViewById(R.id.callGraph);
signOutButton = (Button) findViewById(R.id.clearCache); signOutButton = (Button) findViewById(R.id.clearCache);
login_with_otp = (Button) findViewById(R.id.login_with_otp); login_with_otp = (Button) findViewById(R.id.login_with_otp);
logo_banner = findViewById(R.id.logo_banner);
callGraphButton.setOnClickListener(new View.OnClickListener() { callGraphButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
if (NetworkConnectivity.haveNetworkConnection(ADALActivity.this)) { if (NetworkConnectivity.haveNetworkConnection(ADALActivity.this)) {
onCallGraphClicked(); onCallGraphClicked();
} else { } else {
DialogUtils.showNoConnectionDialog(ADALActivity .this); DialogUtils.showNoConnectionDialog(ADALActivity .this);
} }
...@@ -275,6 +279,12 @@ public class ADALActivity extends AppCompatActivity { ...@@ -275,6 +279,12 @@ public class ADALActivity extends AppCompatActivity {
} }
private void callGraphAPI() { private void callGraphAPI() {
mProgressDlg = new ProgressDialog(ADALActivity.this);
mProgressDlg.setMessage(getString(R.string.loading_string));
mProgressDlg.show();
mProgressDlg.setCancelable(false);
Log.d(TAG, "Starting volley request to graph"); Log.d(TAG, "Starting volley request to graph");
/* Make sure we have a token to send to graph */ /* Make sure we have a token to send to graph */
...@@ -292,6 +302,7 @@ public class ADALActivity extends AppCompatActivity { ...@@ -292,6 +302,7 @@ public class ADALActivity extends AppCompatActivity {
parameters,new Response.Listener<JSONObject>() { parameters,new Response.Listener<JSONObject>() {
@Override @Override
public void onResponse(JSONObject response) { public void onResponse(JSONObject response) {
mProgressDlg.dismiss();
/* Successfully called graph, process data and send to UI */ /* Successfully called graph, process data and send to UI */
Log.d(TAG, "Response: " + response.toString()); Log.d(TAG, "Response: " + response.toString());
JSONObject root = null; JSONObject root = null;
...@@ -315,6 +326,7 @@ public class ADALActivity extends AppCompatActivity { ...@@ -315,6 +326,7 @@ public class ADALActivity extends AppCompatActivity {
}, new Response.ErrorListener() { }, new Response.ErrorListener() {
@Override @Override
public void onErrorResponse(VolleyError error) { public void onErrorResponse(VolleyError error) {
mProgressDlg.dismiss();
Log.d(TAG, "Error: " + error.toString()); Log.d(TAG, "Error: " + error.toString());
} }
}) { }) {
...@@ -361,10 +373,8 @@ public class ADALActivity extends AppCompatActivity { ...@@ -361,10 +373,8 @@ public class ADALActivity extends AppCompatActivity {
private void updateSuccessUI() { private void updateSuccessUI() {
// Called on success from /me endpoint // Called on success from /me endpoint
// Removed call Graph API button and paint Sign out // Removed call Graph API button and paint Sign out
callGraphButton.setVisibility(View.GONE);
signOutButton.setVisibility(View.GONE); signOutButton.setVisibility(View.GONE);
login_with_otp.setVisibility(View.GONE);
logo_banner.setVisibility(View.GONE);
findViewById(R.id.welcome).setVisibility(View.GONE); findViewById(R.id.welcome).setVisibility(View.GONE);
((TextView) findViewById(R.id.welcome)).setText("Welcome, " + ((TextView) findViewById(R.id.welcome)).setText("Welcome, " +
mAuthResult.getUserInfo().getGivenName()); mAuthResult.getUserInfo().getGivenName());
...@@ -412,10 +422,9 @@ public class ADALActivity extends AppCompatActivity { ...@@ -412,10 +422,9 @@ public class ADALActivity extends AppCompatActivity {
} }
/* Successfully got a token, call graph now */ /* Successfully got a token, call graph now */
Log.d(TAG, "Successfully authenticated"); Log.d(TAG, "Successfully authenticated");
callGraphButton.setVisibility(View.GONE);
signOutButton.setVisibility(View.GONE);
login_with_otp.setVisibility(View.GONE);
logo_banner.setVisibility(View.GONE);
/* Store the mAuthResult */ /* Store the mAuthResult */
mAuthResult = authenticationResult; mAuthResult = authenticationResult;
......
app/src/main/java/com/vsoft/vera/ui/ChatActivity.java
...@@ -11,8 +11,10 @@ import android.database.sqlite.SQLiteDatabase; ...@@ -11,8 +11,10 @@ import android.database.sqlite.SQLiteDatabase;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.os.Handler; import android.os.Handler;
...@@ -43,9 +45,12 @@ import android.view.inputmethod.EditorInfo; ...@@ -43,9 +45,12 @@ import android.view.inputmethod.EditorInfo;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.transition.Transition;
import com.github.nkzawa.emitter.Emitter; import com.github.nkzawa.emitter.Emitter;
import com.github.nkzawa.socketio.client.Socket; import com.github.nkzawa.socketio.client.Socket;
import com.vsoft.vera.CatalogueApplication; import com.vsoft.vera.CatalogueApplication;
...@@ -174,6 +179,7 @@ public class ChatActivity extends AppCompatActivity implements OnDSListener, OnD ...@@ -174,6 +179,7 @@ public class ChatActivity extends AppCompatActivity implements OnDSListener, OnD
private static final String HTTPS = "https://"; private static final String HTTPS = "https://";
private static final String HTTP = "http://"; private static final String HTTP = "http://";
private LinearLayout mainLayt;
@Override @Override
...@@ -181,6 +187,15 @@ public class ChatActivity extends AppCompatActivity implements OnDSListener, OnD ...@@ -181,6 +187,15 @@ public class ChatActivity extends AppCompatActivity implements OnDSListener, OnD
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.chat_activity); setContentView(R.layout.chat_activity);
mainLayt = (LinearLayout) findViewById(R.id.chat_activity_main);
Glide.with(this).load(R.drawable.chat_back_bg).into(new SimpleTarget<Drawable>() {
@Override
public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
mainLayt.setBackground(resource);
}
}
});
mLoggedInUserSysId = PrefManager.getSharedPref(this, PrefManager.PREFERENCE_USER_SYS_ID); mLoggedInUserSysId = PrefManager.getSharedPref(this, PrefManager.PREFERENCE_USER_SYS_ID);
mLoggedInUsername = PrefManager.getSharedPref(this, PrefManager.PREFERENCE_USER_FIRST_NAME); mLoggedInUsername = PrefManager.getSharedPref(this, PrefManager.PREFERENCE_USER_FIRST_NAME);
......
app/src/main/res/layout/activity_login.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/activity_main_login"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scrollbarStyle="insideOverlay"> android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="@dimen/normal_margin"
android:orientation="vertical">
<ImageView </LinearLayout>
android:layout_width="wrap_content" \ No newline at end of file
android:layout_height="wrap_content"
android:visibility="visible"
android:background="@drawable/ic_login_banner" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="100dp"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/login_with_sso"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/normal_margin"
android:layout_marginLeft="@dimen/extra_large_margin"
android:layout_marginRight="@dimen/extra_large_margin"
android:layout_marginTop="30dp"
android:background="@drawable/login_bg"
android:gravity="center"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin"
android:text="Login with ADAL"
android:textColor="@android:color/white"
android:textSize="@dimen/large_text_size" />
<TextView
android:id="@+id/login_with_otp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/normal_margin"
android:layout_marginLeft="@dimen/extra_large_margin"
android:layout_marginRight="@dimen/extra_large_margin"
android:layout_marginTop="30dp"
android:background="@drawable/login_bg"
android:gravity="center"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin"
android:text="Login with otp"
android:textColor="@android:color/white"
android:textSize="@dimen/large_text_size" />
</LinearLayout>
</LinearLayout>
</ScrollView>
\ No newline at end of file
app/src/main/res/layout/chat_activity.xml
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/LightBackgroundStyle" style="@style/LightBackgroundStyle"
android:id="@+id/chat_activity_main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@drawable/chat_back_bg"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context=".ui.ChatActivity"> tools:context=".ui.ChatActivity">
......
app/vportal/staging/app-vportal-staging.apk
The file could not be displayed because it is too large.
app/vportal/staging/output.json
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1.4","enabled":true,"outputFile":"app-vportal-staging.apk","fullName":"vportalStaging","baseName":"vportal-staging"},"path":"app-vportal-staging.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1.5","enabled":true,"outputFile":"app-vportal-staging.apk","fullName":"vportalStaging","baseName":"vportal-staging"},"path":"app-vportal-staging.apk","properties":{}}]
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment