Skip to content

Commit

Permalink
Merge pull request Psiphon-Labs#636 from efryntov/android-feedback-fixes
Browse files Browse the repository at this point in the history 
Android feedback fixes
  • Loading branch information
@rod-hynes
rod-hynes authored Mar 20, 2023
2 parents b1a875a + 80d027f commit e098572
Showing 1 changed file with 49 additions and 53 deletions.
102 changes: 49 additions & 53 deletions MobileLibrary/Android/PsiphonTunnel/PsiphonTunnel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
Expand Down Expand Up @@ -339,22 +340,8 @@ public void writeRuntimeProfiles(String outputDirectory, int cpuSampleDurationSe
// - Only a single instance of PsiphonTunnelFeedback should be used at a time. Using multiple
// instances in parallel, or concurrently, will result in undefined behavior.
public static class PsiphonTunnelFeedback {

final private ExecutorService workQueue;
final private ExecutorService callbackQueue;

public PsiphonTunnelFeedback() {
workQueue = Executors.newSingleThreadExecutor();
callbackQueue = Executors.newSingleThreadExecutor();
}

@Override
protected void finalize() throws Throwable {
// Ensure the queues are cleaned up.
shutdownAndAwaitTermination(callbackQueue);
shutdownAndAwaitTermination(workQueue);
super.finalize();
}
private final ExecutorService workQueue = Executors.newSingleThreadExecutor();
private final ExecutorService callbackQueue = Executors.newSingleThreadExecutor();

void shutdownAndAwaitTermination(ExecutorService pool) {
try {
Expand Down Expand Up @@ -398,8 +385,7 @@ void shutdownAndAwaitTermination(ExecutorService pool) {
public void startSendFeedback(Context context, HostFeedbackHandler feedbackHandler, HostLogger logger,
String feedbackConfigJson, String diagnosticsJson, String uploadPath,
String clientPlatformPrefix, String clientPlatformSuffix) {

workQueue.submit(new Runnable() {
workQueue.execute(new Runnable() {
@Override
public void run() {
try {
Expand All @@ -411,12 +397,15 @@ public void run() {
new PsiphonProviderFeedbackHandler() {
@Override
public void sendFeedbackCompleted(java.lang.Exception e) {
callbackQueue.submit(new Runnable() {
@Override
public void run() {
feedbackHandler.sendFeedbackCompleted(e);
}
});
try {
callbackQueue.execute(new Runnable() {
@Override
public void run() {
feedbackHandler.sendFeedbackCompleted(e);
}
});
} catch (RejectedExecutionException ignored) {
}
}
},
new PsiphonProviderNetwork() {
Expand Down Expand Up @@ -491,47 +480,59 @@ public void notice(String noticeJSON) {
}

String diagnosticMessage = noticeType + ": " + data.toString();
callbackQueue.submit(new Runnable() {
@Override
public void run() {
logger.onDiagnosticMessage(diagnosticMessage);
}
});
try {
callbackQueue.execute(new Runnable() {
@Override
public void run() {
logger.onDiagnosticMessage(diagnosticMessage);
}
});
} catch (RejectedExecutionException ignored) {
}
} catch (java.lang.Exception e) {
callbackQueue.submit(new Runnable() {
@Override
public void run() {
logger.onDiagnosticMessage("Error handling notice " + e.toString());
}
});
try {
callbackQueue.execute(new Runnable() {
@Override
public void run() {
logger.onDiagnosticMessage("Error handling notice " + e.toString());
}
});
} catch (RejectedExecutionException ignored) {
}
}
}
},
false, // Do not use IPv6 synthesizer for Android
true // Use hasIPv6Route on Android
);
} catch (java.lang.Exception e) {
callbackQueue.submit(new Runnable() {
@Override
public void run() {
feedbackHandler.sendFeedbackCompleted(new Exception("Error sending feedback", e));
}
});
try {
callbackQueue.execute(new Runnable() {
@Override
public void run() {
feedbackHandler.sendFeedbackCompleted(new Exception("Error sending feedback", e));
}
});
} catch (RejectedExecutionException ignored) {
}
}
}
});
}

// Interrupt an in-progress feedback upload operation started with startSendFeedback(). This
// call is asynchronous and returns a future which is fulfilled when the underlying stop
// operation completes.
public Future<Void> stopSendFeedback() {
return workQueue.submit(new Runnable() {
// Interrupt an in-progress feedback upload operation started with startSendFeedback() and shutdown
// executor queues.
// NOTE: this instance cannot be reused after shutdown() has been called.
public void shutdown() {
workQueue.execute(new Runnable() {
@Override
public void run() {
Psi.stopSendFeedback();
}
}, null);
});

shutdownAndAwaitTermination(workQueue);
shutdownAndAwaitTermination(callbackQueue);
}
}

Expand Down Expand Up @@ -793,9 +794,7 @@ private static String getNetworkID(Context context, boolean isVpnMode) {
ConnectivityManager connectivityManager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {

if (!isVpnMode) {

NetworkCapabilities capabilities = null;
try {
Network nw = connectivityManager.getActiveNetwork();
Expand All @@ -810,15 +809,12 @@ private static String getNetworkID(Context context, boolean isVpnMode) {
if (capabilities != null && capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
return "VPN";
}

}

}

NetworkInfo activeNetworkInfo = null;
try {
activeNetworkInfo = connectivityManager.getActiveNetworkInfo();

} catch (java.lang.Exception e) {
// May get exceptions due to missing permissions like android.permission.ACCESS_NETWORK_STATE.

Expand Down

0 comments on commit e098572

Please sign in to comment.