-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: protect from multiple
MethodChannel.Result
invocation
- Loading branch information
Showing
3 changed files
with
89 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
android/src/main/java/io/ably/flutter/plugin/MainThreadMethodResult.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
package io.ably.flutter.plugin; | ||
|
||
import android.os.Handler; | ||
import android.os.Looper; | ||
|
||
import io.flutter.plugin.common.MethodChannel; | ||
|
||
// MethodChannel.Result wrapper that responds on the platform thread. | ||
// | ||
// Plugins crash with "Methods marked with @UiThread must be executed on the main thread." | ||
// This happens while making network calls in thread other than main thread | ||
// | ||
// https://github.com/flutter/flutter/issues/34993#issue-459900986 | ||
// https://github.com/aloisdeniel/flutter_geocoder/commit/bc34cfe473bfd1934fe098bb7053248b75200241 | ||
public class MainThreadMethodResult implements MethodChannel.Result { | ||
private final MethodChannel.Result methodResult; | ||
private final Handler handler; | ||
|
||
MainThreadMethodResult(MethodChannel.Result result) { | ||
methodResult = result; | ||
handler = new Handler(Looper.getMainLooper()); | ||
} | ||
|
||
@Override | ||
public void success(final Object result) { | ||
handler.post(() -> methodResult.success(result)); | ||
} | ||
|
||
@Override | ||
public void error( | ||
final String errorCode, final String errorMessage, final Object errorDetails) { | ||
handler.post(() -> methodResult.error(errorCode, errorMessage, errorDetails)); | ||
} | ||
|
||
@Override | ||
public void notImplemented() { | ||
handler.post(methodResult::notImplemented); | ||
} | ||
} |
48 changes: 48 additions & 0 deletions
48
android/src/main/java/io/ably/flutter/plugin/SingleTimeMethodResult.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
package io.ably.flutter.plugin; | ||
|
||
import androidx.annotation.NonNull; | ||
import androidx.annotation.Nullable; | ||
|
||
import java.util.concurrent.atomic.AtomicInteger; | ||
|
||
import io.flutter.plugin.common.MethodChannel; | ||
|
||
/** | ||
* Prevents multiple MethodChannel.Result invocation, because it leads to app crash | ||
* @link https://github.com/flutter/flutter/issues/29092 | ||
*/ | ||
public class SingleTimeMethodResult implements MethodChannel.Result { | ||
private final MethodChannel.Result methodChannelResultInstance; | ||
private final AtomicInteger invocationsCount = new AtomicInteger(0); | ||
|
||
public SingleTimeMethodResult(MethodChannel.Result methodChannelResultInstance) { | ||
this.methodChannelResultInstance = methodChannelResultInstance; | ||
} | ||
|
||
@Override | ||
public void success(@Nullable Object result) { | ||
if (invocationsCount.getAndIncrement() == 0) { | ||
methodChannelResultInstance.success(result); | ||
} else { | ||
throw new IllegalStateException("Result shouldn't be called more than once"); | ||
} | ||
} | ||
|
||
@Override | ||
public void error(@NonNull String errorCode, @Nullable String errorMessage, @Nullable Object errorDetails) { | ||
if (invocationsCount.getAndIncrement() == 0) { | ||
methodChannelResultInstance.error(errorCode, errorMessage, errorDetails); | ||
} else { | ||
throw new IllegalStateException("Result shouldn't be called more than once"); | ||
} | ||
} | ||
|
||
@Override | ||
public void notImplemented() { | ||
if (invocationsCount.getAndIncrement() == 0) { | ||
methodChannelResultInstance.notImplemented(); | ||
} else { | ||
throw new IllegalStateException("Result shouldn't be called more than once"); | ||
} | ||
} | ||
} |