Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Introduce Exception handler for when no result needs to be returned

Browse Source 
Also add NotNull annotation to classes that were touched
This commit is contained in:
Torsten Grote
2016-11-11 10:01:20 -02:00
parent ade7e50f65
commit 563d897651
26 changed files with 135 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/org/briarproject/android/controller/handler/ExceptionHandler.java Normal file
View File

@@ -0,0 +1,7 @@
package org.briarproject.android.controller.handler;
public interface ExceptionHandler<E extends Exception> {
void onException(E exception);
}

4
briar-android/src/org/briarproject/android/controller/handler/ResultExceptionHandler.java
View File

@@ -1,8 +1,8 @@
package org.briarproject.android.controller.handler;
public interface ResultExceptionHandler<R, E extends Exception> {
public interface ResultExceptionHandler<R, E extends Exception>
extends ExceptionHandler<E> {
void onResult(R result);
void onException(E exception);
}

34
briar-android/src/org/briarproject/android/controller/handler/UiExceptionHandler.java Normal file
View File

@@ -0,0 +1,34 @@
package org.briarproject.android.controller.handler;
import android.support.annotation.UiThread;
import org.briarproject.android.DestroyableContext;
import org.briarproject.api.nullsafety.NotNullByDefault;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public abstract class UiExceptionHandler<E extends Exception>
implements ExceptionHandler<E> {
protected final DestroyableContext listener;
protected UiExceptionHandler(DestroyableContext listener) {
this.listener = listener;
}
@Override
public void onException(final E exception) {
listener.runOnUiThreadUnlessDestroyed(new Runnable() {
@Override
public void run() {
onExceptionUi(exception);
}
});
}
@UiThread
public abstract void onExceptionUi(E exception);
}

23
briar-android/src/org/briarproject/android/controller/handler/UiResultExceptionHandler.java
View File

@@ -3,14 +3,17 @@ package org.briarproject.android.controller.handler;
import android.support.annotation.UiThread;
import org.briarproject.android.DestroyableContext;
import org.briarproject.api.nullsafety.NotNullByDefault;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public abstract class UiResultExceptionHandler<R, E extends Exception>
implements ResultExceptionHandler<R, E> {
private final DestroyableContext listener;
extends UiExceptionHandler<E> implements ResultExceptionHandler<R, E> {
protected UiResultExceptionHandler(DestroyableContext listener) {
this.listener = listener;
super(listener);
}
@Override
@@ -23,19 +26,7 @@ public abstract class UiResultExceptionHandler<R, E extends Exception>
});
}
@Override
public void onException(final E exception) {
listener.runOnUiThreadUnlessDestroyed(new Runnable() {
@Override
public void run() {
onExceptionUi(exception);
}
});
}
@UiThread
public abstract void onResultUi(R result);
@UiThread
public abstract void onExceptionUi(E exception);
}