Skip to content

2
20_21-J03
Commit 2134e13a authored by Vyshna-Sri's avatar Vyshna-Sri
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 411c76e5 723959f4
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 107 deletions
app/build.gradle
View file @ 2134e13a
......@@ -7,7 +7,7 @@ android {
defaultConfig {
applicationId "com.elearning.probabilityandstatisticsanalyserandeducator"
multiDexEnabled true
python{
pip{
install "numpy"
......@@ -63,6 +63,10 @@ android {
dependencies {
implementation fileTree(dir: 'libs', includes: ['*.jar'])
compile 'com.alimuzaffar.lib:pinentryedittext:1.3.1'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
......@@ -75,6 +79,9 @@ dependencies {
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation files('libs\\activation.jar')
implementation files('libs\\additional.jar')
implementation files('libs\\mail.jar')
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.rmtheis:tess-two:5.4.1'
......@@ -82,9 +89,6 @@ dependencies {
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.6.0'
implementation 'com.opencsv:opencsv:4.6'
//implementation 'javax.mail:javax.mail-api:1.5.3'
}
\ No newline at end of file
app/src/main/AndroidManifest.xml
View file @ 2134e13a
......@@ -13,6 +13,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission
android:name="android.permission.CAMERA"
android:required="true"
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/Welcome.java
View file @ 2134e13a
......@@ -18,6 +18,7 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
import static android.Manifest.permission.INTERNET;
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
import static android.Manifest.permission.RECORD_AUDIO;
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
......@@ -40,7 +41,7 @@ public class Welcome extends AppCompatActivity {
setContentView(R.layout.activity_welcome);
// Requesting the Initial permission to use the application on first start
ActivityCompat.requestPermissions(this, new String[]{RECORD_AUDIO, WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE}, PackageManager.PERMISSION_GRANTED);
ActivityCompat.requestPermissions(this, new String[]{RECORD_AUDIO, WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE, INTERNET}, PackageManager.PERMISSION_GRANTED);
signUp = findViewById(R.id.btn_signup);
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/verification_screen.java
View file @ 2134e13a
......@@ -2,32 +2,52 @@ package com.elearning.probabilityandstatisticsanalyserandeducator;
import androidx.appcompat.app.AppCompatActivity;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.text.Html;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import com.alimuzaffar.lib.pin.PinEntryEditText;
import com.elearning.probabilityandstatisticsanalyserandeducator.adaptiveLearning.QuizDbHelper;
import org.apache.commons.lang3.ObjectUtils;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.HashMap;
import java.util.Properties;
import java.util.Random;
//import javax.mail.Authenticator;
//import javax.mail.Message;
//import javax.mail.MessagingException;
//import javax.mail.PasswordAuthentication;
//import javax.mail.Session;
//import javax.mail.internet.InternetAddress;
//import javax.mail.internet.MimeMessage;
import javax.mail.Authenticator;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.PasswordAuthentication;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
public class verification_screen extends AppCompatActivity {
String eSubject, eMessage, sEmail, sPassword, eUserEmail;
PinEntryEditText pinEntry;
int OTP =0;
Connection con;
DBConnection dbConnection;
Connection con;
@SuppressLint("WrongViewCast")
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -53,59 +73,160 @@ public class verification_screen extends AppCompatActivity {
sEmail = "probabilitystatitcs.corner@gmail.com";
sPassword = "admin121";
eSubject = "Please Confirm Your Email Address for Probability and Statistics analyzer and Educator ";
eMessage = Integer.toString(OTP);
//Initialize Properties
Properties properties = new Properties();
properties.put("mail.smtp.auth", "true");
properties.put("mail.smtp.starttls.enable", "true");
properties.put("mail.smtp.host", "smtp.gmail.com");
properties.put("mail.smtp.port", "587");
// properties.put("mail.smtp.ssl.trust", "smtp.gmail.com");
/* //Initialize session
Session session = Session.getInstance(properties, new Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(sEmail,sPassword);
}
});
//Initialize session
Session session = Session.getInstance(properties, new Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(sEmail,sPassword);
}
});
try{
//Initialize email content
Message message = new MimeMessage(session);
try {
//Initialize email content
Message message = new MimeMessage(session);
//Sender email
message.setFrom(new InternetAddress(sEmail));
//Sender email
message.setFrom(new InternetAddress(sEmail));
//Recipient email
message.setRecipients(Message.RecipientType.TO,InternetAddress.parse(eUserEmail.trim()));
System.out.println("userEmail"+eUserEmail);
//Recipient email
message.setRecipients(Message.RecipientType.TO,InternetAddress.parse(eUserEmail.trim()));
System.out.println("userEmail"+eUserEmail);
//Email subject
message.setText(eSubject.toString().trim());
//Email subject
message.setSubject(eSubject);
System.out.println("subject "+eSubject);
//Email message
message.setText(eMessage.toString().trim());
//Email message
message.setText(eMessage);
System.out.println("eMessage in email"+eMessage);
//send email
new SendMail().execute(message);
//send email
new SendMail().execute(message);
}catch (MessagingException e){
} catch (MessagingException e) {
e.printStackTrace();
}
}
public class SendMail extends AsyncTask<Message, String, String>{
//Initialize progress dialog
private ProgressDialog ProgressDialog;
@Override
protected void onPreExecute() {
super.onPreExecute();
//create and show progress dialog
ProgressDialog = ProgressDialog.show(verification_screen.this,"Sending Mail......",
"Confirm Your Verification Message", true, false);
System.out.println("email send"+ProgressDialog);
}
// class Initialization
dbConnection = new DBConnection();
//getting DB connection
con = dbConnection.getConnection();
@Override
protected String doInBackground(Message... messages) {
try {
//When success
Transport.send(messages[0]);
System.out.println("success msg.......");
return "Success";
} catch (MessagingException e) {
//When error
e.printStackTrace();
System.out.println("error msg.......");
return "Error";
}
}
@Override
protected void onPostExecute(String s) {
super.onPostExecute(s);
//Dismiss progress dialog
ProgressDialog.dismiss();
if (s.equals("Success")) {
//when success
//Initialize alert dialog
AlertDialog.Builder builder = new AlertDialog.Builder(verification_screen.this);
builder.setCancelable(false);
builder.setTitle(Html.fromHtml("<font color = '#509324'>Success</font>"));
builder.setMessage("Please Check Your Email to Verify User Account");
builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.dismiss();
}
});
//show alert dialog
builder.show();
}else{
//when error
Toast.makeText(getApplicationContext(),
"Something went Wrong..........",Toast.LENGTH_LONG).show();
}
pinEntry = (PinEntryEditText) findViewById(R.id.txt_pin_entry);
if (pinEntry != null) {
pinEntry.setOnPinEnteredListener(new PinEntryEditText.OnPinEnteredListener() {
@Override
public void onPinEntered(CharSequence str) {
if (str.toString().equals(eMessage)) {
Toast.makeText(verification_screen.this, "SUCCESS", Toast.LENGTH_SHORT).show();
System.out.println("emessage Success"+eMessage);
QuizDbHelper quizDbHelper = new QuizDbHelper();
try {
//-------- 3rd Try Catch block -----
//Execute SELECT query from DB
String query = "UPDATE dbo.User_Table set is_Active=1 where firstName = ?";
Statement st = con.createStatement();
ResultSet rst = st.executeQuery(query);
while(rst.next()){
// newUserID = rst.getInt("userID");
}
}catch (Exception e){
e.printStackTrace();
}
}
private class SendMail {
public void execute(Message message) {
}*/
} else {
Toast.makeText(verification_screen.this, "FAIL", Toast.LENGTH_SHORT).show();
pinEntry.setText(null);
}
}
});
}
}
}
}
\ No newline at end of file
app/src/main/res/layout/activity_verification_screen.xml
View file @ 2134e13a
......@@ -32,71 +32,18 @@
android:textColor="@color/ic_launcher_uploadPhoto_background"
android:textSize="18dp" />
<LinearLayout
<com.alimuzaffar.lib.pin.PinEntryEditText
android:id="@+id/txt_pin_entry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:orientation="horizontal"
android:paddingLeft="25dp"
android:paddingRight="25dp">
<EditText
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_weight="1"
android:background="#00FFFFFF "
android:focusable="true"
android:inputType="number"
android:maxLength="1"
android:textSize="30dp"
android:gravity="center"
android:textStyle="bold"
android:textColor="@android:color/white" />
<EditText
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_marginLeft="8dp"
android:layout_weight="1"
android:background="#00FFFFFF "
android:focusable="true"
android:inputType="number"
android:maxLength="1"
android:textSize="30dp"
android:gravity="center"
android:textStyle="bold"
android:textColor="@android:color/white" />
<EditText
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_marginLeft="8dp"
android:layout_weight="1"
android:background="#00FFFFFF "
android:focusable="true"
android:inputType="number"
android:maxLength="1"
android:textSize="30dp"
android:gravity="center"
android:textStyle="bold"
android:textColor="@android:color/white" />
<EditText
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_marginLeft="8dp"
android:layout_weight="1"
android:background="#00FFFFFF "
android:focusable="true"
android:inputType="number"
android:maxLength="1"
android:textStyle="bold"
android:textSize="30dp"
android:gravity="center"
android:textColor="@android:color/white" />
</LinearLayout>
android:cursorVisible="false"
android:digits="1234567890"
android:inputType="number"
android:maxLength="4"
android:textIsSelectable="false"
android:textSize="20sp"
app:pinAnimationType="popIn"
/>
</LinearLayout>
......
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 to comment