moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-18 18:42:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup ShortcutHelper

Browse Source
This commit is contained in:
Cameron Gutman 2016-10-26 12:28:29 -07:00
parent 56b814e877
commit e8f04f5a3b
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/com/limelight/utils/ShortcutHelper.java
View File

@ -8,10 +8,9 @@ import android.content.pm.ShortcutManager;
import android.os.Build; import android.os.Build;
import com.limelight.AppView; import com.limelight.AppView;
import com.limelight.R;
import com.limelight.nvstream.http.ComputerDetails; import com.limelight.nvstream.http.ComputerDetails;
import java.util.Arrays; import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -22,7 +21,7 @@ public class ShortcutHelper {
public ShortcutHelper(Context context) { public ShortcutHelper(Context context) {
this.context = context; this.context = context;
if (Build.VERSION.SDK_INT >= 25) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
sm = context.getSystemService(ShortcutManager.class); sm = context.getSystemService(ShortcutManager.class);
} }
else { else {
@ -30,7 +29,7 @@ public class ShortcutHelper {
} }
} }
@TargetApi(25) @TargetApi(Build.VERSION_CODES.N_MR1)
private void reapShortcutsForDynamicAdd() { private void reapShortcutsForDynamicAdd() {
List<ShortcutInfo> dynamicShortcuts = sm.getDynamicShortcuts(); List<ShortcutInfo> dynamicShortcuts = sm.getDynamicShortcuts();
while (dynamicShortcuts.size() >= sm.getMaxShortcutCountPerActivity()) { while (dynamicShortcuts.size() >= sm.getMaxShortcutCountPerActivity()) {
@ -40,11 +39,11 @@ public class ShortcutHelper {
maxRankShortcut = scut; maxRankShortcut = scut;
} }
} }
sm.removeDynamicShortcuts(Arrays.asList(maxRankShortcut.getId())); sm.removeDynamicShortcuts(Collections.singletonList(maxRankShortcut.getId()));
} }
} }
@TargetApi(25) @TargetApi(Build.VERSION_CODES.N_MR1)
private List<ShortcutInfo> getAllShortcuts() { private List<ShortcutInfo> getAllShortcuts() {
LinkedList<ShortcutInfo> list = new LinkedList<>(); LinkedList<ShortcutInfo> list = new LinkedList<>();
list.addAll(sm.getDynamicShortcuts()); list.addAll(sm.getDynamicShortcuts());
@ -52,7 +51,7 @@ public class ShortcutHelper {
return list; return list;
} }
@TargetApi(25) @TargetApi(Build.VERSION_CODES.N_MR1)
private ShortcutInfo getInfoForId(String id) { private ShortcutInfo getInfoForId(String id) {
List<ShortcutInfo> shortcuts = getAllShortcuts(); List<ShortcutInfo> shortcuts = getAllShortcuts();
@ -66,7 +65,7 @@ public class ShortcutHelper {
} }
public void reportShortcutUsed(String id) { public void reportShortcutUsed(String id) {
if (Build.VERSION.SDK_INT >= 25) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
ShortcutInfo sinfo = getInfoForId(id); ShortcutInfo sinfo = getInfoForId(id);
if (sinfo != null) { if (sinfo != null) {
sm.reportShortcutUsed(id); sm.reportShortcutUsed(id);
@ -75,7 +74,7 @@ public class ShortcutHelper {
} }
public void createAppViewShortcut(String id, ComputerDetails details) { public void createAppViewShortcut(String id, ComputerDetails details) {
if (Build.VERSION.SDK_INT >= 25) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
Intent i = new Intent(context, AppView.class); Intent i = new Intent(context, AppView.class);
i.putExtra(AppView.NAME_EXTRA, details.name); i.putExtra(AppView.NAME_EXTRA, details.name);
i.putExtra(AppView.UUID_EXTRA, details.uuid.toString()); i.putExtra(AppView.UUID_EXTRA, details.uuid.toString());
@ -91,8 +90,8 @@ public class ShortcutHelper {
ShortcutInfo existingSinfo = getInfoForId(id); ShortcutInfo existingSinfo = getInfoForId(id);
if (existingSinfo != null) { if (existingSinfo != null) {
// Update in place // Update in place
sm.updateShortcuts(Arrays.asList(sinfo)); sm.updateShortcuts(Collections.singletonList(sinfo));
sm.enableShortcuts(Arrays.asList(id)); sm.enableShortcuts(Collections.singletonList(id));
} }
else { else {
// Reap shortcuts to make space for this new one // Reap shortcuts to make space for this new one
@ -105,10 +104,10 @@ public class ShortcutHelper {
} }
public void disableShortcut(String id, CharSequence reason) { public void disableShortcut(String id, CharSequence reason) {
if (Build.VERSION.SDK_INT >= 25) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
ShortcutInfo sinfo = getInfoForId(id); ShortcutInfo sinfo = getInfoForId(id);
if (sinfo != null) { if (sinfo != null) {
sm.disableShortcuts(Arrays.asList(id), reason); sm.disableShortcuts(Collections.singletonList(id), reason);
} }
} }
} }