Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-22 10:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Prevent changes to conversations while device is unregistered."

Browse Source 
This reverts commit ed8edb5aee.
This commit is contained in:
Cody Henthorne
2021-04-14 18:02:57 -04:00
parent 9363f0ebb4
commit 2547db2a8e
5 changed files with 6 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/net/PipeConnectivityListener.java
View File

@@ -70,10 +70,6 @@ public class PipeConnectivityListener implements ConnectivityListener {
Log.w(TAG, "Encountered an error while we had a proxy set! Terminating the connection to prevent retry spam.");
ApplicationDependencies.closeConnections();
return false;
} else if (TextSecurePreferences.isUnauthorizedRecieved(ApplicationDependencies.getApplication())) {
Log.w(TAG, "Encountered an error while unregistered! Terminating the connection to prevent retry spam.");
ApplicationDependencies.closeConnections();
return false;
} else {
return true;
}

41
app/src/main/java/org/thoughtcrime/securesms/net/UnregisteredBlockingInterceptor.java
View File

@@ -1,41 +0,0 @@
package org.thoughtcrime.securesms.net;
import androidx.annotation.NonNull;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.signalservice.internal.push.PushServiceSocket;
import java.io.IOException;
import okhttp3.Interceptor;
import okhttp3.Protocol;
import okhttp3.Response;
import okhttp3.ResponseBody;
/**
* Blocks network access when device is unregistered.
*/
public final class UnregisteredBlockingInterceptor implements Interceptor {
private static final String TAG = Log.tag(UnregisteredBlockingInterceptor.class);
@Override
public @NonNull Response intercept(@NonNull Chain chain) throws IOException {
if (TextSecurePreferences.isUnauthorizedRecieved(ApplicationDependencies.getApplication()) &&
PushServiceSocket.isNotRegistrationPath(chain.request().url().encodedPath()))
{
Log.w(TAG, "Preventing request because device is unregistered.");
return new Response.Builder().request(chain.request())
.protocol(Protocol.HTTP_1_1)
.receivedResponseAtMillis(System.currentTimeMillis())
.message("")
.body(ResponseBody.create(null, ""))
.code(508)
.build();
}
return chain.proceed(chain.request());
}
}

8
app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java
View File

@@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.push;
import android.content.Context;
import androidx.annotation.Nullable;
import com.annimon.stream.Stream;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -16,7 +16,6 @@ import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor;
import org.thoughtcrime.securesms.net.RemoteDeprecationDetectorInterceptor;
import org.thoughtcrime.securesms.net.SequentialDns;
import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor;
import org.thoughtcrime.securesms.net.UnregisteredBlockingInterceptor;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.libsignal.util.guava.Optional;
@@ -35,6 +34,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.net.ssl.SSLContext;
import okhttp3.CipherSuite;
import okhttp3.ConnectionSpec;
import okhttp3.Dns;
@@ -184,7 +185,6 @@ public class SignalServiceNetworkAccess {
final List<Interceptor> interceptors = Arrays.asList(new StandardUserAgentInterceptor(),
new RemoteDeprecationDetectorInterceptor(),
new DeprecatedClientPreventionInterceptor(),
new UnregisteredBlockingInterceptor(),
DeviceTransferBlockingInterceptor.getInstance());
final Optional<Dns> dns = Optional.of(DNS);

6
app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View File

@@ -466,12 +466,6 @@ public class TextSecurePreferences {
}
public static void setUnauthorizedReceived(Context context, boolean value) {
if (value) {
ApplicationDependencies.closeConnections();
} else {
ApplicationDependencies.getIncomingMessageObserver();
}
setBooleanPreference(context, UNAUTHORIZED_RECEIVED, value);
}