gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-13 15:54:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tag v3.2.6

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	app/build.gradle
This commit is contained in:
Mario Danic 2019-02-15 18:17:55 +01:00
parent b9c7f8f409
commit aff99e15d0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -17,8 +17,8 @@ android {
targetSdkVersion 28 targetSdkVersion 28
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionCode 120 versionCode 85
versionName "3.2.3" versionName "3.2.6"
flavorDimensions "default" flavorDimensions "default"
renderscriptTargetApi 19 renderscriptTargetApi 19

2
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -215,7 +215,7 @@ public class CallController extends BaseController {
roomId = args.getString(BundleKeys.KEY_ROOM_ID, ""); roomId = args.getString(BundleKeys.KEY_ROOM_ID, "");
roomToken = args.getString(BundleKeys.KEY_ROOM_TOKEN, ""); roomToken = args.getString(BundleKeys.KEY_ROOM_TOKEN, "");
conversationUser = Parcels.unwrap(args.getParcelable(BundleKeys.KEY_USER_ENTITY)); conversationUser = args.getParcelable(BundleKeys.KEY_USER_ENTITY);
if (conversationUser == null) { if (conversationUser == null) {
conversationUser = userUtils.getCurrentUser(); conversationUser = userUtils.getCurrentUser();