Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor editgroup #970

Merged
merged 9 commits into from
Sep 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/main/deltachat/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,35 @@ const windows = require('../windows')
const { app } = require('electron')

const publicAccessibleMethods = [
'addContactToChat',
'archiveChat',
'blockContact',
'chatWithContact',
'createGroupChat',
'contactRequests',
'createChatByContactId',
'createContact',
'deleteChat',
'deleteMessage',
'fetchMessages',
'forwardMessage',
'getConfigFor',
'getContacts',
'getContacts2',
'getEncryptionInfo',
'getLocations',
'getQrCode',
'leaveGroup',
'modifyGroup',
'setChatName',
'setChatProfileImage',
'addContactToChat',
'leaveGroup',
'selectChat',
'sendMessage',
'setDraft',
'showArchivedChats',
'unblockContact',
'updateBlockedContacts',
'updateChatList',
'getConfigFor',
'createChatByContactId',
'createContact'
'updateChatList'
]

/**
Expand Down
4 changes: 0 additions & 4 deletions src/renderer/ScreenController.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const { ipcRenderer } = require('electron')
const ScreenContext = require('./contexts/ScreenContext')
const UnblockContacts = require('./components/UnblockContacts')
const LoginScreen = require('./components/LoginScreen').default
const EditGroup = require('./components/EditGroup')
const SplittedChatListAndView = require('./components/SplittedChatListAndView')
const dialogs = require('./components/dialogs')

Expand Down Expand Up @@ -92,9 +91,6 @@ class ScreenController extends React.Component {

var Screen
switch (screen) {
case 'EditGroup':
Screen = EditGroup
break
case 'UnblockContacts':
Screen = UnblockContacts
break
Expand Down
57 changes: 0 additions & 57 deletions src/renderer/components/EditGroup.js

This file was deleted.

214 changes: 0 additions & 214 deletions src/renderer/components/GroupBase.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/renderer/components/Menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function DeltaMenu (props) {
let chatMenu = <div />

const onCreateChat = () => screenContext.openDialog('CreateChat', {})
const onEditGroup = () => screenContext.changeScreen('EditGroup', { chat: selectedChat })
const onEditGroup = () => screenContext.openDialog('EditGroup', { chat: selectedChat })
const onLeaveGroup = () => openLeaveChatDialog(screenContext, selectedChat.id)
const onArchiveChat = archive => archiveChat(selectedChat.id, archive)
const onBlockContact = () => openBlockContactDialog(screenContext, selectedChat)
Expand Down
Loading