karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Merge pull request #1036 from OpenTracksApp/npe#1035

Browse Source 
Fix NPE #1035
This commit is contained in:
Dennis Guse
2021-12-04 22:23:27 +01:00
committed by GitHub
parent 3228f58187 0d45efdf07
commit 02cec48ae4
4 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/util/ActivityUtils.java
+5 -8
View File
@@ -1,5 +1,7 @@
package de.dennisguse.opentracks.util;
import static android.content.Context.VIBRATOR_SERVICE;
import android.app.Activity;
import android.app.SearchManager;
import android.content.Context;
@@ -14,6 +16,7 @@ import android.view.MenuItem;
import android.widget.AbsListView;
import android.widget.ListView;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.SearchView;
import java.util.ArrayList;
@@ -21,8 +24,6 @@ import java.util.ArrayList;
import de.dennisguse.opentracks.ContextualActionModeCallback;
import de.dennisguse.opentracks.R;
import static android.content.Context.VIBRATOR_SERVICE;
public class ActivityUtils {
private static final String TAG = ActivityUtils.class.getSimpleName();
@@ -75,11 +76,7 @@ public class ActivityUtils {
arrayList.add(key);
}
}
int[] result = new int[arrayList.size()];
for (int i = 0; i < arrayList.size(); i++) {
result[i] = arrayList.get(i);
}
return result;
return arrayList.stream().mapToInt(i -> i).toArray();
}
});
}
@@ -97,7 +94,7 @@ public class ActivityUtils {
return searchView;
}
public static void vibrate(Context context, int milliseconds) {
public static void vibrate(@NonNull Context context, int milliseconds) {
final Vibrator vibrator = (Vibrator) context.getSystemService(VIBRATOR_SERVICE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
vibrator.vibrate(VibrationEffect.createOneShot(milliseconds, VibrationEffect.DEFAULT_AMPLITUDE));