Skip to content

Commit d9a8455

Browse files
committed
libraries update
1 parent df4e7c6 commit d9a8455

4 files changed

Lines changed: 17 additions & 8 deletions

File tree

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ dependencies {
3333

3434
implementation 'org.slf4j:slf4j-android:1.7.25'
3535

36-
implementation group: 'com.madgag.spongycastle', name: 'prov', version: '1.54.0.0'
37-
implementation group: 'com.madgag.spongycastle', name: 'core', version: '1.54.0.0'
38-
implementation group: 'com.madgag.spongycastle', name: 'pkix', version: '1.54.0.0'
36+
implementation group: 'com.madgag.spongycastle', name: 'prov', version: '1.58.0.0'
37+
implementation group: 'com.madgag.spongycastle', name: 'core', version: '1.58.0.0'
38+
implementation group: 'com.madgag.spongycastle', name: 'bcpkix-jdk15on', version: '1.58.0.0'
3939

40-
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.54'
41-
implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.54'
40+
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60'
41+
implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.60'
4242

4343
implementation group: 'org.apache.httpcomponents', name: 'httpcore-nio', version: '4.4.10'
4444
implementation group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.10'
-8 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

app/src/main/java/org/twistedappdeveloper/opcclient/BrowseFragment.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import OpcUtils.ConnectionThread.ThreadWrite;
5252
import OpcUtils.ManagerOPC;
5353
import OpcUtils.SessionElement;
54+
import OpcUtils.SubscriptionElement;
5455
import tool.ui.NodeAdapter;
5556

5657
public class BrowseFragment extends Fragment {
@@ -132,6 +133,14 @@ public void onClick(DialogInterface dialog, int which) {
132133

133134
private void createMonItem(int position){
134135

136+
137+
if(sessionElement.getSubscriptions().isEmpty()){
138+
//creo sottoscrizione
139+
}else{
140+
//chiedo quale sottoscrizione usare
141+
}
142+
final SubscriptionElement subscriptionElement = sessionElement.getSubscriptions().get(0); //todo gestire ricerca ed eventuale creazione sottoscrizione
143+
135144
final MonitoredItemCreateRequest[] monitoredItems = new MonitoredItemCreateRequest[1];
136145
monitoredItems[0] = new MonitoredItemCreateRequest();
137146

@@ -234,11 +243,11 @@ public void onClick(View v) {
234243
monitoredItems[0].setItemToMonitor(new ReadValueId(nodeId, Attributes.Value, null, null));
235244

236245
final CreateMonitoredItemsRequest mi = new CreateMonitoredItemsRequest();
237-
mi.setSubscriptionId(sessionElement.getSubscriptions().get(0).getSubscription().getSubscriptionId()); //FIXME gestire creazione e ricerca sottoscrizioni
246+
mi.setSubscriptionId(subscriptionElement.getSubscription().getSubscriptionId());
238247
mi.setTimestampsToReturn(timestamp);
239248
mi.setItemsToCreate(monitoredItems);
240249

241-
ThreadCreateMonitoredItem t = new ThreadCreateMonitoredItem(sessionElement.getSubscriptions().get(0), mi); //FIXME gestire creazione e ricerca sottoscrizioni
250+
ThreadCreateMonitoredItem t = new ThreadCreateMonitoredItem(subscriptionElement, mi);
242251
final ProgressDialog progressDialog = ProgressDialog.show( getContext(), getString(R.string.TentativoDiConnessione), getString(R.string.CreazioneMonItemInCorso), true);
243252
@SuppressLint("HandlerLeak") Handler handler_monitoreditem = new Handler() {
244253
@Override
@@ -251,7 +260,7 @@ public void handleMessage(Message msg) {
251260
} else if (msg.what == -3) {
252261
Toast.makeText(getContext(), getString(R.string.ErroreToast) + msg.obj.toString(), Toast.LENGTH_LONG).show();
253262
} else {
254-
//TODO gestire creazione con successo
263+
//TODO creare messaggio adatto
255264
Toast.makeText(getContext(), "Creato con successo", Toast.LENGTH_LONG).show();
256265
}
257266
}

0 commit comments

Comments
 (0)