Skip to content

Commit c1a0a43

Browse files
mythzmythz
committed
update proj files
1 parent 0f54b81 commit c1a0a43

File tree

4 files changed

+37
-24
lines changed

4 files changed

+37
-24
lines changed

‎src/AndroidClient/android/android.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7070
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -84,6 +76,14 @@
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8678
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

‎src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.TimerTask;
3535
import java.util.concurrent.TimeoutException;
3636
import java.util.concurrent.atomic.AtomicBoolean;
37+
import java.util.concurrent.atomic.AtomicInteger;
3738

3839
/**
3940
* Created by mythz on 2/9/2017.
@@ -62,6 +63,7 @@ public class ServerEventsClient implements Closeable {
6263
protected Date lastPulseAt;
6364
protected Thread bgThread;
6465
protected final AtomicBoolean stopped = new AtomicBoolean(false);
66+
protected final AtomicBoolean running = new AtomicBoolean(false);
6567

6668
static int BufferSize = 1024 * 64;
6769
static int DefaultHeartbeatMs = 10 * 1000;
@@ -294,7 +296,7 @@ public synchronized void restart() {
294296
return;
295297

296298
try {
297-
sleepBackOffMultiplier(errorsCount);
299+
sleepBackOffMultiplier(errorsCount.intValue());
298300
start();
299301
} catch (Exception e){
300302
onExceptionReceived(e);
@@ -321,8 +323,7 @@ private void sleepBackOffMultiplier(int continuousErrorsCount) throws Interrupte
321323
MaxSleepMs
322324
);
323325

324-
if (Log.isDebugEnabled())
325-
Log.d("Sleeping for " + nextTry + "ms after " + continuousErrorsCount + " continuous errors");
326+
Log.info("Sleeping for " + nextTry + "ms after " + continuousErrorsCount + " continuous errors");
326327

327328
Thread.sleep(nextTry);
328329
}
@@ -397,9 +398,10 @@ private void onMessageReceived(ServerEventMessage e) {
397398
onMessage.execute(e);
398399
}
399400

400-
private int errorsCount;
401+
private AtomicInteger errorsCount = new AtomicInteger();
402+
401403
protected void onExceptionReceived(Exception ex) {
402-
errorsCount++;
404+
errorsCount.incrementAndGet();
403405

404406
Log.e("[SSE-CLIENT] OnExceptionReceived: "
405407
+ ex.getMessage() + " on #" + getConnectionDisplayName(), ex);
@@ -552,16 +554,26 @@ public EventStream(ServerEventsClient client) {
552554
@Override
553555
public void run() {
554556
try {
557+
if (running.get())
558+
return;
559+
running.set(true);
560+
555561
URL streamUri = new URL(client.getEventStreamUri());
556562
HttpURLConnection req = (HttpURLConnection) streamUri.openConnection();
557563

558564
InputStream is = new BufferedInputStream(req.getInputStream());
565+
errorsCount.set(0);
559566
readStream(is);
560-
} catch (IOException e) {
561-
Log.e("Error reading from event-stream", e);
567+
568+
running.set(false);
569+
} catch (Exception e) {
570+
Log.e("Error reading from event-stream, continuous errors: " + errorsCount.incrementAndGet(), e);
562571
Log.e(Utils.getStackTrace(e));
572+
running.set(false);
563573
} finally {
564-
client.restart();
574+
if (!running.get()){
575+
client.restart();
576+
}
565577
}
566578
}
567579

‎src/AndroidClient/androidchat/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</activity>
2222

2323
<activity android:name=".LoginButtonsActivity">
24+
<!-- Move to .LoginActivity if you prefer that login page instead -->
2425
<intent-filter>
2526
<action android:name="android.intent.action.MAIN" />
2627
<category android:name="android.intent.category.LAUNCHER" />

‎src/AndroidClient/app/app.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />

0 commit comments

Comments
 (0)