diff --git a/RI/build.gradle b/RI/build.gradle index ba441bd08..f6202b7e0 100644 --- a/RI/build.gradle +++ b/RI/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' android { + namespace 'com.gsma.rcs.ri' //Required to support the old folder structure sourceSets { @@ -8,7 +9,6 @@ android { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src'] resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] renderscript.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] @@ -20,12 +20,12 @@ android { //Required to support builds although lint errors exist lintOptions { abortOnError false - disable 'IconLocation' + disable 'IconLocation' disable 'IconDuplicates' - disable 'IconDuplicatesConfig' - disable 'IconColors' - disable 'IconMissingDensityFolder' - disable 'IconDensities' + disable 'IconDuplicatesConfig' + disable 'IconColors' + disable 'IconMissingDensityFolder' + disable 'IconDensities' } compileSdkVersion rootProject.compileSdkVersion @@ -42,17 +42,19 @@ android { } dependencies { - compile project(':api') - compile project(':api_cnx') - compile project(':mediaplayer') - compile 'com.android.support:support-v4:25.0.1' - compile 'com.google.android.gms:play-services:8.4.0' + implementation project(':api') + implementation project(':api_cnx') + implementation project(':mediaplayer') + implementation 'com.android.support:support-v4:25.0.1' + implementation 'com.google.android.gms:play-services:8.4.0' } //Below install dependecy was added to always install RCS service before //a RCS client to secure that Android handles RCS permissions correctly. -task installServiceFirst(dependsOn: ':core:installDebug') << { - println 'RCS core service was installed first!' +task installServiceFirst(dependsOn: ':core:installDebug') { + doLast { + println 'RCS core service was installed first!' + } } tasks.whenTaskAdded { task -> if (task.name == 'installDebug') { diff --git a/RI/src/com/gsma/rcs/ri/extension/messaging/MessagingSessionView.java b/RI/src/com/gsma/rcs/ri/extension/messaging/MessagingSessionView.java index 90a7b0505..0786a56e5 100644 --- a/RI/src/com/gsma/rcs/ri/extension/messaging/MessagingSessionView.java +++ b/RI/src/com/gsma/rcs/ri/extension/messaging/MessagingSessionView.java @@ -326,10 +326,8 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_close_session: - quitSession(); - break; + if (item.getItemId() == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/extension/streaming/StreamingSessionView.java b/RI/src/com/gsma/rcs/ri/extension/streaming/StreamingSessionView.java index 74086924a..f502045d8 100644 --- a/RI/src/com/gsma/rcs/ri/extension/streaming/StreamingSessionView.java +++ b/RI/src/com/gsma/rcs/ri/extension/streaming/StreamingSessionView.java @@ -344,10 +344,8 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_close_session: - quitSession(); - break; + if (item.getItemId() == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/messaging/GroupTalkView.java b/RI/src/com/gsma/rcs/ri/messaging/GroupTalkView.java index 26220d25d..cd4bac40b 100644 --- a/RI/src/com/gsma/rcs/ri/messaging/GroupTalkView.java +++ b/RI/src/com/gsma/rcs/ri/messaging/GroupTalkView.java @@ -643,46 +643,40 @@ public boolean onContextItemSelected(MenuItem item) { Log.d(LOGTAG, "onContextItemSelected Id=".concat(id)); } try { - switch (item.getItemId()) { - case R.id.menu_view_group_delivery: - GroupDeliveryInfoList.startActivity(this, id); - return true; - - case R.id.menu_delete_message: - if (ChatLog.Message.HISTORYLOG_MEMBER_ID == providerId) { - mChatService.deleteMessage(id); - } else { - mFileTransferService.deleteFileTransfer(id); - } + int itemId = item.getItemId(); + if (itemId == R.id.menu_view_group_delivery) { + GroupDeliveryInfoList.startActivity(this, id); + return true; + } else if (itemId == R.id.menu_delete_message) { + if (Message.HISTORYLOG_MEMBER_ID == providerId) { + mChatService.deleteMessage(id); + } else { + mFileTransferService.deleteFileTransfer(id); + } + return true; + } else if (itemId == R.id.menu_view_detail) { + if (Message.HISTORYLOG_MEMBER_ID == providerId) { + ChatMessageLogView.startActivity(this, id); + } else { + FileTransferLogView.startActivity(this, id); + } + return true; + } else if (itemId == R.id.menu_display_content) { + if (FileTransferLog.HISTORYLOG_MEMBER_ID == providerId) { + String file = cursor.getString(cursor + .getColumnIndexOrThrow(HistoryLog.CONTENT)); + Utils.showPicture(this, Uri.parse(file)); + markFileTransferAsRead(cursor, id); return true; - - case R.id.menu_view_detail: - if (ChatLog.Message.HISTORYLOG_MEMBER_ID == providerId) { - ChatMessageLogView.startActivity(this, id); - } else { - FileTransferLogView.startActivity(this, id); - } + } + } else if (itemId == R.id.menu_listen_content) { + if (FileTransferLog.HISTORYLOG_MEMBER_ID == providerId) { + String file = cursor.getString(cursor + .getColumnIndexOrThrow(HistoryLog.CONTENT)); + Utils.playAudio(this, Uri.parse(file)); + markFileTransferAsRead(cursor, id); return true; - - case R.id.menu_display_content: - if (FileTransferLog.HISTORYLOG_MEMBER_ID == providerId) { - String file = cursor.getString(cursor - .getColumnIndexOrThrow(HistoryLog.CONTENT)); - Utils.showPicture(this, Uri.parse(file)); - markFileTransferAsRead(cursor, id); - return true; - } - break; - - case R.id.menu_listen_content: - if (FileTransferLog.HISTORYLOG_MEMBER_ID == providerId) { - String file = cursor.getString(cursor - .getColumnIndexOrThrow(HistoryLog.CONTENT)); - Utils.playAudio(this, Uri.parse(file)); - markFileTransferAsRead(cursor, id); - return true; - } - break; + } } return super.onContextItemSelected(item); } catch (RcsServiceException e) { @@ -954,59 +948,45 @@ public boolean onPrepareOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { try { - switch (item.getItemId()) { - case R.id.menu_insert_smiley: - AlertDialog alert = Smileys.showSmileyDialog(this, mComposeText, - getResources(), getString(R.string.menu_insert_smiley)); - registerDialog(alert); - break; - - case R.id.menu_participants: - alert = Utils.showList(this, getString(R.string.menu_participants), - getSetOfParticipants(mGroupChat.getParticipants())); - registerDialog(alert); - break; - - case R.id.menu_add_participant: - addParticipants(); - break; - - case R.id.menu_quicktext: - addQuickText(); - break; - - case R.id.menu_send_file: - SendGroupFile.startActivity(this, mChatId); - break; - - case R.id.menu_send_geoloc: - getGeoLoc(); - break; - - case R.id.menu_showus_map: - DisplayGeoloc.showContactsOnMap(this, mGroupChat.getParticipants().keySet()); - break; - - case R.id.menu_close_session: - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.title_chat_exit); - builder.setPositiveButton(R.string.label_ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - if (mGroupChat != null) { - try { - mGroupChat.leave(); - } catch (RcsServiceException e) { - showExceptionThenExit(e); - } + int itemId = item.getItemId(); + if (itemId == R.id.menu_insert_smiley) { + AlertDialog alert = Smileys.showSmileyDialog(this, mComposeText, + getResources(), getString(R.string.menu_insert_smiley)); + registerDialog(alert); + } else if (itemId == R.id.menu_participants) { + AlertDialog alert; + alert = Utils.showList(this, getString(R.string.menu_participants), + getSetOfParticipants(mGroupChat.getParticipants())); + registerDialog(alert); + } else if (itemId == R.id.menu_add_participant) { + addParticipants(); + } else if (itemId == R.id.menu_quicktext) { + addQuickText(); + } else if (itemId == R.id.menu_send_file) { + SendGroupFile.startActivity(this, mChatId); + } else if (itemId == R.id.menu_send_geoloc) { + getGeoLoc(); + } else if (itemId == R.id.menu_showus_map) { + DisplayGeoloc.showContactsOnMap(this, mGroupChat.getParticipants().keySet()); + } else if (itemId == R.id.menu_close_session) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.title_chat_exit); + builder.setPositiveButton(R.string.label_ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + if (mGroupChat != null) { + try { + mGroupChat.leave(); + } catch (RcsServiceException e) { + showExceptionThenExit(e); } - GroupTalkView.this.finish(); } - }); - builder.setNegativeButton(R.string.label_cancel, null); - builder.setCancelable(true); - registerDialog(builder.show()); - break; + GroupTalkView.this.finish(); + } + }); + builder.setNegativeButton(R.string.label_cancel, null); + builder.setCancelable(true); + registerDialog(builder.show()); } } catch (RcsServiceException e) { diff --git a/RI/src/com/gsma/rcs/ri/messaging/OneToOneTalkView.java b/RI/src/com/gsma/rcs/ri/messaging/OneToOneTalkView.java index 47210a9ef..cc08a9c7f 100644 --- a/RI/src/com/gsma/rcs/ri/messaging/OneToOneTalkView.java +++ b/RI/src/com/gsma/rcs/ri/messaging/OneToOneTalkView.java @@ -628,20 +628,14 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { @Override public boolean onOptionsItemSelected(MenuItem item) { try { - switch (item.getItemId()) { - case R.id.menu_send_geoloc: - /* Start a new activity to select a geolocation */ - startActivityForResult(new Intent(this, EditGeoloc.class), SELECT_GEOLOCATION); - break; - - case R.id.menu_send_rcs_file: - SendSingleFile.startActivity(this, mContact); - break; - - case R.id.menu_delete_talk: - mFileTransferService.deleteOneToOneFileTransfers(mContact); - mChatService.deleteOneToOneChat(mContact); - break; + int itemId = item.getItemId(); + if (itemId == R.id.menu_send_geoloc) {/* Start a new activity to select a geolocation */ + startActivityForResult(new Intent(this, EditGeoloc.class), SELECT_GEOLOCATION); + } else if (itemId == R.id.menu_send_rcs_file) { + SendSingleFile.startActivity(this, mContact); + } else if (itemId == R.id.menu_delete_talk) { + mFileTransferService.deleteOneToOneFileTransfers(mContact); + mChatService.deleteOneToOneChat(mContact); } } catch (RcsServiceException e) { showExceptionThenExit(e); @@ -748,67 +742,58 @@ public boolean onContextItemSelected(MenuItem item) { Log.d(LOGTAG, "onContextItemSelected Id=".concat(id)); } try { - switch (item.getItemId()) { - case R.id.menu_delete_message: - switch (providerId) { - case ChatLog.Message.HISTORYLOG_MEMBER_ID: - mChatService.deleteMessage(id); - return true; - case FileTransferLog.HISTORYLOG_MEMBER_ID: - mFileTransferService.deleteFileTransfer(id); - return true; - } - break; - - case R.id.menu_resend_message: - switch (providerId) { - case ChatLog.Message.HISTORYLOG_MEMBER_ID: - OneToOneChat chat = mChatService.getOneToOneChat(mContact); - if (chat != null) { - chat.resendMessage(id); - } - return true; - - case FileTransferLog.HISTORYLOG_MEMBER_ID: - FileTransfer fileTransfer = mFileTransferService.getFileTransfer(id); - if (fileTransfer != null) { - fileTransfer.resendTransfer(); - } - return true; - } - break; - - case R.id.menu_display_content: - switch (providerId) { - case FileTransferLog.HISTORYLOG_MEMBER_ID: - String file = cursor.getString(cursor - .getColumnIndexOrThrow(HistoryLog.CONTENT)); - Utils.showPicture(this, Uri.parse(file)); - markFileTransferAsRead(cursor, id); - return true; - } - break; - - case R.id.menu_view_detail: - switch (providerId) { - case ChatLog.Message.HISTORYLOG_MEMBER_ID: - ChatMessageLogView.startActivity(this, id); - return true; - case FileTransferLog.HISTORYLOG_MEMBER_ID: - FileTransferLogView.startActivity(this, id); - return true; - } - break; + int itemId = item.getItemId(); + if (itemId == R.id.menu_delete_message) { + switch (providerId) { + case ChatLog.Message.HISTORYLOG_MEMBER_ID: + mChatService.deleteMessage(id); + return true; + case FileTransferLog.HISTORYLOG_MEMBER_ID: + mFileTransferService.deleteFileTransfer(id); + return true; + } + } else if (itemId == R.id.menu_resend_message) { + switch (providerId) { + case ChatLog.Message.HISTORYLOG_MEMBER_ID: + OneToOneChat chat = mChatService.getOneToOneChat(mContact); + if (chat != null) { + chat.resendMessage(id); + } + return true; - case R.id.menu_listen_content: - if (FileTransferLog.HISTORYLOG_MEMBER_ID == providerId) { + case FileTransferLog.HISTORYLOG_MEMBER_ID: + FileTransfer fileTransfer = mFileTransferService.getFileTransfer(id); + if (fileTransfer != null) { + fileTransfer.resendTransfer(); + } + return true; + } + } else if (itemId == R.id.menu_display_content) { + switch (providerId) { + case FileTransferLog.HISTORYLOG_MEMBER_ID: String file = cursor.getString(cursor .getColumnIndexOrThrow(HistoryLog.CONTENT)); - Utils.playAudio(this, Uri.parse(file)); + Utils.showPicture(this, Uri.parse(file)); markFileTransferAsRead(cursor, id); return true; - } - break; + } + } else if (itemId == R.id.menu_view_detail) { + switch (providerId) { + case ChatLog.Message.HISTORYLOG_MEMBER_ID: + ChatMessageLogView.startActivity(this, id); + return true; + case FileTransferLog.HISTORYLOG_MEMBER_ID: + FileTransferLogView.startActivity(this, id); + return true; + } + } else if (itemId == R.id.menu_listen_content) { + if (FileTransferLog.HISTORYLOG_MEMBER_ID == providerId) { + String file = cursor.getString(cursor + .getColumnIndexOrThrow(HistoryLog.CONTENT)); + Utils.playAudio(this, Uri.parse(file)); + markFileTransferAsRead(cursor, id); + return true; + } } return super.onContextItemSelected(item); diff --git a/RI/src/com/gsma/rcs/ri/messaging/TalkList.java b/RI/src/com/gsma/rcs/ri/messaging/TalkList.java index 5cfae12c7..73aaac0bc 100644 --- a/RI/src/com/gsma/rcs/ri/messaging/TalkList.java +++ b/RI/src/com/gsma/rcs/ri/messaging/TalkList.java @@ -152,21 +152,19 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { try { - switch (item.getItemId()) { - case R.id.menu_clear_log: - /* Delete all messages */ - if (!isServiceConnected(RcsServiceName.CHAT, RcsServiceName.FILE_TRANSFER)) { - showMessage(R.string.label_service_not_available); - break; - } - if (LogUtils.isActive) { - Log.d(LOGTAG, "delete conversations"); - } - mChatService.deleteOneToOneChats(); - mChatService.deleteGroupChats(); - mFileTransferService.deleteOneToOneFileTransfers(); - mFileTransferService.deleteGroupFileTransfers(); - break; + if (item.getItemId() == R.id.menu_clear_log) { + /* Delete all messages */ + if (!isServiceConnected(RcsServiceName.CHAT, RcsServiceName.FILE_TRANSFER)) { + showMessage(R.string.label_service_not_available); + return true; + } + if (LogUtils.isActive) { + Log.d(LOGTAG, "delete conversations"); + } + mChatService.deleteOneToOneChats(); + mChatService.deleteGroupChats(); + mFileTransferService.deleteOneToOneFileTransfers(); + mFileTransferService.deleteGroupFileTransfers(); } } catch (RcsServiceNotAvailableException e) { showMessage(R.string.label_service_not_available); @@ -195,27 +193,24 @@ public boolean onContextItemSelected(MenuItem item) { Log.d(LOGTAG, "onContextItemSelected chatId=".concat(chatId)); } try { - switch (item.getItemId()) { - case R.id.menu_delete_message: - if (!isServiceConnected(RcsServiceName.CHAT, RcsServiceName.FILE_TRANSFER)) { - showMessage(R.string.error_conversation_delete); - return true; - } - if (LogUtils.isActive) { - Log.d(LOGTAG, "Delete conversation for chatId=".concat(chatId)); - } - if (message.isGroupChat()) { - mChatService.deleteGroupChat(chatId); - mFileTransferService.deleteGroupFileTransfers(chatId); - } else { - mChatService.deleteOneToOneChat(contact); - mFileTransferService.deleteOneToOneFileTransfers(contact); - } + if (item.getItemId() == R.id.menu_delete_message) { + if (!isServiceConnected(RcsServiceName.CHAT, RcsServiceName.FILE_TRANSFER)) { + showMessage(R.string.error_conversation_delete); return true; - - default: - return super.onContextItemSelected(item); + } + if (LogUtils.isActive) { + Log.d(LOGTAG, "Delete conversation for chatId=".concat(chatId)); + } + if (message.isGroupChat()) { + mChatService.deleteGroupChat(chatId); + mFileTransferService.deleteGroupFileTransfers(chatId); + } else { + mChatService.deleteOneToOneChat(contact); + mFileTransferService.deleteOneToOneFileTransfers(contact); + } + return true; } + return super.onContextItemSelected(item); } catch (RcsServiceException e) { showExceptionThenExit(e); return true; @@ -262,12 +257,12 @@ public void onItemClick(AdapterView parent, View view, int position, long id) mOneToOneFileTransferListener = new OneToOneFileTransferListener() { @Override public void onStateChanged(ContactId contact, String transferId, - FileTransfer.State state, FileTransfer.ReasonCode reasonCode) { + FileTransfer.State state, FileTransfer.ReasonCode reasonCode) { } @Override public void onProgressUpdate(ContactId contact, String transferId, long currentSize, - long totalSize) { + long totalSize) { } @Override @@ -281,8 +276,8 @@ public void onDeleted(final ContactId contact, Set transferIds) { mOneToOneChatListener = new OneToOneChatListener() { @Override public void onMessageStatusChanged(ContactId contact, String mimeType, String msgId, - ChatLog.Message.Content.Status status, - ChatLog.Message.Content.ReasonCode reasonCode) { + ChatLog.Message.Content.Status status, + ChatLog.Message.Content.ReasonCode reasonCode) { } @Override @@ -300,17 +295,17 @@ public void onMessagesDeleted(final ContactId contact, Set msgIds) { mGroupFileTransferListener = new GroupFileTransferListener() { @Override public void onStateChanged(String chatId, String transferId, FileTransfer.State state, - FileTransfer.ReasonCode reasonCode) { + FileTransfer.ReasonCode reasonCode) { } @Override public void onDeliveryInfoChanged(String chatId, ContactId contact, String transferId, - GroupDeliveryInfo.Status status, GroupDeliveryInfo.ReasonCode reasonCode) { + GroupDeliveryInfo.Status status, GroupDeliveryInfo.ReasonCode reasonCode) { } @Override public void onProgressUpdate(String chatId, String transferId, long currentSize, - long totalSize) { + long totalSize) { } @Override @@ -324,7 +319,7 @@ public void onDeleted(String chatId, Set transferIds) { mGroupChatListener = new GroupChatListener() { @Override public void onStateChanged(String chatId, GroupChat.State state, - GroupChat.ReasonCode reasonCode) { + GroupChat.ReasonCode reasonCode) { } @Override @@ -333,19 +328,19 @@ public void onComposingEvent(String chatId, ContactId contact, boolean status) { @Override public void onMessageStatusChanged(String chatId, String mimeType, String msgId, - ChatLog.Message.Content.Status status, - ChatLog.Message.Content.ReasonCode reasonCode) { + ChatLog.Message.Content.Status status, + ChatLog.Message.Content.ReasonCode reasonCode) { } @Override public void onMessageGroupDeliveryInfoChanged(String chatId, ContactId contact, - String mimeType, String msgId, GroupDeliveryInfo.Status status, - GroupDeliveryInfo.ReasonCode reasonCode) { + String mimeType, String msgId, GroupDeliveryInfo.Status status, + GroupDeliveryInfo.ReasonCode reasonCode) { } @Override public void onParticipantStatusChanged(String chatId, ContactId contact, - GroupChat.ParticipantStatus status) { + GroupChat.ParticipantStatus status) { } @Override @@ -394,7 +389,7 @@ public void onTaskComplete(Collection talks) { /** * Notify new conversation event * - * @param ctx the context + * @param ctx the context * @param action the action intent */ public static void notifyNewConversationEvent(Context ctx, String action) { diff --git a/RI/src/com/gsma/rcs/ri/messaging/chat/SendFile.java b/RI/src/com/gsma/rcs/ri/messaging/chat/SendFile.java index f870d434a..509ef9633 100644 --- a/RI/src/com/gsma/rcs/ri/messaging/chat/SendFile.java +++ b/RI/src/com/gsma/rcs/ri/messaging/chat/SendFile.java @@ -273,14 +273,12 @@ public boolean onPrepareOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_record_audio: - startActivityForResult(new Intent(this, AudioMessageRecordActivity.class), - RC_RECORD_AUDIO); - break; - case R.id.menu_close_session: - quitSession(); - break; + int itemId = item.getItemId(); + if (itemId == R.id.menu_record_audio) { + startActivityForResult(new Intent(this, AudioMessageRecordActivity.class), + RC_RECORD_AUDIO); + } else if (itemId == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/messaging/filetransfer/InitiateFileTransfer.java b/RI/src/com/gsma/rcs/ri/messaging/filetransfer/InitiateFileTransfer.java index 73c463fa1..64ad60817 100644 --- a/RI/src/com/gsma/rcs/ri/messaging/filetransfer/InitiateFileTransfer.java +++ b/RI/src/com/gsma/rcs/ri/messaging/filetransfer/InitiateFileTransfer.java @@ -377,14 +377,12 @@ public boolean onPrepareOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_record_audio: - startActivityForResult(new Intent(this, AudioMessageRecordActivity.class), - RC_RECORD_AUDIO); - break; - case R.id.menu_close_session: - quitSession(); - break; + int itemId = item.getItemId(); + if (itemId == R.id.menu_record_audio) { + startActivityForResult(new Intent(this, AudioMessageRecordActivity.class), + RC_RECORD_AUDIO); + } else if (itemId == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/messaging/filetransfer/ReceiveFileTransfer.java b/RI/src/com/gsma/rcs/ri/messaging/filetransfer/ReceiveFileTransfer.java index a89687fed..1069f461e 100644 --- a/RI/src/com/gsma/rcs/ri/messaging/filetransfer/ReceiveFileTransfer.java +++ b/RI/src/com/gsma/rcs/ri/messaging/filetransfer/ReceiveFileTransfer.java @@ -386,10 +386,8 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_close_session: - quitSession(); - break; + if (item.getItemId() == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/messaging/filetransfer/multi/SendMultiFile.java b/RI/src/com/gsma/rcs/ri/messaging/filetransfer/multi/SendMultiFile.java index fcdfc40e8..f48acf859 100644 --- a/RI/src/com/gsma/rcs/ri/messaging/filetransfer/multi/SendMultiFile.java +++ b/RI/src/com/gsma/rcs/ri/messaging/filetransfer/multi/SendMultiFile.java @@ -326,10 +326,8 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_close_session: - quitSession(); - break; + if (item.getItemId() == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/sharing/SharingListView.java b/RI/src/com/gsma/rcs/ri/sharing/SharingListView.java index 695b7d918..279f58a76 100644 --- a/RI/src/com/gsma/rcs/ri/sharing/SharingListView.java +++ b/RI/src/com/gsma/rcs/ri/sharing/SharingListView.java @@ -475,61 +475,58 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_filter: - Builder builder = new Builder(this); - builder.setTitle(R.string.title_sharing_log_dialog_filter_logs); - builder.setMultiChoiceItems( - mFilterMenuItems.toArray(new CharSequence[mFilterMenuItems.size()]), - mCheckedProviders, new DialogInterface.OnMultiChoiceClickListener() { - public void onClick(DialogInterface dialog, int which, boolean isChecked) { - mCheckedProviders[which] = isChecked; - } - }); - builder.setPositiveButton(R.string.label_ok, new OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - mFilterAlertDialog.dismiss(); - queryHistoryLogAndRefreshView(); - } - }); - builder.setNegativeButton(R.string.label_cancel, new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - mFilterAlertDialog.dismiss(); - } - }); - mFilterAlertDialog = builder.show(); - registerDialog(mFilterAlertDialog); - break; - - case R.id.menu_delete: - if (!isServiceConnected(RcsServiceName.IMAGE_SHARING, RcsServiceName.VIDEO_SHARING, - RcsServiceName.GEOLOC_SHARING)) { - showMessage(R.string.label_service_not_available); - break; + int itemId = item.getItemId(); + if (itemId == R.id.menu_filter) { + Builder builder = new Builder(this); + builder.setTitle(R.string.title_sharing_log_dialog_filter_logs); + builder.setMultiChoiceItems( + mFilterMenuItems.toArray(new CharSequence[mFilterMenuItems.size()]), + mCheckedProviders, new DialogInterface.OnMultiChoiceClickListener() { + public void onClick(DialogInterface dialog, int which, boolean isChecked) { + mCheckedProviders[which] = isChecked; + } + }); + builder.setPositiveButton(R.string.label_ok, new OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + mFilterAlertDialog.dismiss(); + queryHistoryLogAndRefreshView(); } - Log.d(LOGTAG, "delete all image sharing sessions"); - try { - if (!mImageSharingListenerSet) { - mImageSharingService.addEventListener(mImageSharingListener); - mImageSharingListenerSet = true; - } - mImageSharingService.deleteImageSharings(); - if (!mVideoSharingListenerSet) { - mVideoSharingService.addEventListener(mVideoSharingListener); - mVideoSharingListenerSet = true; - } - mVideoSharingService.deleteVideoSharings(); - if (!mGeolocSharingListenerSet) { - mGeolocSharingService.addEventListener(mGeolocSharingListener); - mGeolocSharingListenerSet = true; - } - mGeolocSharingService.deleteGeolocSharings(); - } catch (RcsServiceException e) { - showExceptionThenExit(e); - + }); + builder.setNegativeButton(R.string.label_cancel, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + mFilterAlertDialog.dismiss(); } - break; + }); + mFilterAlertDialog = builder.show(); + registerDialog(mFilterAlertDialog); + } else if (itemId == R.id.menu_delete) { + if (!isServiceConnected(RcsServiceName.IMAGE_SHARING, RcsServiceName.VIDEO_SHARING, + RcsServiceName.GEOLOC_SHARING)) { + showMessage(R.string.label_service_not_available); + return true; + } + Log.d(LOGTAG, "delete all image sharing sessions"); + try { + if (!mImageSharingListenerSet) { + mImageSharingService.addEventListener(mImageSharingListener); + mImageSharingListenerSet = true; + } + mImageSharingService.deleteImageSharings(); + if (!mVideoSharingListenerSet) { + mVideoSharingService.addEventListener(mVideoSharingListener); + mVideoSharingListenerSet = true; + } + mVideoSharingService.deleteVideoSharings(); + if (!mGeolocSharingListenerSet) { + mGeolocSharingService.addEventListener(mGeolocSharingListener); + mGeolocSharingListenerSet = true; + } + mGeolocSharingService.deleteGeolocSharings(); + } catch (RcsServiceException e) { + showExceptionThenExit(e); + + } } return true; } @@ -570,43 +567,41 @@ public boolean onContextItemSelected(MenuItem item) { Log.d(LOGTAG, "onContextItemSelected sharing ID=".concat(sharingId)); } try { - switch (item.getItemId()) { - case R.id.menu_sharing_delete: - Log.d(LOGTAG, "Delete sharing ID=".concat(sharingId)); - switch (providerId) { - case ImageSharingLog.HISTORYLOG_MEMBER_ID: - if (!mImageSharingListenerSet) { - mImageSharingService.addEventListener(mImageSharingListener); - mImageSharingListenerSet = true; - } - mImageSharingService.deleteImageSharing(sharingId); - return true; - - case VideoSharingLog.HISTORYLOG_MEMBER_ID: - if (!mVideoSharingListenerSet) { - mVideoSharingService.addEventListener(mVideoSharingListener); - mVideoSharingListenerSet = true; - } - mVideoSharingService.deleteVideoSharing(sharingId); - return true; - case GeolocSharingLog.HISTORYLOG_MEMBER_ID: - if (!mGeolocSharingListenerSet) { - mGeolocSharingService.addEventListener(mGeolocSharingListener); - mGeolocSharingListenerSet = true; - } - mGeolocSharingService.deleteGeolocSharing(sharingId); - return true; - default: - return true; - } - case R.id.menu_sharing_display: - Utils.showPicture(this, Uri.parse(cursor.getString(cursor - .getColumnIndexOrThrow(HistoryLog.CONTENT)))); - return true; + int itemId = item.getItemId(); + if (itemId == R.id.menu_sharing_delete) { + Log.d(LOGTAG, "Delete sharing ID=".concat(sharingId)); + switch (providerId) { + case ImageSharingLog.HISTORYLOG_MEMBER_ID: + if (!mImageSharingListenerSet) { + mImageSharingService.addEventListener(mImageSharingListener); + mImageSharingListenerSet = true; + } + mImageSharingService.deleteImageSharing(sharingId); + return true; - default: - return super.onContextItemSelected(item); + case VideoSharingLog.HISTORYLOG_MEMBER_ID: + if (!mVideoSharingListenerSet) { + mVideoSharingService.addEventListener(mVideoSharingListener); + mVideoSharingListenerSet = true; + } + mVideoSharingService.deleteVideoSharing(sharingId); + return true; + case GeolocSharingLog.HISTORYLOG_MEMBER_ID: + if (!mGeolocSharingListenerSet) { + mGeolocSharingService.addEventListener(mGeolocSharingListener); + mGeolocSharingListenerSet = true; + } + mGeolocSharingService.deleteGeolocSharing(sharingId); + return true; + default: + return true; + } + } else if (itemId == R.id.menu_sharing_display) { + Utils.showPicture(this, Uri.parse(cursor.getString(cursor + .getColumnIndexOrThrow(HistoryLog.CONTENT)))); + return true; } + return super.onContextItemSelected(item); } catch (RcsServiceNotAvailableException e) { showMessage(R.string.label_service_not_available); return true; diff --git a/RI/src/com/gsma/rcs/ri/sharing/geoloc/InitiateGeolocSharing.java b/RI/src/com/gsma/rcs/ri/sharing/geoloc/InitiateGeolocSharing.java index 5a789bed4..fa2a932e9 100644 --- a/RI/src/com/gsma/rcs/ri/sharing/geoloc/InitiateGeolocSharing.java +++ b/RI/src/com/gsma/rcs/ri/sharing/geoloc/InitiateGeolocSharing.java @@ -185,10 +185,8 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_close_session: - quitSession(); - break; + if (item.getItemId() == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/sharing/geoloc/ReceiveGeolocSharing.java b/RI/src/com/gsma/rcs/ri/sharing/geoloc/ReceiveGeolocSharing.java index 6d286bf71..cfddd821c 100644 --- a/RI/src/com/gsma/rcs/ri/sharing/geoloc/ReceiveGeolocSharing.java +++ b/RI/src/com/gsma/rcs/ri/sharing/geoloc/ReceiveGeolocSharing.java @@ -216,10 +216,8 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_close_session: - quitSession(); - break; + if (item.getItemId() == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/sharing/image/InitiateImageSharing.java b/RI/src/com/gsma/rcs/ri/sharing/image/InitiateImageSharing.java index fae75bb68..5240e32d8 100644 --- a/RI/src/com/gsma/rcs/ri/sharing/image/InitiateImageSharing.java +++ b/RI/src/com/gsma/rcs/ri/sharing/image/InitiateImageSharing.java @@ -220,10 +220,8 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_close_session: - quitSession(); - break; + if (item.getItemId() == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/sharing/image/ReceiveImageSharing.java b/RI/src/com/gsma/rcs/ri/sharing/image/ReceiveImageSharing.java index 1762269ab..1c93f1dd1 100644 --- a/RI/src/com/gsma/rcs/ri/sharing/image/ReceiveImageSharing.java +++ b/RI/src/com/gsma/rcs/ri/sharing/image/ReceiveImageSharing.java @@ -243,10 +243,8 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_close_session: - quitSession(); - break; + if (item.getItemId() == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/sharing/video/IncomingVideoSharing.java b/RI/src/com/gsma/rcs/ri/sharing/video/IncomingVideoSharing.java index faf145943..d2b66e2d9 100644 --- a/RI/src/com/gsma/rcs/ri/sharing/video/IncomingVideoSharing.java +++ b/RI/src/com/gsma/rcs/ri/sharing/video/IncomingVideoSharing.java @@ -331,10 +331,8 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_close_session: - quitSession(); - break; + if (item.getItemId() == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/RI/src/com/gsma/rcs/ri/sharing/video/OutgoingVideoSharing.java b/RI/src/com/gsma/rcs/ri/sharing/video/OutgoingVideoSharing.java index 054a7e9ea..121cb1c8b 100644 --- a/RI/src/com/gsma/rcs/ri/sharing/video/OutgoingVideoSharing.java +++ b/RI/src/com/gsma/rcs/ri/sharing/video/OutgoingVideoSharing.java @@ -520,10 +520,8 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_close_session: - quitSession(); - break; + if (item.getItemId() == R.id.menu_close_session) { + quitSession(); } return true; } diff --git a/build.gradle b/build.gradle index 6dfdb01b8..d7b71dd4a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,20 +2,22 @@ buildscript { repositories { - jcenter() + google() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:8.13.0' } } allprojects { repositories { - jcenter() + google() + mavenCentral() } } project.ext.set("compileSdkVersion", 23) project.ext.set("minSdkVersion", 12) project.ext.set("targetSdkVersion", 23) -project.ext.set("buildToolsVersion", "24.0.0") +project.ext.set("buildToolsVersion", "35.0.0") diff --git a/core/build.gradle b/core/build.gradle index e0ef8c97b..7cbaf289b 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' android { + namespace 'com.gsma.rcs' //Required to support the old folder structure sourceSets { @@ -8,7 +9,6 @@ android { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src'] resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] renderscript.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] @@ -40,10 +40,10 @@ android { } dependencies { - compile project(':bouncycastle') - compile project(':nist_sip') - compile project(':api') - compile 'dnsjava:dnsjava:2.1.7' - compile 'com.android.support:support-v4:25.0.1' - compile 'com.android.support:appcompat-v7:25.0.1' + implementation project(':bouncycastle') + implementation project(':nist_sip') + implementation project(':api') + implementation 'dnsjava:dnsjava:2.1.7' + implementation 'com.android.support:support-v4:25.0.1' + implementation 'com.android.support:appcompat-v7:25.0.1' } diff --git a/core/src/com/gsma/rcs/provisioning/local/Provisioning.java b/core/src/com/gsma/rcs/provisioning/local/Provisioning.java index e7348062f..b700ccfd8 100644 --- a/core/src/com/gsma/rcs/provisioning/local/Provisioning.java +++ b/core/src/com/gsma/rcs/provisioning/local/Provisioning.java @@ -159,32 +159,28 @@ protected void onDestroy() { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.save: - if (sLogger.isActivated()) { - sLogger.debug("Save provisioning"); - } - for (IProvisioningFragment fragment : mAdapter.getFragments()) { - fragment.persistRcsSettings(); - } - Toast.makeText(this, getString(R.string.label_reboot_service), Toast.LENGTH_LONG) - .show(); - return true; - - case R.id.load: - if (sLogger.isActivated()) { - sLogger.debug("Load provisioning"); - } - loadXmlFile(); - return true; - - case R.id.about: - displayInfo(); - return true; - - default: - return super.onOptionsItemSelected(item); + int itemId = item.getItemId(); + if (itemId == R.id.save) { + if (sLogger.isActivated()) { + sLogger.debug("Save provisioning"); + } + for (IProvisioningFragment fragment : mAdapter.getFragments()) { + fragment.persistRcsSettings(); + } + Toast.makeText(this, getString(R.string.label_reboot_service), Toast.LENGTH_LONG) + .show(); + return true; + } else if (itemId == R.id.load) { + if (sLogger.isActivated()) { + sLogger.debug("Load provisioning"); + } + loadXmlFile(); + return true; + } else if (itemId == R.id.about) { + displayInfo(); + return true; } + return super.onOptionsItemSelected(item); } /** diff --git a/core/tests/AndroidManifest.xml b/core/tests/AndroidManifest.xml index f2b8acba5..c07959e5e 100644 --- a/core/tests/AndroidManifest.xml +++ b/core/tests/AndroidManifest.xml @@ -1,8 +1,7 @@ - +