projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup after jackrabbit, releasing resources
[pub/Android/ownCloud.git]
/
src
/
eu
/
alefzero
/
owncloud
/
ui
/
activity
/
LandingActivity.java
diff --git
a/src/eu/alefzero/owncloud/ui/activity/LandingActivity.java
b/src/eu/alefzero/owncloud/ui/activity/LandingActivity.java
index
a12a31c
..
668f134
100644
(file)
--- a/
src/eu/alefzero/owncloud/ui/activity/LandingActivity.java
+++ b/
src/eu/alefzero/owncloud/ui/activity/LandingActivity.java
@@
-50,16
+50,19
@@
public class LandingActivity extends SherlockFragmentActivity implements OnClick
super.onCreate(savedInstanceState);
\r
setContentView(R.layout.main);
\r
\r
super.onCreate(savedInstanceState);
\r
setContentView(R.layout.main);
\r
\r
- // Fill the grid view
that is only available in portrait mode
\r
+ // Fill the grid view
of the landing screen with icons
\r
GridView landingScreenItems = (GridView) findViewById(R.id.homeScreenGrid);
\r
GridView landingScreenItems = (GridView) findViewById(R.id.homeScreenGrid);
\r
- if(landingScreenItems != null){
\r
- landingScreenItems.setAdapter(new LandingScreenAdapter(this));
\r
- landingScreenItems.setOnItemClickListener(this);
\r
- }
\r
+ landingScreenItems.setAdapter(new LandingScreenAdapter(this));
\r
+ landingScreenItems.setOnItemClickListener(this);
\r
\r
// Check, if there are ownCloud accounts
\r
if(!accountsAreSetup()){
\r
showDialog(DIALOG_SETUP_ACCOUNT);
\r
\r
// Check, if there are ownCloud accounts
\r
if(!accountsAreSetup()){
\r
showDialog(DIALOG_SETUP_ACCOUNT);
\r
+ } else {
\r
+ // Start device tracking service
\r
+ Intent locationServiceIntent = new Intent();
\r
+ locationServiceIntent.setAction("eu.alefzero.owncloud.location.LocationLauncher");
\r
+ sendBroadcast(locationServiceIntent);
\r
}
\r
\r
}
\r
}
\r
\r
}
\r
@@
-129,6
+132,7
@@
public class LandingActivity extends SherlockFragmentActivity implements OnClick
if(intent != null ){
\r
startActivity(intent);
\r
} else {
\r
if(intent != null ){
\r
startActivity(intent);
\r
} else {
\r
+ // TODO: Implement all of this and make this text go away ;-)
\r
Toast toast = Toast.makeText(this, "Not yet implemented!", Toast.LENGTH_SHORT);
\r
toast.show();
\r
}
\r
Toast toast = Toast.makeText(this, "Not yet implemented!", Toast.LENGTH_SHORT);
\r
toast.show();
\r
}
\r