yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 01:39:18 +02:00
Code Issues Releases Wiki Activity

rename calls package

Browse source
This commit is contained in:
adbenitez 2025-09-30 16:29:47 +02:00
parent 4e6e805ede
commit 4b9217e3e6
7 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/AndroidManifest.xml
View file

@ -371,7 +371,7 @@
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
</activity> </activity>
<activity android:name=".videochat.VideochatActivity" <activity android:name=".calls.CallActivity"
android:label="" android:label=""
android:theme="@style/TextSecure.LightTheme" android:theme="@style/TextSecure.LightTheme"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"

4
src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -117,7 +117,7 @@ import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
import org.thoughtcrime.securesms.util.guava.Optional; import org.thoughtcrime.securesms.util.guava.Optional;
import org.thoughtcrime.securesms.util.views.ProgressDialog; import org.thoughtcrime.securesms.util.views.ProgressDialog;
import org.thoughtcrime.securesms.video.recode.VideoRecoder; import org.thoughtcrime.securesms.video.recode.VideoRecoder;
import org.thoughtcrime.securesms.videochat.VideochatUtil; import org.thoughtcrime.securesms.calls.CallUtil;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@ -543,7 +543,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
WebxdcActivity.openMaps(this, chatId); WebxdcActivity.openMaps(this, chatId);
return true; return true;
} else if (itemId == R.id.menu_start_call) { } else if (itemId == R.id.menu_start_call) {
VideochatUtil.startCall(this, chatId); CallUtil.startCall(this, chatId);
return true; return true;
} else if (itemId == R.id.menu_all_media) { } else if (itemId == R.id.menu_all_media) {
handleAllMedia(); handleAllMedia();

2
src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
View file

@ -65,7 +65,7 @@ import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.ViewUtil;
import org.thoughtcrime.securesms.util.views.ConversationAdaptiveActionsToolbar; import org.thoughtcrime.securesms.util.views.ConversationAdaptiveActionsToolbar;
import org.thoughtcrime.securesms.videochat.VideochatUtil; import org.thoughtcrime.securesms.calls.CallUtil;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;

6
src/main/java/org/thoughtcrime/securesms/ConversationItem.java
View file

@ -70,7 +70,7 @@ import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.ViewUtil;
import org.thoughtcrime.securesms.util.views.Stub; import org.thoughtcrime.securesms.util.views.Stub;
import org.thoughtcrime.securesms.videochat.VideochatUtil; import org.thoughtcrime.securesms.calls.CallUtil;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -996,9 +996,9 @@ public class ConversationItem extends BaseConversationItem
int chatId = messageRecord.getChatId(); int chatId = messageRecord.getChatId();
if (!messageRecord.isOutgoing() && callInfo.state instanceof CallState.Alerting) { if (!messageRecord.isOutgoing() && callInfo.state instanceof CallState.Alerting) {
int callId = messageRecord.getId(); int callId = messageRecord.getId();
VideochatUtil.openCall(getContext(), accId, chatId, callId, callInfo.sdpOffer); CallUtil.openCall(getContext(), accId, chatId, callId, callInfo.sdpOffer);
} else { } else {
VideochatUtil.startCall(getContext(), accId, chatId); CallUtil.startCall(getContext(), accId, chatId);
} }
} }
} }

8
src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java → src/main/java/org/thoughtcrime/securesms/calls/CallActivity.java
View file

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.videochat; package org.thoughtcrime.securesms.calls;
import android.Manifest; import android.Manifest;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
@ -36,8 +36,8 @@ import java.util.Objects;
import chat.delta.rpc.Rpc; import chat.delta.rpc.Rpc;
import chat.delta.rpc.RpcException; import chat.delta.rpc.RpcException;
public class VideochatActivity extends WebViewActivity implements DcEventCenter.DcEventDelegate { public class CallActivity extends WebViewActivity implements DcEventCenter.DcEventDelegate {
private static final String TAG = VideochatActivity.class.getSimpleName(); private static final String TAG = CallActivity.class.getSimpleName();
public static final String EXTRA_ACCOUNT_ID = "acc_id"; public static final String EXTRA_ACCOUNT_ID = "acc_id";
public static final String EXTRA_CHAT_ID = "chat_id"; public static final String EXTRA_CHAT_ID = "chat_id";
@ -190,7 +190,7 @@ public class VideochatActivity extends WebViewActivity implements DcEventCenter.
@JavascriptInterface @JavascriptInterface
public String getAvatar() { public String getAvatar() {
final Context context = VideochatActivity.this; final Context context = CallActivity.this;
final DcChat dcChat = dcContext.getChat(chatId); final DcChat dcChat = dcContext.getChat(chatId);
if (!TextUtils.isEmpty(dcChat.getProfileImage())) { if (!TextUtils.isEmpty(dcChat.getProfileImage())) {
return AvatarUtil.asDataUri(dcChat.getProfileImage()); return AvatarUtil.asDataUri(dcChat.getProfileImage());

24
src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java → src/main/java/org/thoughtcrime/securesms/calls/CallUtil.java
View file

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.videochat; package org.thoughtcrime.securesms.calls;
import android.Manifest; import android.Manifest;
import android.app.Activity; import android.app.Activity;
@ -15,8 +15,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
public class VideochatUtil { public class CallUtil {
private static final String TAG = VideochatUtil.class.getSimpleName(); private static final String TAG = CallUtil.class.getSimpleName();
public static void startCall(Activity activity, int chatId) { public static void startCall(Activity activity, int chatId) {
Permissions.with(activity) Permissions.with(activity)
@ -31,11 +31,11 @@ public class VideochatUtil {
} }
public static void startCall(Context context, int accId, int chatId) { public static void startCall(Context context, int accId, int chatId) {
Intent intent = new Intent(context, VideochatActivity.class); Intent intent = new Intent(context, CallActivity.class);
intent.setAction(Intent.ACTION_VIEW); intent.setAction(Intent.ACTION_VIEW);
intent.putExtra(VideochatActivity.EXTRA_ACCOUNT_ID, accId); intent.putExtra(CallActivity.EXTRA_ACCOUNT_ID, accId);
intent.putExtra(VideochatActivity.EXTRA_CHAT_ID, chatId); intent.putExtra(CallActivity.EXTRA_CHAT_ID, chatId);
intent.putExtra(VideochatActivity.EXTRA_HASH, "#startCall"); intent.putExtra(CallActivity.EXTRA_HASH, "#startCall");
context.startActivity(intent); context.startActivity(intent);
} }
@ -48,12 +48,12 @@ public class VideochatUtil {
Log.e(TAG, "Error", e); Log.e(TAG, "Error", e);
} }
Intent intent = new Intent(context, VideochatActivity.class); Intent intent = new Intent(context, CallActivity.class);
intent.setAction(Intent.ACTION_VIEW); intent.setAction(Intent.ACTION_VIEW);
intent.putExtra(VideochatActivity.EXTRA_ACCOUNT_ID, accId); intent.putExtra(CallActivity.EXTRA_ACCOUNT_ID, accId);
intent.putExtra(VideochatActivity.EXTRA_CHAT_ID, chatId); intent.putExtra(CallActivity.EXTRA_CHAT_ID, chatId);
intent.putExtra(VideochatActivity.EXTRA_CALL_ID, callId); intent.putExtra(CallActivity.EXTRA_CALL_ID, callId);
intent.putExtra(VideochatActivity.EXTRA_HASH, hash); intent.putExtra(CallActivity.EXTRA_HASH, hash);
context.startActivity(intent); context.startActivity(intent);
} }

12
src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
View file

@ -49,7 +49,7 @@ import org.thoughtcrime.securesms.util.JsonUtils;
import org.thoughtcrime.securesms.util.Pair; import org.thoughtcrime.securesms.util.Pair;
import org.thoughtcrime.securesms.util.Prefs; import org.thoughtcrime.securesms.util.Prefs;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.videochat.VideochatActivity; import org.thoughtcrime.securesms.calls.CallActivity;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.math.BigInteger; import java.math.BigInteger;
@ -178,12 +178,12 @@ public class NotificationCenter {
Log.e(TAG, "Error", e); Log.e(TAG, "Error", e);
} }
Intent intent = new Intent(context, VideochatActivity.class); Intent intent = new Intent(context, CallActivity.class);
intent.setAction(autoAccept? Intent.ACTION_ANSWER : Intent.ACTION_VIEW); intent.setAction(autoAccept? Intent.ACTION_ANSWER : Intent.ACTION_VIEW);
intent.putExtra(VideochatActivity.EXTRA_ACCOUNT_ID, chatData.accountId); intent.putExtra(CallActivity.EXTRA_ACCOUNT_ID, chatData.accountId);
intent.putExtra(VideochatActivity.EXTRA_CHAT_ID, chatData.chatId); intent.putExtra(CallActivity.EXTRA_CHAT_ID, chatData.chatId);
intent.putExtra(VideochatActivity.EXTRA_CALL_ID, callId); intent.putExtra(CallActivity.EXTRA_CALL_ID, callId);
intent.putExtra(VideochatActivity.EXTRA_HASH, hash); intent.putExtra(CallActivity.EXTRA_HASH, hash);
intent.setPackage(context.getPackageName()); intent.setPackage(context.getPackageName());
return TaskStackBuilder.create(context) return TaskStackBuilder.create(context)
.addNextIntentWithParentStack(chatIntent) .addNextIntentWithParentStack(chatIntent)