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.

Sign up for GitHub

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

Add GET_CONTENT and INSERT actions. #85

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add GET_CONTENT and INSERT actions. #85

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,18 @@
<data android:scheme="otpauth" android:host="totp" />
<data android:scheme="otpauth" android:host="hotp" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.INSERT" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="otpauth" android:host="totp" />
<data android:scheme="otpauth" android:host="hotp" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.GET_CONTENT" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="otpauth" android:host="totp" />
<data android:scheme="otpauth" android:host="hotp" />
</intent-filter>
</activity>
</application>
</manifest>
131 changes: 128 additions & 3 deletions app/src/main/java/org/fedorahosted/freeotp/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,24 @@
import org.fedorahosted.freeotp.add.ScanActivity;

import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.DataSetObserver;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MenuItem.OnMenuItemClickListener;
import android.view.View;
import android.view.WindowManager.LayoutParams;
import android.widget.GridView;

import com.google.gson.Gson;

public class MainActivity extends Activity implements OnMenuItemClickListener {
private TokenAdapter mTokenAdapter;
private DataSetObserver mDataSetObserver;
Expand Down Expand Up @@ -132,8 +139,126 @@ public boolean onMenuItemClick(MenuItem item) {
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);

Uri uri = intent.getData();
if (uri != null)
TokenPersistence.addWithToast(this, uri.toString());
final Uri uri = intent.getData();
if (uri != null) {
String action = intent.getAction();
if (action.equals(Intent.ACTION_VIEW)) {
TokenPersistence.addWithToast(this, uri.toString());
return;
}
try {
final Token token = new Token(uri);
final String key = token.getID();
final Intent out = new Intent();
out.putExtra("key", key);
String appname = intent.getStringExtra("appname");
if (appname == null) {
appname = getString(R.string.default_appname);
}
final SharedPreferences prefs = getSharedPreferences(TokenPersistence.NAME, Context.MODE_PRIVATE);
switch (action) {
case Intent.ACTION_GET_CONTENT:
if (prefs.contains(key)) {
new AlertDialog.Builder(this)
.setTitle(R.string.attention)
.setMessage(appname + getString(R.string.request_code) + "\"" + key + "\"")
.setCancelable(false)
.setPositiveButton(R.string.allow, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
out.putExtra("currentCode", new Gson().fromJson(prefs.getString(key, null), Token.class).generateCodes().getCurrentCode());
setResult(Activity.RESULT_OK, out);
finish();
}
})
.setNegativeButton(R.string.deny, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
setResult(Activity.RESULT_CANCELED, out);
finish();
}
})
.show()
;
} else {
setResult(Activity.RESULT_CANCELED, out);
finish();
}
break;
case Intent.ACTION_INSERT:
if (prefs.contains(key)) {
new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.error)
.setMessage(String.format(getString(R.string.token_already_exists), key))
.setCancelable(false)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
setResult(Activity.RESULT_CANCELED, out);
finish();
}
})
.show()
;
} else {
new AlertDialog.Builder(this)
.setTitle(R.string.attention)
.setMessage(appname + getString(R.string.request_install_token) + "\"" + key + "\"")
.setCancelable(false)
.setPositiveButton(R.string.allow, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
try {
new TokenPersistence(MainActivity.this).add(token);
out.putExtra("currentCode", token.generateCodes().getCurrentCode());
out.putExtra("secret", uri.getQueryParameter("secret"));
setResult(Activity.RESULT_OK, out);
finish();
} catch (Token.TokenUriInvalidException e) {
new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.error)
.setMessage(getString(R.string.bad_token_uri) + uri.toString())
.setCancelable(false)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
setResult(Activity.RESULT_CANCELED, out);
finish();
}
})
.show()
;
}
}
})
.setNegativeButton(R.string.deny, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
setResult(Activity.RESULT_CANCELED, out);
finish();
}
})
.show()
;
}
break;
default:
Log.e("LOG", "bad action: " + action);
}
} catch (Token.TokenUriInvalidException e) {
new AlertDialog.Builder(this)
.setTitle(R.string.error)
.setMessage(getString(R.string.bad_token_uri) + uri.toString())
.setCancelable(false)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
finish();
}
})
.show()
;
}
}
}
}
3 changes: 1 addition & 2 deletions app/src/main/java/org/fedorahosted/freeotp/TokenPersistence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@

import android.content.Context;
import android.content.SharedPreferences;
import android.net.Uri;
import android.widget.Toast;

import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import com.google.gson.reflect.TypeToken;

public class TokenPersistence {
private static final String NAME = "tokens";
protected static final String NAME = "tokens";
private static final String ORDER = "tokenOrder";
private final SharedPreferences prefs;
private final Gson gson;
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@
<string name="delete_summary">This is your last chance: if you delete this token, it will be gone forever. It will not be disabled on the server.</string>
<string name="delete_question">Delete this token?</string>

<string name="attention">Attention</string>
<string name="error">Error</string>
<string name="allow">Allow</string>
<string name="deny">Deny</string>
<string name="default_appname">An unspecified app</string>
<string name="request_code">" has requested a code for token "</string>
<string name="request_install_token">" has requested to install a token for "</string>
<string name="bad_token_uri">"Bad token uri: "</string>
<string name="token_already_exists">Token \"%s\" already exists</string>

<string-array name="algorithms">
<item>MD5</item>
<item>SHA1</item>
Expand Down