Skip to content

Commit df43352

Browse files
authored
Merge pull request fixme-lausanne#77 from coredump-ch/annotations
Add support for annotations
2 parents 4c92581 + 9cb53a2 commit df43352

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

app/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ android {
2525
}
2626

2727
dependencies {
28+
implementation "androidx.annotation:annotation:1.1.0"
2829
}

app/src/main/java/ch/fixme/status/Main.java

+6
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
import java.util.Set;
6060
import java.util.regex.Pattern;
6161

62+
import androidx.annotation.UiThread;
63+
6264
public class Main extends Activity {
6365

6466
// API: https://spaceapi.io/
@@ -92,6 +94,7 @@ public class Main extends Activity {
9294
private GetImage getImageTask;
9395

9496
@Override
97+
@UiThread
9598
public void onCreate(Bundle savedInstanceState) {
9699
super.onCreate(savedInstanceState);
97100
setContentView(R.layout.main);
@@ -110,12 +113,14 @@ public void onCreate(Bundle savedInstanceState) {
110113
}
111114

112115
@Override
116+
@UiThread
113117
protected void onNewIntent(Intent intent) {
114118
Log.d(TAG, "onNewIntent()=" + intent);
115119
showHsInfo(intent);
116120
}
117121

118122
@Override
123+
@UiThread
119124
protected void onDestroy() {
120125
if (getApiTask != null) {
121126
getApiTask.cancel(true);
@@ -205,6 +210,7 @@ protected Dialog onCreateDialog(int id) {
205210
}
206211

207212
@Override
213+
@UiThread
208214
public void startActivity(Intent intent) {
209215
// http://stackoverflow.com/questions/13691241/autolink-not-working-on-htc-htclinkifydispatcher
210216
try {

app/src/main/java/ch/fixme/status/Net.java

+11-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
import java.net.HttpURLConnection;
1919
import java.net.URL;
2020

21+
import androidx.annotation.NonNull;
22+
import androidx.annotation.WorkerThread;
23+
2124
// From CommonsWare and Android Blog
2225
// https://github.com/commonsguy/cw-android/tree/master/Internet
2326
// http://android-developers.blogspot.ch/2010/07/multithreading-for-performance.html
@@ -31,11 +34,13 @@ public class Net {
3134
private HttpURLConnection mUrlConnection;
3235
private InputStream mInputStream;
3336

34-
public Net(String urlStr) throws Throwable {
37+
@WorkerThread
38+
public Net(@NonNull String urlStr) throws Throwable {
3539
this(urlStr, true);
3640
}
3741

38-
public Net(String urlStr, boolean useCache) throws Throwable {
42+
@WorkerThread
43+
public Net(@NonNull String urlStr, boolean useCache) throws Throwable {
3944
// Connect to URL
4045
URL url;
4146
int responseCode;
@@ -70,6 +75,8 @@ public Net(String urlStr, boolean useCache) throws Throwable {
7075
mInputStream = mUrlConnection.getInputStream();
7176
}
7277

78+
@WorkerThread
79+
@NonNull
7380
public String getString() throws Throwable {
7481
try {
7582
BufferedReader r = new BufferedReader(new InputStreamReader(mInputStream));
@@ -87,6 +94,8 @@ public String getString() throws Throwable {
8794
}
8895
}
8996

97+
@WorkerThread
98+
@NonNull
9099
public Bitmap getBitmap() throws Throwable {
91100
try {
92101
return BitmapFactory.decodeStream(new FlushedInputStream(mInputStream));

0 commit comments

Comments
 (0)