Projects >> Brion-Learns-OAuth >>8507cd35ca1ee7a5bb69aeb88d20697f047210ce

Chunk
Conflicting content
			if(mCB.isChecked()) {
				try {
					String authUrl = mProvider.retrieveRequestToken(CALLBACK_URI.toString());
<<<<<<< HEAD
=======
					Log.d(TAG, "onClick() - AuthUrl: " + authUrl);
					Log.d(TAG, "onClick() - Request: " + mConsumer.getToken());
					Log.d(TAG, "onClick() - Secret: " + mConsumer.getTokenSecret());
					saveRequestInformation(mConsumer.getToken(), mConsumer.getTokenSecret());
>>>>>>> 6a93f94a27dd4b756dd7a934c495ad7a40c6ee21
					Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(authUrl));
					this.startActivity(i);
				} catch (OAuthMessageSignerException e) {
Solution content
			if(mCB.isChecked()) {
				try {
					String authUrl = mProvider.retrieveRequestToken(CALLBACK_URI.toString());
					Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(authUrl));
					this.startActivity(i);
				} catch (OAuthMessageSignerException e) {
File
BLOA.java
Developer's decision
Version 1
Kind of conflict
Method invocation