Projects >> SalesforceMobileSDK-Android >>683b0f306a763512f362d8f5c72b52fe8fc1a1a6

Chunk
Conflicting content
	/**
	 * Current version of this SDK.
	 */
<<<<<<< HEAD
    public static final String SDK_VERSION = "1.3.unstable";
=======
    public static final String SDK_VERSION = "1.2.1";
>>>>>>> 2af7a9467029c0da0596111042d774b7fe2b50d3

    /*
     * Last phone version
Solution content
	/**
	 * Current version of this SDK.
	 */
    public static final String SDK_VERSION = "1.3.unstable";

    /*
     * Last phone version
File
ForceApp.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content
            conMgr = null;
        }
        else {
<<<<<<< HEAD
            // Keep reference to app
            this.app = app;

            // Registering receiver to handle network changes
            app.registerReceiver(this, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));

            // Getting connectivity manager and current network type
            conMgr = (ConnectivityManager) app.getSystemService(Context.CONNECTIVITY_SERVICE);
            if (conMgr != null) {
                currentNetworkSubType = conMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getSubtype();
            }
        }
    }

    /**
     * Build the AndroidHttpClient.
     * @return A configured instance of AndroidHttpClient.
     */
    private AndroidHttpClient getHttpClient() {
        return AndroidHttpClient.newInstance(userAgent, app);
    }

    /**
     * Detects network changes and resets the network when needed.
     *
     * Note: The intent info is only for this particular change, meaning it will get sent when the phone detects changes in the wireless
     * state even though the user is actually using wifi.  In other words, don't use it; look for the current real state using the
     * manager service.
     * @param context The context of the request.
     * @param intent Not used.
=======
			// Keep reference to app
			this.app = app;
	        
	        // Registering receiver to handle network changes
	        app.registerReceiver(this, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
	        
	        // Getting connectivity manager and current network type 
	        conMgr = (ConnectivityManager) app.getSystemService(Context.CONNECTIVITY_SERVICE);
		if (conMgr != null) {
	        	currentNetworkSubType = conMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getSubtype();
		}        
	}
	}
	
	/**
	 * Build the AndroidHttpClient.
	 * @return A configured instance of AndroidHttpClient.
	 */
	private AndroidHttpClient getHttpClient() {
		return AndroidHttpClient.newInstance(userAgent, app);
	}
	
	/**
	 * Detects network changes and resets the network when needed.
	 * 
	 * Note: The intent info is only for this particular change, meaning it will get sent when the phone detects changes in the wireless
	 * state even though the user is actually using wifi.  In other words, don't use it; look for the current real state using the
	 * manager service.
	 * @param context The context of the request.
	 * @param intent Not used.
>>>>>>> 2af7a9467029c0da0596111042d774b7fe2b50d3
     */
    @Override
    public void onReceive(Context context, Intent intent) {
Solution content
            conMgr = null;
        }
        else {
            // Keep reference to app
            this.app = app;

            // Registering receiver to handle network changes
            app.registerReceiver(this, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));

            // Getting connectivity manager and current network type
            conMgr = (ConnectivityManager) app.getSystemService(Context.CONNECTIVITY_SERVICE);
            if (conMgr != null) {
                currentNetworkSubType = conMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getSubtype();
            }        
	}
    }

    /**
     * Build the AndroidHttpClient.
     * @return A configured instance of AndroidHttpClient.
     */
    private AndroidHttpClient getHttpClient() {
        return AndroidHttpClient.newInstance(userAgent, app);
    }

    /**
     * Detects network changes and resets the network when needed.
     *
     * Note: The intent info is only for this particular change, meaning it will get sent when the phone detects changes in the wireless
     * state even though the user is actually using wifi.  In other words, don't use it; look for the current real state using the
     * manager service.
     * @param context The context of the request.
     * @param intent Not used.
     */
    @Override
    public void onReceive(Context context, Intent intent) {
File
HttpAccess.java
Developer's decision
Version 1
Kind of conflict
Attribute
Cast expression
Comment
If statement
Method declaration
Method invocation