Skip to content

I
InstiLostAndFound
Commit 64c2533d authored by ankitasingh's avatar ankitasingh
Browse files
Options

email activities bug fixes minor

parent 8b889445
Show whitespace changes
Inline Side-by-side
Showing with 96 additions and 88 deletions
.idea/workspace.xml
View file @ 64c2533d
......@@ -9,9 +9,7 @@
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component>
<component name="ChangeListManager">
<list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemClaim.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_item_claim.xml" afterDir="false" />
<list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="email activities working">
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
......@@ -19,21 +17,10 @@
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_activation_activation_1_1_jar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_mail_javax_mail_api_1_5_3_jar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Config.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Config.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_email.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_email.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -59,6 +46,18 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="77">
<caret line="30" column="41" lean-forward="true" selection-start-line="30" selection-start-column="41" selection-end-line="30" selection-end-column="41" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_claim.xml">
<provider editor-type-id="android-designer2" />
......@@ -69,6 +68,15 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_email.xml">
<provider selected="true" editor-type-id="android-designer2" />
......@@ -91,18 +99,20 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemClaim.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645">
<state relative-caret-position="343">
<caret line="56" column="55" selection-start-line="56" selection-start-column="55" selection-end-line="56" selection-end-column="55" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_navigation.xml">
<provider editor-type-id="android-designer2" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-8">
<caret line="5" column="35" lean-forward="true" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
<state relative-caret-position="90">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -110,8 +120,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="56" column="94" selection-start-line="56" selection-start-column="94" selection-end-line="56" selection-end-column="94" />
<state relative-caret-position="266">
<caret line="53" column="32" selection-start-line="53" selection-start-column="32" selection-end-line="53" selection-end-column="32" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -120,28 +130,20 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-633">
<caret line="24" column="25" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_navigation.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335">
<caret line="132" column="34" lean-forward="true" selection-start-line="132" selection-start-column="34" selection-end-line="132" selection-end-column="34" />
<state relative-caret-position="-8">
<caret line="5" column="35" lean-forward="true" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
<caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
<state relative-caret-position="-633">
<caret line="24" column="25" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="25" />
</state>
</provider>
</entry>
......@@ -240,7 +242,6 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java" />
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" />
......@@ -249,6 +250,7 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_email.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemClaim.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Config.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java" />
</list>
</option>
......@@ -616,7 +618,14 @@
<option name="project" value="LOCAL" />
<updated>1574481815784</updated>
</task>
<option name="localTasksCounter" value="16" />
<task id="LOCAL-00016" summary="email activities working">
<created>1574493516786</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1574493516786</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers />
</component>
<component name="ToolWindowManager">
......@@ -635,7 +644,7 @@
<window_info anchor="bottom" id="Run" order="0" weight="0.32928944" />
<window_info anchor="bottom" id="Logcat" order="1" weight="0.32928944" />
<window_info anchor="bottom" id="TODO" order="2" />
<window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.064124785" />
<window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.112651646" />
<window_info anchor="bottom" id="Terminal" order="4" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50121456" side_tool="true" weight="0.25996533" />
<window_info anchor="bottom" id="Version Control" order="6" weight="0.40069085" />
......@@ -741,7 +750,8 @@
<MESSAGE value="Edit bug fix and small UI changes" />
<MESSAGE value="email activities" />
<MESSAGE value="email activities email fragment changes" />
<option name="LAST_COMMIT_MESSAGE" value="email activities email fragment changes" />
<MESSAGE value="email activities working" />
<option name="LAST_COMMIT_MESSAGE" value="email activities working" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/item_divider.xml" />
......@@ -811,16 +821,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
......@@ -932,13 +932,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-617">
......@@ -1002,43 +995,60 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_email.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="36" column="41" lean-forward="true" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_claim.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="158" column="43" selection-start-line="158" selection-start-column="43" selection-end-line="158" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="62" column="53" selection-start-line="62" selection-start-column="53" selection-end-line="62" selection-end-column="53" />
<state relative-caret-position="105">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemClaim.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343">
<caret line="56" column="55" selection-start-line="56" selection-start-column="55" selection-end-line="56" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_claim.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="158" column="43" selection-start-line="158" selection-start-column="43" selection-end-line="158" selection-end-column="43" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_email.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="36" column="41" lean-forward="true" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemClaim.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645">
<caret line="56" column="55" selection-start-line="56" selection-start-column="55" selection-end-line="56" selection-end-column="55" />
<state relative-caret-position="77">
<caret line="30" column="41" lean-forward="true" selection-start-line="30" selection-start-column="41" selection-end-line="30" selection-end-column="41" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="56" column="94" selection-start-line="56" selection-start-column="94" selection-end-line="56" selection-end-column="94" />
<state relative-caret-position="266">
<caret line="53" column="32" selection-start-line="53" selection-start-column="32" selection-end-line="53" selection-end-column="32" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......
app/src/main/java/com/example/instilostandfound/SendMail.java
View file @ 64c2533d
......@@ -2,6 +2,7 @@ package com.example.instilostandfound;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
import android.widget.Toast;
......@@ -27,7 +28,7 @@ public class SendMail extends AsyncTask<Void, Void, Void> {
public SendMail(Context context, String email, String subject, String message) {
this.context = context;
this.email = email;
this.email = email+"@iitb.ac.in";
this.subject = subject;
this.message = message;
}
......@@ -44,6 +45,11 @@ public class SendMail extends AsyncTask<Void, Void, Void> {
super.onPostExecute(aVoid);
progressDialog.dismiss();
Toast.makeText(context, "Message Sent", Toast.LENGTH_LONG).show();
Intent intent = new Intent(this.context, NewsFeedFound.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.putExtra("username", email);
context.startActivity(intent);
}
@Override
......
app/src/main/java/com/example/instilostandfound/emailFragment.java
View file @ 64c2533d
......@@ -51,7 +51,7 @@ public class emailFragment extends Fragment implements View.OnClickListener {
}
private void sendEmail() {
String email = username +"@iitb.ac.in";
String email = username ;
String subject = "Regarding posted item in Lost and Found App " + itemname;
String autoMsg = "\n\nThis is an auto generated email. Please do not reply to this email.";
String message = editTextMessage.getText().toString().trim() + "\n\nsent by ldap user : " + username +"@iitb.ac.in" + autoMsg;
......@@ -75,11 +75,7 @@ public class emailFragment extends Fragment implements View.OnClickListener {
public void onClick(DialogInterface dialog, int which) {
sendEmail();
editTextMessage.setText("");
Intent intent = new Intent(getActivity(), NewsFeedFound.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.putExtra("username", username);
startActivity(intent);
dialog.dismiss();
//dialog.dismiss();
}
});
......@@ -89,11 +85,7 @@ public class emailFragment extends Fragment implements View.OnClickListener {
public void onClick(DialogInterface dialog, int which) {
editTextMessage.setText("");
Toast.makeText(getActivity(),"Message Discarded", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(getActivity(), NewsFeedFound.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.putExtra("username", username);
startActivity(intent);
dialog.dismiss();
// dialog.dismiss();
}
});
......
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