Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for issue 52, HTTPS location fails to add #73

Merged
merged 1 commit into from Nov 24, 2012
Merged

Fix for issue 52, HTTPS location fails to add #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/org/sparkleshare/android/WelcomeActivity.java
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@
import android.support.v4.app.FragmentActivity;
import android.view.View;
import android.widget.Toast;
import android.view.KeyEvent;

import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
Expand Down Expand Up @@ -70,4 +71,16 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
}
}

@Override
public boolean onKeyDown (int keyCode, KeyEvent event)
{
switch(keyCode)
{
case KeyEvent.KEYCODE_MENU:
Intent settings = new Intent(this, SettingsActivity.class);
startActivity(settings);
return true;
}
return false;
}
}