Try to resolve the connection problem

ThibaudM · Dec 3, 2017 · 99e38fb · 99e38fb
1 parent c97efeb
commit 99e38fb
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.thibaudperso.sonycamera"
-          android:versionCode="19"
-          android:versionName="3.0.2">
+          android:versionCode="20"
+          android:versionName="3.0.3">
 
     <uses-sdk tools:overrideLibrary="   com.google.android.gms.ads,
                                         com.google.android.gms.ads.impl,

diff --git a/app/src/main/java/com/thibaudperso/sonycamera/sdk/CameraAPI.java b/app/src/main/java/com/thibaudperso/sonycamera/sdk/CameraAPI.java
@@ -34,12 +34,10 @@ public CameraAPI(Context context) {
 
     public void setDevice(Device device) {
         mCameraWS.setWSUrl(device.getWebService());
-        initialize();
-
         for (DeviceChangedListener listener : mDeviceChangedListeners) listener.onNewDevice(device);
     }
 
-    private void initialize() {
+    public void initializeWS() {
         if (mIsDeviceInitialized) {
             return;
         }

diff --git a/app/src/main/java/com/thibaudperso/sonycamera/timelapse/control/DeviceManager.java b/app/src/main/java/com/thibaudperso/sonycamera/timelapse/control/DeviceManager.java
@@ -52,7 +52,6 @@ public DeviceManager(TimelapseApplication application) {
         for (Device device : mDevicesList) {
             if (device.getId() == currentCameraId) {
                 mSelectedDevice = device;
-                mApplication.getCameraAPI().setDevice(device);
                 return;
             }
         }

diff --git a/...c/main/java/com/thibaudperso/sonycamera/timelapse/ui/adjustments/AdjustmentsActivity.java b/...c/main/java/com/thibaudperso/sonycamera/timelapse/ui/adjustments/AdjustmentsActivity.java
@@ -22,6 +22,7 @@ protected String getGuideTitle() {
 
     @Override
     public void onBackPressed() {
+        mApplication.getCameraAPI().closeConnection();
         mApplication.getWifiHandler().disconnect();
         mStateMachineConnection.reset();
         setResult(RESULT_CANCELED, new Intent().putExtra(EXTRA_EXIT, true));

diff --git a/...c/main/java/com/thibaudperso/sonycamera/timelapse/ui/adjustments/AdjustmentsFragment.java b/...c/main/java/com/thibaudperso/sonycamera/timelapse/ui/adjustments/AdjustmentsFragment.java
@@ -208,6 +208,7 @@ public void onClick(DialogInterface dialog, int id) {
                                 .getDefaultSharedPreferences(getContext()).edit();
                         editor.putBoolean(PREF_AUTOMATIC_CONTINUE, false);
                         editor.apply();
+                        mApplication.getCameraAPI().closeConnection();
                         mApplication.getWifiHandler().disconnect();
                         getActivity().finish();
                     }

diff --git a/...src/main/java/com/thibaudperso/sonycamera/timelapse/ui/connection/ConnectionActivity.java b/...src/main/java/com/thibaudperso/sonycamera/timelapse/ui/connection/ConnectionActivity.java
@@ -27,6 +27,7 @@ protected String getGuideTitle() {
 
     @Override
     public void onBackPressed() {
+        mApplication.getCameraAPI().closeConnection();
         mApplication.getWifiHandler().disconnect();
         mStateMachineConnection.reset();
         finish();

diff --git a/...src/main/java/com/thibaudperso/sonycamera/timelapse/ui/connection/ConnectionFragment.java b/...src/main/java/com/thibaudperso/sonycamera/timelapse/ui/connection/ConnectionFragment.java
@@ -119,7 +119,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         /*
          * Handle Camera spinner
          */
-        mCameraSpinner = (Spinner) viewResult.findViewById(R.id.connection_camera_spinner);
+        mCameraSpinner = viewResult.findViewById(R.id.connection_camera_spinner);
 
         mAdapter = new ArrayAdapter<>(getActivity(),
                 android.R.layout.simple_list_item_1, mDeviceManager.getDevices());
@@ -593,6 +593,7 @@ private void stepFinished() {
     }
 
     private void nextStep() {
+        ((TimelapseApplication) getActivity().getApplication()).getCameraAPI().initializeWS();
         startActivityForResult(new Intent(getContext(), AdjustmentsActivity.class),
                 ADJUSTMENTS_ACTIVITY_RESULT);
     }