Tidying up Authenticate activity
This commit is contained in:
@@ -85,19 +85,6 @@ public class AuthenticateActivity extends AppCompatActivity {
|
|||||||
mWac = mConnection.mSdServer.mLm.mWac;
|
mWac = mConnection.mSdServer.mLm.mWac;
|
||||||
}
|
}
|
||||||
|
|
||||||
//public void authCallback(boolean authSuccess, String tokenStr) {
|
|
||||||
//Log.v(TAG,"authCallback");
|
|
||||||
// updateUi();
|
|
||||||
//}
|
|
||||||
|
|
||||||
public void eventCallback(boolean success, String eventStr) {
|
|
||||||
Log.v(TAG,"eventCallback");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void datapointCallback(boolean success, String datapointStr) {
|
|
||||||
Log.v(TAG,"datapointCallback");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateUi() {
|
private void updateUi() {
|
||||||
SharedPreferences prefs;
|
SharedPreferences prefs;
|
||||||
String storedAuthToken;
|
String storedAuthToken;
|
||||||
@@ -146,8 +133,13 @@ public class AuthenticateActivity extends AppCompatActivity {
|
|||||||
mWac.authenticate(uname,passwd, (String retVal) -> {
|
mWac.authenticate(uname,passwd, (String retVal) -> {
|
||||||
if (retVal != null) {
|
if (retVal != null) {
|
||||||
Log.d(TAG,"Authentication Success - token is "+retVal);
|
Log.d(TAG,"Authentication Success - token is "+retVal);
|
||||||
|
mUtil.showToast("Login Successful");
|
||||||
saveAuthToken(retVal);
|
saveAuthToken(retVal);
|
||||||
updateUi();
|
updateUi();
|
||||||
|
} else {
|
||||||
|
Log.e(TAG,"onOk: Authentication failure for "+uname+", "+passwd);
|
||||||
|
mUtil.showToast("ERROR: Authentication Failed - Please Try Again");
|
||||||
|
mUtil.writeToSysLogFile("AuthActivity - Authorisation failed for "+uname+", "+passwd);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
//finish();
|
//finish();
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/cancel" />
|
android:text="@string/back" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/OKBtn"
|
android:id="@+id/OKBtn"
|
||||||
|
|||||||
@@ -325,4 +325,5 @@
|
|||||||
<string name="selectFromOptionselow">"-- select option --"</string>
|
<string name="selectFromOptionselow">"-- select option --"</string>
|
||||||
<string name="waitingForData">...waiting for data...</string>
|
<string name="waitingForData">...waiting for data...</string>
|
||||||
<string name="refreshBtn">Refresh</string>
|
<string name="refreshBtn">Refresh</string>
|
||||||
|
<string name="back">Back</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user