Skip to content

Commit 2926e85

Browse files
restyled-commitslazarkov
restyled-commits
authored and
lazarkov
committed
Restyled by google-java-format
1 parent bd4d4f3 commit 2926e85

File tree

8 files changed

+149
-149
lines changed

8 files changed

+149
-149
lines changed

‎examples/tv-app/android/App/content-app/src/main/java/com/example/contentapp/CommandResponseHolder.java

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.example.contentapp;
22

3-
import android.content.ContentResolver;
4-
import android.content.Context;
5-
import android.provider.Settings;
63
import android.util.Log;
74
import com.matter.tv.app.api.Clusters;
85
import java.util.HashMap;

‎examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/MainActivity.java

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.matter.tv.server.fragments.ContentAppFragment;
1212
import com.matter.tv.server.fragments.QrCodeFragment;
1313
import com.matter.tv.server.fragments.TerminalFragment;
14-
1514
import java.util.LinkedHashMap;
1615

1716
public class MainActivity extends AppCompatActivity {

‎examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/handlers/ApplicationLauncherManagerImpl.java

+42-33
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
33
import android.content.Context;
44
import android.content.pm.PackageManager;
55
import android.util.Log;
6-
76
import androidx.lifecycle.LiveData;
87
import androidx.lifecycle.Observer;
9-
108
import com.matter.tv.server.tvapp.Application;
119
import com.matter.tv.server.tvapp.ApplicationLauncherManager;
1210
import com.matter.tv.server.tvapp.LauncherResponse;
1311
import com.matter.tv.server.utils.EndpointsDataStore;
1412
import com.matter.tv.server.utils.InstallationObserver;
15-
1613
import java.util.HashMap;
1714
import java.util.Map;
1815
import java.util.Objects;
@@ -25,10 +22,9 @@ public class ApplicationLauncherManagerImpl implements ApplicationLauncherManage
2522
private PackageManager packageManager;
2623
private EndpointsDataStore endpointsDataStore;
2724

28-
/**
29-
* Hash Map of packageName & Install Status
30-
*/
31-
private Map<String, InstallationObserver.InstallStatus> lastReceivedInstallationStatus = new HashMap<>();
25+
/** Hash Map of packageName & Install Status */
26+
private Map<String, InstallationObserver.InstallStatus> lastReceivedInstallationStatus =
27+
new HashMap<>();
3228

3329
private LiveData<InstallationObserver.InstallState> installStateLiveData;
3430

@@ -38,24 +34,24 @@ public ApplicationLauncherManagerImpl(Context context) {
3834
registerSelf(context);
3935
}
4036

41-
private final Observer<InstallationObserver.InstallState> installStateObserver = state -> {
42-
lastReceivedInstallationStatus.put(state.getAppPackageName(), state.getStatus());
43-
switch (state.getStatus()) {
44-
45-
case IN_PROGRESS:
46-
// Installation is in progress
47-
Log.d(TAG, "Installation of " + state.getAppPackageName() + " in progress");
48-
break;
49-
case SUCCEEDED:
50-
// Installation succeeded
51-
Log.d(TAG, "Installation of " + state.getAppPackageName() + " succeeded");
52-
break;
53-
case FAILED:
54-
// Installation failed
55-
Log.d(TAG, "Installation of " + state.getAppPackageName() + " failed");
56-
break;
57-
}
58-
};
37+
private final Observer<InstallationObserver.InstallState> installStateObserver =
38+
state -> {
39+
lastReceivedInstallationStatus.put(state.getAppPackageName(), state.getStatus());
40+
switch (state.getStatus()) {
41+
case IN_PROGRESS:
42+
// Installation is in progress
43+
Log.d(TAG, "Installation of " + state.getAppPackageName() + " in progress");
44+
break;
45+
case SUCCEEDED:
46+
// Installation succeeded
47+
Log.d(TAG, "Installation of " + state.getAppPackageName() + " succeeded");
48+
break;
49+
case FAILED:
50+
// Installation failed
51+
Log.d(TAG, "Installation of " + state.getAppPackageName() + " failed");
52+
break;
53+
}
54+
};
5955

6056
private void stopObservingInstallations() {
6157
if (installStateLiveData != null) {
@@ -90,19 +86,30 @@ public int[] getCatalogList() {
9086

9187
@Override
9288
public LauncherResponse launchApp(Application app, String data) {
93-
Log.i(TAG, "Launch app id:" + app.applicationId + " cid:" + app.catalogVendorId + " data:" + data);
89+
Log.i(
90+
TAG,
91+
"Launch app id:" + app.applicationId + " cid:" + app.catalogVendorId + " data:" + data);
9492

9593
int status = 0;
9694
String responseData = "";
9795

98-
boolean matterAppEnabledIsInstalled = endpointsDataStore.getAllPersistedContentApps().containsKey(app.applicationId);
99-
boolean appIsInstalled = InstallationObserver.getInstalledPackages(packageManager).contains(app.applicationId);
100-
boolean isAppInstalling = Objects.equals(lastReceivedInstallationStatus.get(app.applicationId), InstallationObserver.InstallStatus.IN_PROGRESS);
101-
boolean appInstallFailed = Objects.equals(lastReceivedInstallationStatus.get(app.applicationId), InstallationObserver.InstallStatus.FAILED);
102-
96+
boolean matterAppEnabledIsInstalled =
97+
endpointsDataStore.getAllPersistedContentApps().containsKey(app.applicationId);
98+
boolean appIsInstalled =
99+
InstallationObserver.getInstalledPackages(packageManager).contains(app.applicationId);
100+
boolean isAppInstalling =
101+
Objects.equals(
102+
lastReceivedInstallationStatus.get(app.applicationId),
103+
InstallationObserver.InstallStatus.IN_PROGRESS);
104+
boolean appInstallFailed =
105+
Objects.equals(
106+
lastReceivedInstallationStatus.get(app.applicationId),
107+
InstallationObserver.InstallStatus.FAILED);
103108

104109
if (!matterAppEnabledIsInstalled && appIsInstalled) {
105-
Log.i(TAG, "Matter enabled app is not installed, but app is installed. Launching app's install page");
110+
Log.i(
111+
TAG,
112+
"Matter enabled app is not installed, but app is installed. Launching app's install page");
106113
status = LauncherResponse.STATUS_PENDING;
107114
responseData = "App is installed, try updating";
108115

@@ -111,7 +118,9 @@ public LauncherResponse launchApp(Application app, String data) {
111118
//
112119

113120
} else if (!matterAppEnabledIsInstalled && !appIsInstalled) {
114-
Log.i(TAG, "Matter enabled app is not installed and app is not installed. Launching app's install page");
121+
Log.i(
122+
TAG,
123+
"Matter enabled app is not installed and app is not installed. Launching app's install page");
115124
if (isAppInstalling) {
116125
Log.i(TAG, "App is installing");
117126
status = LauncherResponse.STATUS_INSTALLING;

‎examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/service/AppPlatformService.java

-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ public void addContentApp(ContentApp app) {
195195
}
196196
}
197197

198-
199198
private Collection<ContentAppSupportedCluster> mapSupportedClusters(
200199
Collection<SupportedCluster> supportedClusters) {
201200
return supportedClusters

‎examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/utils/EndpointsDataStore.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.util.JsonReader;
66
import android.util.JsonWriter;
77
import android.util.Log;
8-
98
import com.matter.tv.server.model.ContentApp;
109
import java.io.IOException;
1110
import java.io.StringReader;
@@ -51,7 +50,7 @@ public Map<String, ContentApp> getAllPersistedContentApps() {
5150
}
5251

5352
public void persistContentAppEndpoint(ContentApp app) {
54-
Log.i( EndpointsDataStore.class.toString(), "Persist Content App Endpoint " + app.getAppName());
53+
Log.i(EndpointsDataStore.class.toString(), "Persist Content App Endpoint " + app.getAppName());
5554
persistedContentApps.put(app.getAppName(), app);
5655
discoveredEndpoints.edit().putString(app.getAppName(), serializeContentApp(app)).apply();
5756
}

‎examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/utils/InstallationObserver.java

+101-97
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.util.Log;
88
import androidx.lifecycle.LiveData;
99
import androidx.lifecycle.MutableLiveData;
10-
1110
import java.util.HashMap;
1211
import java.util.HashSet;
1312
import java.util.List;
@@ -16,118 +15,123 @@
1615
import java.util.Set;
1716

1817
public class InstallationObserver {
19-
public enum InstallStatus {
20-
IN_PROGRESS, SUCCEEDED, FAILED
18+
public enum InstallStatus {
19+
IN_PROGRESS,
20+
SUCCEEDED,
21+
FAILED
22+
}
23+
24+
public static class InstallState {
25+
private final String appPackageName;
26+
private final InstallStatus status;
27+
28+
public InstallState(String appPackageName, InstallStatus status) {
29+
this.appPackageName = appPackageName;
30+
this.status = status;
2131
}
2232

23-
public static class InstallState {
24-
private final String appPackageName;
25-
private final InstallStatus status;
26-
27-
public InstallState(String appPackageName, InstallStatus status) {
28-
this.appPackageName = appPackageName;
29-
this.status = status;
30-
}
31-
32-
public String getAppPackageName() {
33-
return appPackageName;
34-
}
35-
36-
public InstallStatus getStatus() {
37-
return status;
38-
}
39-
40-
public String getPackageShortName() {
41-
return appPackageName.substring(appPackageName.lastIndexOf(".") + 1);
42-
}
43-
44-
public String getPackageTitle() {
45-
String shortName = getPackageShortName();
46-
return shortName.substring(0, 1).toUpperCase(Locale.getDefault()) + shortName.substring(1);
47-
}
33+
public String getAppPackageName() {
34+
return appPackageName;
4835
}
4936

50-
private static InstallState stateFromId(PackageInstaller installer, int sessionId) {
51-
PackageInstaller.SessionInfo info = installer.getSessionInfo(sessionId);
52-
if (info == null || info.getAppPackageName() == null) {
53-
return null;
54-
}
55-
return new InstallState(info.getAppPackageName(), InstallStatus.IN_PROGRESS);
37+
public InstallStatus getStatus() {
38+
return status;
5639
}
5740

58-
public static Set<String> getInstalledPackages(PackageManager packageManager) {
59-
List<PackageInfo> packageInfoList = packageManager.getInstalledPackages(0);
60-
Set<String> setOfInstalledApps = new HashSet<>();
61-
for (PackageInfo info: packageInfoList) {
62-
setOfInstalledApps.add(info.packageName);
63-
}
64-
return setOfInstalledApps;
41+
public String getPackageShortName() {
42+
return appPackageName.substring(appPackageName.lastIndexOf(".") + 1);
6543
}
6644

67-
public static LiveData<InstallState> installationStates(Context context) {
68-
MutableLiveData<InstallState> liveData = new MutableLiveData<>();
69-
PackageInstaller packageInstaller = context.getPackageManager().getPackageInstaller();
70-
Map<Integer, InstallState> inProgressSessions = new HashMap<>();
71-
72-
PackageInstaller.SessionCallback callback = new PackageInstaller.SessionCallback() {
73-
@Override
74-
public void onCreated(int sessionId) {
75-
Log.d(TAG, "onCreated ");
76-
InstallState state = stateFromId(packageInstaller, sessionId);
77-
if (state != null) {
78-
inProgressSessions.put(sessionId, state);
79-
liveData.postValue(state);
80-
}
81-
}
45+
public String getPackageTitle() {
46+
String shortName = getPackageShortName();
47+
return shortName.substring(0, 1).toUpperCase(Locale.getDefault()) + shortName.substring(1);
48+
}
49+
}
8250

83-
@Override
84-
public void onBadgingChanged(int sessionId) {
51+
private static InstallState stateFromId(PackageInstaller installer, int sessionId) {
52+
PackageInstaller.SessionInfo info = installer.getSessionInfo(sessionId);
53+
if (info == null || info.getAppPackageName() == null) {
54+
return null;
55+
}
56+
return new InstallState(info.getAppPackageName(), InstallStatus.IN_PROGRESS);
57+
}
58+
59+
public static Set<String> getInstalledPackages(PackageManager packageManager) {
60+
List<PackageInfo> packageInfoList = packageManager.getInstalledPackages(0);
61+
Set<String> setOfInstalledApps = new HashSet<>();
62+
for (PackageInfo info : packageInfoList) {
63+
setOfInstalledApps.add(info.packageName);
64+
}
65+
return setOfInstalledApps;
66+
}
67+
68+
public static LiveData<InstallState> installationStates(Context context) {
69+
MutableLiveData<InstallState> liveData = new MutableLiveData<>();
70+
PackageInstaller packageInstaller = context.getPackageManager().getPackageInstaller();
71+
Map<Integer, InstallState> inProgressSessions = new HashMap<>();
72+
73+
PackageInstaller.SessionCallback callback =
74+
new PackageInstaller.SessionCallback() {
75+
@Override
76+
public void onCreated(int sessionId) {
77+
Log.d(TAG, "onCreated ");
78+
InstallState state = stateFromId(packageInstaller, sessionId);
79+
if (state != null) {
80+
inProgressSessions.put(sessionId, state);
81+
liveData.postValue(state);
8582
}
86-
87-
@Override
88-
public void onActiveChanged(int sessionId, boolean active) {
89-
Log.d(TAG, "onActiveChanged");
90-
InstallState state = stateFromId(packageInstaller, sessionId);
91-
if (state != null) {
92-
inProgressSessions.put(sessionId, state);
93-
liveData.postValue(state);
94-
}
83+
}
84+
85+
@Override
86+
public void onBadgingChanged(int sessionId) {}
87+
88+
@Override
89+
public void onActiveChanged(int sessionId, boolean active) {
90+
Log.d(TAG, "onActiveChanged");
91+
InstallState state = stateFromId(packageInstaller, sessionId);
92+
if (state != null) {
93+
inProgressSessions.put(sessionId, state);
94+
liveData.postValue(state);
9595
}
96-
97-
@Override
98-
public void onProgressChanged(int sessionId, float progress) {
99-
Log.d(TAG, "onProgressChanged:" + progress);
100-
InstallState state = stateFromId(packageInstaller, sessionId);
101-
if (state != null) {
102-
inProgressSessions.put(sessionId, state);
103-
liveData.postValue(state);
104-
}
96+
}
97+
98+
@Override
99+
public void onProgressChanged(int sessionId, float progress) {
100+
Log.d(TAG, "onProgressChanged:" + progress);
101+
InstallState state = stateFromId(packageInstaller, sessionId);
102+
if (state != null) {
103+
inProgressSessions.put(sessionId, state);
104+
liveData.postValue(state);
105105
}
106-
107-
@Override
108-
public void onFinished(int sessionId, boolean success) {
109-
Log.d(TAG, "onFinished " + sessionId + " " + success);
110-
InstallState current = inProgressSessions.get(sessionId);
111-
if (current != null) {
112-
InstallState newState = new InstallState(current.getAppPackageName(), success ? InstallStatus.SUCCEEDED : InstallStatus.FAILED);
113-
liveData.postValue(newState);
114-
inProgressSessions.remove(sessionId);
115-
}
106+
}
107+
108+
@Override
109+
public void onFinished(int sessionId, boolean success) {
110+
Log.d(TAG, "onFinished " + sessionId + " " + success);
111+
InstallState current = inProgressSessions.get(sessionId);
112+
if (current != null) {
113+
InstallState newState =
114+
new InstallState(
115+
current.getAppPackageName(),
116+
success ? InstallStatus.SUCCEEDED : InstallStatus.FAILED);
117+
liveData.postValue(newState);
118+
inProgressSessions.remove(sessionId);
116119
}
120+
}
117121
};
118122

119-
packageInstaller.registerSessionCallback(callback);
120-
121-
for (PackageInstaller.SessionInfo info : packageInstaller.getMySessions()) {
122-
if (info.isActive() && info.getAppPackageName() != null) {
123-
InstallState state = new InstallState(info.getAppPackageName(), InstallStatus.IN_PROGRESS);
124-
inProgressSessions.put(info.getSessionId(), state);
125-
liveData.postValue(state);
126-
}
127-
}
123+
packageInstaller.registerSessionCallback(callback);
128124

129-
return liveData;
125+
for (PackageInstaller.SessionInfo info : packageInstaller.getMySessions()) {
126+
if (info.isActive() && info.getAppPackageName() != null) {
127+
InstallState state = new InstallState(info.getAppPackageName(), InstallStatus.IN_PROGRESS);
128+
inProgressSessions.put(info.getSessionId(), state);
129+
liveData.postValue(state);
130+
}
130131
}
131132

132-
private static final String TAG = "InstallationObserver";
133+
return liveData;
134+
}
135+
136+
private static final String TAG = "InstallationObserver";
133137
}

0 commit comments

Comments
 (0)