Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

Commit

Permalink
Working on spring-social M3 updates
Browse files Browse the repository at this point in the history
  • Loading branch information
royclarkson committed Apr 19, 2011
1 parent e6b40fd commit 5600223
Show file tree
Hide file tree
Showing 64 changed files with 1,444 additions and 1,354 deletions.
7 changes: 1 addition & 6 deletions AndroidManifest.xml
Expand Up @@ -10,7 +10,7 @@

<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity
android:name="com.springsource.greenhouse.activities.FrontDoorActivity"
android:name="com.springsource.greenhouse.activities.MainActivity"
android:theme="@android:style/Theme.NoTitleBar">

<intent-filter>
Expand All @@ -23,11 +23,6 @@
<activity
android:name="com.springsource.greenhouse.activities.SignInActivity"
android:theme="@android:style/Theme.NoTitleBar">
<!-- <intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter> -->
</activity>

<activity
Expand Down
Empty file removed gen/.gitignore
Empty file.
56 changes: 9 additions & 47 deletions pom.xml
Expand Up @@ -6,7 +6,7 @@
<artifactId>greenhouse</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<packaging>apk</packaging>
<name>Greenhouse</name>
<name>greenhouse-android</name>
<url>http://www.springsource.org</url>
<organization>
<name>SpringSource</name>
Expand All @@ -15,14 +15,13 @@

<properties>
<android-platform>8</android-platform>
<android-emulator>8</android-emulator>
<android-emulator>9</android-emulator>
<maven-android-plugin-version>2.8.4</maven-android-plugin-version>
<maven-compiler-plugin-version>2.3.2</maven-compiler-plugin-version>
<android-version>2.2.1</android-version>
<spring-android-version>1.0.0.M2</spring-android-version>
<spring-android-version>1.0.0.BUILD-SNAPSHOT</spring-android-version>
<spring-social-version>1.0.0.BUILD-SNAPSHOT</spring-social-version>
<jackson-version>1.7.2</jackson-version>
<scribe-version>1.0.7</scribe-version>
<signpost-version>1.2.1.1</signpost-version>
</properties>

<build>
Expand Down Expand Up @@ -64,53 +63,16 @@
<artifactId>spring-android-rest-template</artifactId>
<version>${spring-android-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.android</groupId>
<artifactId>spring-android-auth</artifactId>
<version>${spring-android-version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>org.scribe</groupId>
<artifactId>scribe</artifactId>
<version>${scribe-version}</version>
<exclusions>
<exclusion>
<artifactId>commons-codec</artifactId>
<groupId>commons-codec</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>oauth.signpost</groupId>
<artifactId>signpost-core</artifactId>
<version>${signpost-version}</version>
<type>pom</type>
<exclusions>
<exclusion>
<artifactId>commons-codec</artifactId>
<groupId>commons-codec</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>oauth.signpost</groupId>
<artifactId>signpost-commonshttp4</artifactId>
<version>${signpost-version}</version>
<exclusions>
<exclusion>
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
</exclusion>
<exclusion>
<artifactId>httpcore</artifactId>
<groupId>org.apache.httpcomponents</groupId>
</exclusion>
<exclusion>
<artifactId>commons-codec</artifactId>
<groupId>commons-codec</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<repositories>
Expand Down
8 changes: 8 additions & 0 deletions res/values/connect_settings.xml
@@ -0,0 +1,8 @@
<resources>
<string name="local_user_id">1</string>
<string name="greenhouse_provider_id">greenhouse</string>
<string name="greenhouse_oauth_callback_url">x-com-springsource-greenhouse://oauth-response</string>
<string name="greenhouse_base_url">http://10.0.2.2:8080/greenhouse</string>
<string name="greenhouse_consumer_key">a08318eb478a1ee31f69a55276f3af64</string>
<string name="greenhouse_consumer_key_secret">80e7f8f7ba724aae9103f297e5fb9bdf</string>
</resources>
@@ -0,0 +1,76 @@
package com.springsource.greenhouse.activities;

import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.ResourceAccessException;

import android.app.Activity;
import android.app.ProgressDialog;
import android.view.Gravity;
import android.widget.Toast;

public abstract class AbstractGreenhouseActivity extends Activity implements GreenhouseActivity
{
protected static final String TAG = AbstractGreenhouseActivity.class.getSimpleName();

private ProgressDialog _progressDialog;


//***************************************
// GreenhouseActivity methods
//***************************************
public void showProgressDialog()
{
showProgressDialog("Loading. Please wait...");
}

public void showProgressDialog(String message)
{
_progressDialog = ProgressDialog.show(this, "", message, true);
}

public void dismissProgressDialog()
{
if (_progressDialog != null)
{
_progressDialog.dismiss();
}
}


//***************************************
// Protected methods
//***************************************
protected void processException(Exception e)
{
if (e != null)
{
if (e instanceof ResourceAccessException)
{
displayNetworkError();
}
else if (e instanceof HttpClientErrorException)
{
HttpClientErrorException httpError = (HttpClientErrorException) e;
if (httpError.getStatusCode() == HttpStatus.UNAUTHORIZED)
{
displayAuthorizationError();
}
}
}
}

protected void displayNetworkError()
{
Toast toast = Toast.makeText(this, "A problem occurred with the network connection while attempting to communicate with Greenhouse.", Toast.LENGTH_LONG);
toast.setGravity(Gravity.CENTER, 0, 0);
toast.show();
}

protected void displayAuthorizationError()
{
Toast toast = Toast.makeText(this, "You are not authorized to connect to Greenhouse. Please sign out and reauthorize the app.", Toast.LENGTH_LONG);
toast.setGravity(Gravity.CENTER, 0, 0);
toast.show();
}
}
@@ -0,0 +1,76 @@
package com.springsource.greenhouse.activities;

import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.ResourceAccessException;

import android.app.ListActivity;
import android.app.ProgressDialog;
import android.view.Gravity;
import android.widget.Toast;

public abstract class AbstractGreenhouseListActivity extends ListActivity implements GreenhouseActivity
{
protected static final String TAG = AbstractGreenhouseListActivity.class.getSimpleName();

private ProgressDialog _progressDialog;


//***************************************
// GreenhouseActivity methods
//***************************************
public void showProgressDialog()
{
showProgressDialog("Loading. Please wait...");
}

public void showProgressDialog(String message)
{
_progressDialog = ProgressDialog.show(this, "", message, true);
}

public void dismissProgressDialog()
{
if (_progressDialog != null)
{
_progressDialog.dismiss();
}
}


//***************************************
// Protected methods
//***************************************
protected void processException(Exception e)
{
if (e != null)
{
if (e instanceof ResourceAccessException)
{
displayNetworkError();
}
else if (e instanceof HttpClientErrorException)
{
HttpClientErrorException httpError = (HttpClientErrorException) e;
if (httpError.getStatusCode() == HttpStatus.UNAUTHORIZED)
{
displayAuthorizationError();
}
}
}
}

protected void displayNetworkError()
{
Toast toast = Toast.makeText(this, "A problem occurred with the network connection while attempting to communicate with Greenhouse.", Toast.LENGTH_LONG);
toast.setGravity(Gravity.CENTER, 0, 0);
toast.show();
}

protected void displayAuthorizationError()
{
Toast toast = Toast.makeText(this, "You are not authorized to connect to Greenhouse. Please sign out and reauthorize the app.", Toast.LENGTH_LONG);
toast.setGravity(Gravity.CENTER, 0, 0);
toast.show();
}
}
82 changes: 0 additions & 82 deletions src/com/springsource/greenhouse/activities/BaseActivity.java

This file was deleted.

0 comments on commit 5600223

Please sign in to comment.