Fix import from common_mail_detail file
This commit is contained in:
parent
12675ceefb
commit
ac0546c4f9
|
@ -14,8 +14,10 @@ import state
|
|||
from bitmessagekivy.baseclass.common import (
|
||||
showLimitedCnt, toast, ThemeClsColor,
|
||||
avatarImageFirstLetter, CutsomSwipeToDeleteItem,
|
||||
ShowTimeHistoy, mail_detail_screen
|
||||
ShowTimeHistoy
|
||||
)
|
||||
from bitmessagekivy.baseclass.common_mail_detail import mail_detail_screen
|
||||
|
||||
from bitmessagekivy.baseclass.maildetail import MailDetail
|
||||
# from bitmessagekivy.baseclass.trash import Trash
|
||||
|
||||
|
|
|
@ -25,10 +25,10 @@ from bitmessagekivy import kivy_helper_search
|
|||
from bitmessagekivy.baseclass.common import (
|
||||
showLimitedCnt, toast, ThemeClsColor, mdlist_message_content,
|
||||
SwipeToDeleteItem, ShowTimeHistoy, empty_screen_label,
|
||||
mail_detail_screen
|
||||
)
|
||||
from kivy.app import App
|
||||
|
||||
from bitmessagekivy.baseclass.common_mail_detail import mail_detail_screen
|
||||
from bitmessagekivy.baseclass.maildetail import MailDetail
|
||||
from bitmessagekivy.baseclass.draft_widgets import HelperDraft
|
||||
|
||||
|
|
|
@ -66,13 +66,13 @@ class Trash(Screen):
|
|||
"SELECT toaddress, fromaddress, subject, message,"
|
||||
" folder ||',' || 'sent' as folder, ackdata As"
|
||||
" id, DATE(senttime) As actionTime, senttime as msgtime FROM sent"
|
||||
" WHERE folder = 'trash' and fromaddress = '{0}' UNION"
|
||||
" WHERE folder = 'trash' and fromaddress = ? UNION"
|
||||
" SELECT toaddress, fromaddress, subject, message,"
|
||||
" folder ||',' || 'inbox' as folder, msgid As id,"
|
||||
" DATE(received) As actionTime, received as msgtime FROM inbox"
|
||||
" WHERE folder = 'trash' and toaddress = '{0}'"
|
||||
" ORDER BY actionTime DESC limit {1}, {2}".format(
|
||||
state.association, start_indx, end_indx))
|
||||
" WHERE folder = 'trash' and toaddress = ?"
|
||||
" ORDER BY actionTime DESC limit ?, ?",
|
||||
state.association, state.association, start_indx, end_indx)
|
||||
|
||||
def set_TrashCnt(self, Count): # pylint: disable=no-self-use
|
||||
"""This method is used to set trash message count"""
|
||||
|
|
Reference in New Issue
Block a user