Эх сурвалжийг харах

added option to move messages, cc and bcc viewer

Simon Hammer 3 жил өмнө
parent
commit
60603fa33e

+ 2 - 11
app/src/main/java/com/noahvogt/miniprojekt/DataBase/EmailRepository.java

@@ -61,23 +61,14 @@ public class EmailRepository {
     }
 
     public void deleteMessage(final Message message){
-       /* new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... voids) {
-                db.MessageDao().deleteMessage(message);
-                return null;
-            }
-        }.execute();
-
-        */
         EmailRoomDatabase.databaseWriteExecutor.execute(() -> {
             messageDao.delete(message);
         });
     }
 
-    public void updateMessage(final Message message){
+    public void updateMessage(final int id, String folder){
         EmailRoomDatabase.databaseWriteExecutor.execute(() -> {
-            messageDao.updateMessage(message);
+            messageDao.updateMessage(id ,folder);
         });
     }
 }

+ 0 - 5
app/src/main/java/com/noahvogt/miniprojekt/DataBase/Message.java

@@ -5,11 +5,6 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-import java.util.Objects;
-
 /* @Embedded to express entitys together
  *  https://developer.android.com/training/data-storage/room/relationships
  * to learn more */

+ 2 - 2
app/src/main/java/com/noahvogt/miniprojekt/DataBase/MessageDao.java

@@ -25,8 +25,8 @@ public interface MessageDao {
     @Delete(entity = Message.class)
     void delete(Message message);
 
-    @Update(entity = Message.class)
-    void updateMessage(Message message);
+    @Query("UPDATE message_table SET folder = :folder WHERE id = :id")
+    void updateMessage(int id, String folder);
 
     @Query("DELETE FROM message_table WHERE subject='DELETE'")
     void deleteNewMessage();

+ 0 - 6
app/src/main/java/com/noahvogt/miniprojekt/MessageCreateFragment.java

@@ -256,12 +256,6 @@ public class MessageCreateFragment extends DialogFragment implements PopupMenu.O
             case R.id.create_message_spam:
                 Toast.makeText(getActivity(), "item 2 clicked", Toast.LENGTH_LONG).show();
                 return true;
-            case R.id.create_message_move_to:
-                Toast.makeText(getActivity(), "item 3 clicked", Toast.LENGTH_LONG).show();
-                return true;
-            case R.id.create_message_sent_to:
-                Toast.makeText(getActivity(), "item 4 clicked", Toast.LENGTH_LONG).show();
-                return true;
             default: /* this case should never occur */
                 return false;
         }

+ 1 - 1
app/src/main/java/com/noahvogt/miniprojekt/data/EmailViewModel.java

@@ -46,5 +46,5 @@ public class EmailViewModel extends AndroidViewModel {
 
     public void deleteMessage(Message message){mEmailRepository.deleteMessage(message);}
 
-    public void updateMessage(Message message){mEmailRepository.updateMessage(message);}
+    public void updateMessage(int id, String folder){mEmailRepository.updateMessage(id, folder);}
 }

+ 6 - 6
app/src/main/java/com/noahvogt/miniprojekt/ui/show/MessageShowFragment.java

@@ -149,13 +149,13 @@ public class MessageShowFragment extends DialogFragment implements PopupMenu.OnM
                 return true;
             case R.id.create_message_spam:
                 Toast.makeText(getActivity(), "item spam clicked", Toast.LENGTH_LONG).show();
+                mEmailViewModel.updateMessage(mCurrent.getId(), "Spam");
                 return true;
-            case R.id.create_message_sent_to:
-                Toast.makeText(getActivity(), "item sent to clicked", Toast.LENGTH_LONG).show();
-                return true;
-            case R.id.create_message_move_to:
-                Toast.makeText(getActivity(), "item move to clicked", Toast.LENGTH_LONG).show();
-                return true;
+            case R.id.create_message_move_archive:
+                Toast.makeText(getActivity(), "item archive clicked", Toast.LENGTH_LONG).show();
+                mEmailViewModel.updateMessage(mCurrent.getId(), "Archive");
+
+
             default: // this case should never occur
                 return false;
         }

+ 4 - 4
app/src/main/res/menu/create_message_options_menu.xml

@@ -4,10 +4,10 @@
         android:title="@string/menu_spam"/>
     <item android:id="@+id/create_message_delete"
         android:title="@string/menu_delete"/>
-    <item android:id="@+id/create_message_sent_to"
-        android:title="@string/menu_sent_to"/>
-    <item android:id="@+id/create_message_move_to"
-        android:title="@string/menu_move_to"/>
+    <!--item android:id="@+id/create_message_sent_to"
+        android:title="@string/menu_sent_to"/-->
+    <!--item android:id="@+id/create_message_move_to"
+        android:title="@string/menu_move_to"/-->
     <item android:id="@+id/create_message_move_archive"
         android:title="@string/menu_move_archive"/>
 </menu>

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -25,7 +25,7 @@
     <string name="show_message">Message</string>
     <string name="show_cc">See CC</string>
     <string name="show_bcc">See BCC</string>
-    <string name="show_date">Message received at:</string>
+    <string name="show_date">Message received at: </string>
 
     <string name="menu_delete">Delete</string>
     <string name="menu_move_to">Move to</string>