Merge branch 'ubilabs--tracking_app--bugfix--bug_2993_help' into ubilabs--tracking_app--bugfix--bug_2993

mobile/com.sap.sailing.buoy.positioning/AndroidManifest.xml

@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.sap.sailing.android.buoy.positioning.app"
-    android:versionCode="1"
-    android:versionName="1.0" >
+<manifest package="com.sap.sailing.android.buoy.positioning.app"
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          android:versionCode="1"
+          android:versionName="1.0">
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="22" />
+        android:targetSdkVersion="22"/>
 
     <!-- <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" /> -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <uses-feature
         android:glEsVersion="0x00020000"
-        android:required="true" />
-
+        android:required="true"/>
 
 
     <application
@@ -31,69 +30,70 @@
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
+            android:value="@integer/google_play_services_version"/>
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
-            android:value="AIzaSyDH-Dwy5yFlyBa2-VUgiZ3qGGUO8M_0MPY" />
+            android:value="AIzaSyDH-Dwy5yFlyBa2-VUgiZ3qGGUO8M_0MPY"/>
 
         <activity
             android:name=".ui.activities.StartActivity"
             android:label="@string/app_name"
-            android:screenOrientation="portrait" >
+            android:screenOrientation="portrait">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.VIEW"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                     android:host="*"
                     android:pathPattern=".*buoy-tender/checkin.*"
-                    android:scheme="http" />
+                    android:scheme="http"/>
                 <data
                     android:host="*"
                     android:pathPattern=".*buoy-tender/checkin.*"
-                    android:scheme="http" />
+                    android:scheme="http"/>
             </intent-filter>
         </activity>
         <activity
             android:name=".ui.activities.RegattaActivity"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".ui.activities.PositioningActivity"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ui.activities.SettingActivity"/>
 
         <service
             android:name="com.sap.sailing.android.shared.services.sending.MessageSendingService"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
-                <action android:name="com.sap.sailing.android.tracking.app.action.sendSavedIntents" />
-                <action android:name="com.sap.sailing.android.tracking.app.action.sendMessage" />
+                <action android:name="com.sap.sailing.android.tracking.app.action.sendSavedIntents"/>
+                <action android:name="com.sap.sailing.android.tracking.app.action.sendMessage"/>
             </intent-filter>
         </service>
         <service
             android:name=".service.MarkerService"
-            android:exported="false" />
+            android:exported="false"/>
+
+        <receiver android:name="com.sap.sailing.android.shared.services.sending.ConnectivityChangedReceiver">
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+            </intent-filter>
+        </receiver>
 
         <provider
             android:name=".provider.AnalyticsProvider"
             android:authorities="com.sap.sailing.android.buoy.positioning.app.provider.db"
-            android:exported="false" />
-
-        <activity
-            android:name=".ui.activities.SettingActivity" >
-        </activity>
+            android:exported="false"/>
     </application>
-
 </manifest>

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java

@@ -32,6 +32,7 @@ import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.customviews.OpenSansButton;
 import com.sap.sailing.android.shared.ui.customviews.OpenSansTextView;
 import com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView;
+import com.sap.sailing.android.shared.util.ViewHolder;
 import com.sap.sailing.android.ui.fragments.BaseFragment;
 
 import java.text.DecimalFormat;
@@ -55,29 +56,33 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
     private boolean initialLocationUpdate;
     private IntentReceiver mReceiver;
     private PositioningActivity positioningActivity;
+    private LocalBroadcastManager mBroadcastManager;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
-        View view = inflater.inflate(R.layout.fragment_buoy_postion_detail, container, false);
+        View layout = inflater.inflate(R.layout.fragment_buoy_postion_detail, container, false);
 
-        markHeaderTextView = (OpenSansTextView) view.findViewById(R.id.mark_header);
-        latitudeTextView = (OpenSansTextView) view.findViewById(R.id.marker_gps_latitude);
-        longitudeTextView = (OpenSansTextView) view.findViewById(R.id.marker_gps_longitude);
-        accuracyTextView = (OpenSansTextView) view.findViewById(R.id.marker_gps_accuracy);
+        markHeaderTextView = ViewHolder.get(layout, R.id.mark_header);
+        latitudeTextView = ViewHolder.get(layout, R.id.marker_gps_latitude);
+        longitudeTextView = ViewHolder.get(layout, R.id.marker_gps_longitude);
+        accuracyTextView = ViewHolder.get(layout, R.id.marker_gps_accuracy);
         ClickListener clickListener = new ClickListener();
 
-        setPositionButton = (OpenSansButton) view.findViewById(R.id.marker_set_position_button);
+        setPositionButton = ViewHolder.get(layout, R.id.marker_set_position_button);
         setPositionButton.setVisibility(View.GONE);
         setPositionButton.setOnClickListener(clickListener);
 
-        resetPositionButton = (OpenSansButton) view.findViewById(R.id.marker_reset_position_button);
+        resetPositionButton = ViewHolder.get(layout, R.id.marker_reset_position_button);
         resetPositionButton.setOnClickListener(clickListener);
         resetPositionButton.setVisibility(View.GONE);
 
-        signalQualityIndicatorView = (SignalQualityIndicatorView) view.findViewById(R.id.signal_quality_indicator);
+        signalQualityIndicatorView = ViewHolder.get(layout, R.id.signal_quality_indicator);
         signalQualityIndicatorView.setSignalQuality(GPSQuality.noSignal.toInt());
-        return view;
+
+        mReceiver = new IntentReceiver();
+        mBroadcastManager = LocalBroadcastManager.getInstance(inflater.getContext());
+        return layout;
     }
 
     @Override
@@ -104,10 +109,10 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
     }
 
     private void initMarkerReceiver() {
-        mReceiver = new IntentReceiver();
         IntentFilter filter = new IntentFilter();
         filter.addAction(getString(R.string.database_changed));
-        LocalBroadcastManager.getInstance(positioningActivity.getApplicationContext()).registerReceiver(mReceiver, filter);
+        filter.addAction(getString(R.string.ping_reached_server));
+        mBroadcastManager.registerReceiver(mReceiver, filter);
     }
 
     @Override
@@ -115,7 +120,7 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
         super.onPause();
         // Unsubscribe location updates for power saving
         locationManager.removeUpdates(this);
-        LocalBroadcastManager.getInstance(positioningActivity.getApplicationContext()).unregisterReceiver(mReceiver);
+        mBroadcastManager.unregisterReceiver(mReceiver);
     }
 
     public void setUpTextUI(Location location) {