gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix cleanup

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-12 15:59:09 +01:00
parent e6cef58837
commit a0763be26b
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -939,10 +939,7 @@ public class CallActivity extends AppCompatActivity {
private void deleteMagicPeerConnection(MagicPeerConnectionWrapper magicPeerConnectionWrapper) { private void deleteMagicPeerConnection(MagicPeerConnectionWrapper magicPeerConnectionWrapper) {
if (magicPeerConnectionWrapper.getPeerConnection() != null) { magicPeerConnectionWrapper.removePeerConnection(magicPeerConnectionWrapperList.size() == 1);
magicPeerConnectionWrapper.removeMediaStream();
magicPeerConnectionWrapper.getPeerConnection().close();
}
magicPeerConnectionWrapperList.remove(magicPeerConnectionWrapper); magicPeerConnectionWrapperList.remove(magicPeerConnectionWrapper);
} }
@ -1209,8 +1206,6 @@ public class CallActivity extends AppCompatActivity {
MagicPeerConnectionWrapper magicPeerConnectionWrapper; MagicPeerConnectionWrapper magicPeerConnectionWrapper;
if ((magicPeerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId)) != null) { if ((magicPeerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId)) != null) {
runOnUiThread(() -> removeMediaStream(sessionId)); runOnUiThread(() -> removeMediaStream(sessionId));
magicPeerConnectionWrapper.removeMediaStream();
magicPeerConnectionWrapper.removePeerConnection();
deleteMagicPeerConnection(magicPeerConnectionWrapper); deleteMagicPeerConnection(magicPeerConnectionWrapper);
} }
} }

14
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -178,7 +178,7 @@ public class SettingsController extends BaseController {
true); true);
if (!TextUtils.isEmpty(getResources().getString(R.string.nc_gpl3_url))) { if (!TextUtils.isEmpty(getResources().getString(R.string.nc_gpl3_url))) {
licenceButton.setOnClickListener(view1 -> { licenceButton.addPreferenceClickListener(view1 -> {
sourceCodeButton.setEnabled(false); sourceCodeButton.setEnabled(false);
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getResources(). Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getResources().
getString(R.string.nc_gpl3_url))); getString(R.string.nc_gpl3_url)));
@ -190,7 +190,7 @@ public class SettingsController extends BaseController {
} }
if (!TextUtils.isEmpty(getResources().getString(R.string.nc_privacy_url))) { if (!TextUtils.isEmpty(getResources().getString(R.string.nc_privacy_url))) {
privacyButton.setOnClickListener(view12 -> { privacyButton.addPreferenceClickListener(view12 -> {
sourceCodeButton.setEnabled(false); sourceCodeButton.setEnabled(false);
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getResources(). Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getResources().
getString(R.string.nc_privacy_url))); getString(R.string.nc_privacy_url)));
@ -202,7 +202,7 @@ public class SettingsController extends BaseController {
} }
if (!TextUtils.isEmpty(getResources().getString(R.string.nc_source_code_url))) { if (!TextUtils.isEmpty(getResources().getString(R.string.nc_source_code_url))) {
sourceCodeButton.setOnClickListener(view13 -> { sourceCodeButton.addPreferenceClickListener(view13 -> {
sourceCodeButton.setEnabled(false); sourceCodeButton.setEnabled(false);
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getResources(). Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getResources().
getString(R.string.nc_source_code_url))); getString(R.string.nc_source_code_url)));
@ -216,14 +216,14 @@ public class SettingsController extends BaseController {
versionInfo.setSummary("v" + BuildConfig.VERSION_NAME); versionInfo.setSummary("v" + BuildConfig.VERSION_NAME);
addAccountButton.setOnClickListener(view15 -> { addAccountButton.addPreferenceClickListener(view15 -> {
addAccountButton.setEnabled(false); addAccountButton.setEnabled(false);
getParentController().getRouter().pushController(RouterTransaction.with(new getParentController().getRouter().pushController(RouterTransaction.with(new
ServerSelectionController()).pushChangeHandler(new VerticalChangeHandler()) ServerSelectionController()).pushChangeHandler(new VerticalChangeHandler())
.popChangeHandler(new VerticalChangeHandler())); .popChangeHandler(new VerticalChangeHandler()));
}); });
switchAccountButton.setOnClickListener(view16 -> { switchAccountButton.addPreferenceClickListener(view16 -> {
switchAccountButton.setEnabled(false); switchAccountButton.setEnabled(false);
getParentController().getRouter().pushController(RouterTransaction.with(new getParentController().getRouter().pushController(RouterTransaction.with(new
SwitchAccountController()).pushChangeHandler(new VerticalChangeHandler()) SwitchAccountController()).pushChangeHandler(new VerticalChangeHandler())
@ -255,7 +255,7 @@ public class SettingsController extends BaseController {
baseUrlTextView.setText(userEntity.getBaseUrl()); baseUrlTextView.setText(userEntity.getBaseUrl());
reauthorizeButton.setOnClickListener(view14 -> { reauthorizeButton.addPreferenceClickListener(view14 -> {
reauthorizeButton.setEnabled(false); reauthorizeButton.setEnabled(false);
getParentController().getRouter().pushController(RouterTransaction.with( getParentController().getRouter().pushController(RouterTransaction.with(
new WebViewLoginController(userEntity.getBaseUrl(), true)) new WebViewLoginController(userEntity.getBaseUrl(), true))
@ -317,7 +317,7 @@ public class SettingsController extends BaseController {
removeAccountButton.setEnabled(true); removeAccountButton.setEnabled(true);
removeAccountButton.setOnClickListener(view1 -> { removeAccountButton.addPreferenceClickListener(view1 -> {
removeAccountButton.setEnabled(false); removeAccountButton.setEnabled(false);
cookieManager.getCookieStore().removeAll(); cookieManager.getCookieStore().removeAll();
boolean otherUserExists = userUtils.scheduleUserForDeletionWithId(userEntity.getId()); boolean otherUserExists = userUtils.scheduleUserForDeletionWithId(userEntity.getId());

11
app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
View File

@ -92,13 +92,14 @@ public class MagicPeerConnectionWrapper {
} }
} }
public void removePeerConnection() { public void removePeerConnection(boolean isFinal) {
peerConnection.close();
peerConnection = null;
}
public void removeMediaStream() {
if (peerConnection != null && localMediaStream != null) { if (peerConnection != null && localMediaStream != null) {
peerConnection.close();
peerConnection.removeStream(localMediaStream); peerConnection.removeStream(localMediaStream);
if (isFinal) {
peerConnection.dispose();
}
peerConnection = null;
} }
} }