Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-27 12:15:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix dynamic language override for app context."

Browse Source 
This reverts commit 75a19ada23f4fc0d5111fb74d234c7c6f48ba503.
This commit is contained in:
Rashad Sookram
2022-01-21 18:11:49 -05:00
committed by Greyson Parrelli
parent 78acc485fc
commit 35d0f1fc8c
25 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java
View File

@@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.jobmanager.impl;
import android.app.Application;
import android.content.Context;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
@@ -20,7 +21,7 @@ public class CellServiceConstraintObserver implements ConstraintObserver {
private static volatile CellServiceConstraintObserver instance;
public static CellServiceConstraintObserver getInstance(@NonNull Context application) {
public static CellServiceConstraintObserver getInstance(@NonNull Application application) {
if (instance == null) {
synchronized (CellServiceConstraintObserver.class) {
if (instance == null) {
@@ -31,7 +32,7 @@ public class CellServiceConstraintObserver implements ConstraintObserver {
return instance;
}
private CellServiceConstraintObserver(@NonNull Context application) {
private CellServiceConstraintObserver(@NonNull Application application) {
TelephonyManager telephonyManager = (TelephonyManager) application.getSystemService(Context.TELEPHONY_SERVICE);
ServiceStateListener serviceStateListener = new ServiceStateListener();

10
app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java
View File

@@ -1,11 +1,13 @@
package org.thoughtcrime.securesms.jobmanager.impl;
import android.app.Application;
import android.app.job.JobInfo;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import org.thoughtcrime.securesms.jobmanager.Constraint;
@@ -14,9 +16,9 @@ public class NetworkConstraint implements Constraint {
public static final String KEY = "NetworkConstraint";
private final Context application;
private final Application application;
private NetworkConstraint(@NonNull Context application) {
private NetworkConstraint(@NonNull Application application) {
this.application = application;
}
@@ -51,9 +53,9 @@ public class NetworkConstraint implements Constraint {
public static final class Factory implements Constraint.Factory<NetworkConstraint> {
private final Context application;
private final Application application;
public Factory(@NonNull Context application) {
public Factory(@NonNull Application application) {
this.application = application;
}

12
app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobmanager.impl;
import android.app.Application;
import android.app.job.JobInfo;
import android.content.Context;
import androidx.annotation.NonNull;
@@ -13,10 +13,10 @@ public class NetworkOrCellServiceConstraint implements Constraint {
public static final String KEY = "NetworkOrCellServiceConstraint";
public static final String LEGACY_KEY = "CellServiceConstraint";
private final Context application;
private final Application application;
private final NetworkConstraint networkConstraint;
private NetworkOrCellServiceConstraint(@NonNull Context application) {
private NetworkOrCellServiceConstraint(@NonNull Application application) {
this.application = application;
this.networkConstraint = new NetworkConstraint.Factory(application).create();
}
@@ -39,15 +39,15 @@ public class NetworkOrCellServiceConstraint implements Constraint {
public void applyToJobInfo(@NonNull JobInfo.Builder jobInfoBuilder) {
}
private static boolean hasCellService(@NonNull Context application) {
private static boolean hasCellService(@NonNull Application application) {
return CellServiceConstraintObserver.getInstance(application).hasService();
}
public static class Factory implements Constraint.Factory<NetworkOrCellServiceConstraint> {
private final Context application;
private final Application application;
public Factory(@NonNull Context application) {
public Factory(@NonNull Application application) {
this.application = application;
}

10
app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobmanager.impl;
import android.app.Application;
import android.app.job.JobInfo;
import android.content.Context;
import androidx.annotation.NonNull;
@@ -12,9 +12,9 @@ public class SqlCipherMigrationConstraint implements Constraint {
public static final String KEY = "SqlCipherMigrationConstraint";
private final Context application;
private final Application application;
private SqlCipherMigrationConstraint(@NonNull Context application) {
private SqlCipherMigrationConstraint(@NonNull Application application) {
this.application = application;
}
@@ -35,9 +35,9 @@ public class SqlCipherMigrationConstraint implements Constraint {
public static final class Factory implements Constraint.Factory<SqlCipherMigrationConstraint> {
private final Context application;
private final Application application;
public Factory(@NonNull Context application) {
public Factory(@NonNull Application application) {
this.application = application;
}