blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Copione merged onto master

master
blallo 2020-09-25 00:00:47 +02:00
parent 1dbdf06ca4 dbbded5250
commit dc856705f9
9 changed files with 141 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -80,8 +80,8 @@ protobuf {
}
}
def canonicalVersionCode = 709
def canonicalVersionName = "4.72.0"
def canonicalVersionCode = 710
def canonicalVersionName = "4.72.1"
def postFixSize = 10
def abiPostFix = ['universal' : 0,

5
app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
View File

@ -167,6 +167,11 @@ public class RetrieveProfileJob extends BaseJob {
* certain time period.
*/
public static void enqueueRoutineFetchIfNecessary(Application application) {
if (!SignalStore.registrationValues().isRegistrationComplete()) {
Log.i(TAG, "Registration not complete. Skipping.");
return;
}
long timeSinceRefresh = System.currentTimeMillis() - SignalStore.misc().getLastProfileRefreshTime();
if (timeSinceRefresh < TimeUnit.HOURS.toMillis(12)) {
Log.i(TAG, "Too soon to refresh. Did the last refresh " + timeSinceRefresh + " ms ago.");

24
app/src/main/java/org/thoughtcrime/securesms/ringrtc/RemotePeer.java
View File

@ -23,17 +23,20 @@ public final class RemotePeer implements Remote, Parcelable
@NonNull private final RecipientId recipientId;
@NonNull private CallState callState;
@NonNull private CallId callId;
private long callStartTimestamp;
public RemotePeer(@NonNull RecipientId recipientId) {
this.recipientId = recipientId;
this.callState = CallState.IDLE;
this.callId = new CallId(-1L);
this.recipientId = recipientId;
this.callState = CallState.IDLE;
this.callId = new CallId(-1L);
this.callStartTimestamp = 0;
}
private RemotePeer(@NonNull Parcel in) {
this.recipientId = RecipientId.CREATOR.createFromParcel(in);
this.callState = CallState.values()[in.readInt()];
this.callId = new CallId(in.readLong());
this.recipientId = RecipientId.CREATOR.createFromParcel(in);
this.callState = CallState.values()[in.readInt()];
this.callId = new CallId(in.readLong());
this.callStartTimestamp = in.readLong();
}
public @NonNull CallId getCallId() {
@ -44,6 +47,14 @@ public final class RemotePeer implements Remote, Parcelable
this.callId = callId;
}
public void setCallStartTimestamp(long callStartTimestamp) {
this.callStartTimestamp = callStartTimestamp;
}
public long getCallStartTimestamp() {
return callStartTimestamp;
}
public @NonNull CallState getState() {
return callState;
}
@ -135,6 +146,7 @@ public final class RemotePeer implements Remote, Parcelable
recipientId.writeToParcel(dest, flags);
dest.writeInt(callState.ordinal());
dest.writeLong(callId.longValue());
dest.writeLong(callStartTimestamp);
}
public static final Creator<RemotePeer> CREATOR = new Creator<RemotePeer>() {

15
app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
View File

@ -201,7 +201,6 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
@Nullable private RemotePeer busyPeer;
@Nullable private RemotePeer preJoinPeer;
@Nullable private SparseArray<RemotePeer> peerMap;
private long callStartTimestamp;
@Nullable private EglBase eglBase;
@Nullable private BroadcastVideoSink localSink;
@ -436,7 +435,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
}
peerMap.append(remotePeer.hashCode(), remotePeer);
callStartTimestamp = serverReceivedTimestamp;
remotePeer.setCallStartTimestamp(serverReceivedTimestamp);
Log.i(TAG, "add remotePeer callId: " + remotePeer.getCallId() + " key: " + remotePeer.hashCode());
isRemoteVideoOffer = offerType == OfferMessage.Type.VIDEO_CALL;
@ -524,7 +523,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
peerMap.append(remotePeer.hashCode(), remotePeer);
callStartTimestamp = System.currentTimeMillis();
remotePeer.setCallStartTimestamp(System.currentTimeMillis());
Log.i(TAG, "add remotePeer callId: " + remotePeer.getCallId() + " key: " + remotePeer.hashCode());
initializeVideo();
@ -1168,7 +1167,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
Log.i(TAG, "handleReceivedOfferExpired(): call_id: " + remotePeer.getCallId());
insertMissedCall(remotePeer, true, callStartTimestamp);
insertMissedCall(remotePeer, true, remotePeer.getCallStartTimestamp());
terminate(remotePeer);
}
@ -1197,7 +1196,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
stopForeground(true);
}
insertMissedCall(remotePeer, true, callStartTimestamp);
insertMissedCall(remotePeer, true, remotePeer.getCallStartTimestamp());
terminate(remotePeer);
}
@ -1218,7 +1217,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
boolean incomingBeforeAccept = remotePeer.getState() == CallState.ANSWERING || remotePeer.getState() == CallState.LOCAL_RINGING;
if (incomingBeforeAccept) {
insertMissedCall(remotePeer, true, callStartTimestamp);
insertMissedCall(remotePeer, true, remotePeer.getCallStartTimestamp());
}
terminate(remotePeer);
@ -1305,7 +1304,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
boolean incomingBeforeAccept = remotePeer.getState() == CallState.ANSWERING || remotePeer.getState() == CallState.LOCAL_RINGING;
if (incomingBeforeAccept) {
insertMissedCall(remotePeer, true, callStartTimestamp);
insertMissedCall(remotePeer, true, remotePeer.getCallStartTimestamp());
}
terminate(remotePeer);
@ -1321,7 +1320,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
}
if (remotePeer.getState() == CallState.ANSWERING || remotePeer.getState() == CallState.LOCAL_RINGING) {
insertMissedCall(remotePeer, true, callStartTimestamp);
insertMissedCall(remotePeer, true, remotePeer.getCallStartTimestamp());
}
terminate(remotePeer);

2
app/src/main/res/values-de/strings.xml
View File

@ -2068,7 +2068,7 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
<string name="KbsMegaphone__well_remind_you_later_confirming_your_pin">Wir erinnern dich später. Das Bestätigen deiner PIN wird in %1$d Tagen zwingend erforderlich.</string>
<!--Mention Megaphone-->
<!-- Removed by excludeNonTranslatables <string name="MentionsMegaphone__introducing_mentions">Einführung von @Erwähnungen</string> -->
<!-- Removed by excludeNonTranslatables <string name="MentionsMegaphone__get_someones_attention_in_a_group_by_typing">Tippe @ in einer »Neu-Gruppe«, um jemandes Aufmerksamkeit zu erhalten</string> -->
<!-- Removed by excludeNonTranslatables <string name="MentionsMegaphone__get_someones_attention_in_a_group_by_typing">Tippe »@« in einer »Neu-Gruppe«, um jemandes Aufmerksamkeit zu erhalten</string> -->
<!--transport_selection_list_item-->
<string name="transport_selection_list_item__transport_icon">Übertragungssymbol</string>
<string name="ConversationListFragment_loading">Wird geladen …</string>

2
app/src/main/res/values-eu/strings.xml
View File

@ -435,7 +435,7 @@
<string name="PendingMembersActivity_you_have_no_pending_invites">Ez duzu ikusi gabeko gonbidapenik.</string>
<string name="PendingMembersActivity_invites_by_other_group_members">Taldeko beste partaideek egindako gonbidapenak</string>
<string name="PendingMembersActivity_no_pending_invites_by_other_group_members">Taldeko beste partaideek egindako gonbidapenik ez dago.</string>
<string name="PendingMembersActivity_missing_detail_explanation">Taldeko beste partaideek gonbidatutako pertsonen xehetasunak ez dira erakusten. Gonbidatuek taldean sartzea erabakitzen badute, beraien informazioa une horretan partekatuko da taldearekin. Taldean sartu arte ez dute mezurik ikusiko.</string>
<string name="PendingMembersActivity_missing_detail_explanation">Taldeko beste kideek gonbidatutako pertsonen xehetasunak ez dira erakusten. Gonbidatuek taldean sartzea erabakitzen badute, beraien informazioa une horretan partekatuko da taldearekin. Taldean sartu arte ez dute mezurik ikusiko.</string>
<string name="PendingMembersActivity_revoke_invite">Bertan behera utzi gonbidapena</string>
<string name="PendingMembersActivity_revoke_invites">Bertan behera utzi gonbidapenak</string>
<plurals name="PendingMembersActivity_revoke_d_invites">

109
app/src/main/res/values-fa/strings.xml
View File

File diff suppressed because one or more lines are too long

6
app/src/main/res/values-fi/strings.xml
View File

@ -847,8 +847,14 @@
<string name="MessageRecord_s_changed_who_can_edit_group_membership_to_s">%1$s muutti kuka voi muokata ryhmän jäsenyyttä käyttäjiin \"%2$s\".</string>
<string name="MessageRecord_who_can_edit_group_membership_has_been_changed_to_s">Ryhmän jäsenyyttä voi nyt muokata \"%1$s\".</string>
<!--GV2 group link invite access level change-->
<string name="MessageRecord_you_turned_on_the_group_link_with_admin_approval_off">Otit ryhmälinkin käyttöön ilman jäsenten hyväksymistä.</string>
<string name="MessageRecord_you_turned_on_the_group_link_with_admin_approval_on">Otit ryhmälinkin käyttöön. Ylläpitäjä tarkistaa ryhmäänliittymispyynnöt.</string>
<string name="MessageRecord_you_turned_off_the_group_link">Poistit ryhmälinkin käytöstä.</string>
<string name="MessageRecord_s_turned_on_the_group_link_with_admin_approval_off">%1$s otti ryhmälinkin käyttöön. Jäsenten hyväksyminen ei ole käytössä.</string>
<string name="MessageRecord_s_turned_on_the_group_link_with_admin_approval_on">%1$s otti ryhmälinkin käyttöön. Ylläpitäjä tarkistaa ryhmäänliittymispyynnöt.</string>
<string name="MessageRecord_s_turned_off_the_group_link">%1$s poisti ryhmälinkin käytöstä.</string>
<string name="MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_off">Ryhmälinkki on otettu käyttöön. Jäsenten hyväksyminen ei ole käytössä.</string>
<string name="MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_on">Ryhmälinkki on otettu käyttöön. Ylläpitäjä tarkistaa ryhmäänliittymispyynnöt.</string>
<string name="MessageRecord_the_group_link_has_been_turned_off">Ryhmälinkki on poistettu käytöstä.</string>
<!--GV2 group link reset-->
<string name="MessageRecord_you_reset_the_group_link">Sinä uudelleenasetit ryhmälinkin.</string>

2
app/src/main/res/values-iw/strings.xml
View File

@ -929,6 +929,7 @@
<string name="MessageRecord_s_reset_the_group_link">%1$s איפס/ה את קישור הקבוצה.</string>
<string name="MessageRecord_the_group_link_has_been_reset">קישור הקבוצה אופס.</string>
<!--GV2 group link joins-->
<string name="MessageRecord_you_joined_the_group_via_the_group_link">הצטרפת אל הקבוצה באמצעות קישור הקבוצה.</string>
<!--GV2 group link requests-->
<string name="MessageRecord_you_sent_a_request_to_join_the_group">שלחת בקשה להצטרף אל הקבוצה.</string>
<!--GV2 group link approvals-->
@ -2236,6 +2237,7 @@
<string name="PhoneNumberPrivacy_everyone">כולם</string>
<string name="PhoneNumberPrivacy_my_contacts">אנשי הקשר שלי</string>
<string name="PhoneNumberPrivacy_nobody">אף אחד</string>
<string name="PhoneNumberPrivacy_my_contacts_see_description">רק אנשי הקשר שלך יראו את מספר הטלפון שלך ב־Signal.</string>
<string name="preferences_app_protection__screen_lock">נעילת מסך</string>
<string name="preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint">נעל גישה אל Signal באמצעות נעילת מסך או טביעת אצבע</string>
<string name="preferences_app_protection__screen_lock_inactivity_timeout">פסק זמן אי־פעילות של נעילת מסך</string>