moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-09-30 00:51:58 +02:00
commit de5dd482e1
13 changed files with 28 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
DESCRIPTION
View File

@ -1,23 +0,0 @@
THIS IS EXPERIMENTAL SOFTWARE.
Use OpenPGP Keychain at your own risk!
Description:
OpenPGP Keychain is an OpenPGP implementation for Android. The development began as a fork of Android Privacy Guard (APG).
Features:
• OpenPGP Keychain is Open Source and Free Software (GPLv3+) (-> verifiable cryptography)
• All basic OpenPGP operations: encrypt/decrypt/sign/verify
• NFC/QR code key exchange
• Key management (import/export/sign/upload)
• Import/export of GPG key rings and exported keys from/to the SD card
• Basic keyserver support
• Easy API
License:
GPLv3+
Permissions:
• Full network access: Internet access is ONLY used for keyserver queries
• Control Near Field Communication: To exchange keys via NFC
• Modify or delete the contents of your USB storage: To export keys to the sd card
• Read the contents of your USB storage: To import keys from the sd card

22
OpenKeychain/src/main/AndroidManifest.xml
View File

@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
package="org.sufficientlysecure.keychain"
android:installLocation="auto"
android:versionCode="29201"
android:versionName="3.0 beta1">
android:versionCode="29202"
android:versionName="3.0 beta2">
<!--
General remarks
@ -633,16 +633,16 @@
android:taskAffinity=":Nfc"
android:allowTaskReparenting="true" />
<activity
android:name=".ui.NfcIntentActivity"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
<!--<activity-->
<!--android:name=".ui.NfcIntentActivity"-->
<!--android:launchMode="singleTop">-->
<!--<intent-filter>-->
<!--<action android:name="android.nfc.action.NDEF_DISCOVERED" />-->
<category android:name="android.intent.category.DEFAULT" />
<data android:host="my.yubico.com" android:scheme="https"/>
</intent-filter>
</activity>
<!--<category android:name="android.intent.category.DEFAULT" />-->
<!--<data android:host="my.yubico.com" android:scheme="https"/>-->
<!--</intent-filter>-->
<!--</activity>-->
<activity
android:name=".ui.HelpActivity"

12
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
View File

@ -79,7 +79,7 @@ public class DecryptActivity extends DrawerActivity {
final String clipboardText =
ClipboardReflection.getClipboardText(DecryptActivity.this).toString();
new AsyncTask<Void,Void,Boolean>() {
AsyncTask<Void, Void, Boolean> tadaTask = new AsyncTask<Void, Void, Boolean>() {
@Override
protected Boolean doInBackground(Void... params) {
@ -88,7 +88,7 @@ public class DecryptActivity extends DrawerActivity {
boolean animate = matcher.matches();
// see if it looks like another pgp thing
if(!animate) {
if (!animate) {
matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText);
animate = matcher.matches();
}
@ -100,11 +100,15 @@ public class DecryptActivity extends DrawerActivity {
super.onPostExecute(animate);
// if so, animate the clipboard icon just a bit~
if(animate) {
if (animate) {
SubtleAttentionSeeker.tada(findViewById(R.id.clipboard_icon), 1.5f).start();
}
}
}.execute();
};
if (clipboardText != null) {
tadaTask.execute();
}
}
}

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java
View File

@ -112,11 +112,11 @@ public class DecryptTextActivity extends ActionBarActivity {
}
if (Intent.ACTION_SEND.equals(action) && type != null) {
// Android action
Log.logDebugBundle(extras, "extras");
// When sending to Keychain Decrypt via share menu
if ("text/plain".equals(type)) {
String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
String sharedText = extras.getString(Intent.EXTRA_TEXT);
sharedText = getPgpContent(sharedText);
if (sharedText != null) {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java
View File

@ -309,7 +309,7 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.encrypt_file_activity);
setContentView(R.layout.encrypt_files_activity);
// if called with an intent action, do not init drawer navigation
if (ACTION_ENCRYPT_DATA.equals(getIntent().getAction())) {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
View File

@ -76,7 +76,7 @@ public class EncryptFilesFragment extends Fragment implements EncryptActivityInt
*/
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.encrypt_file_fragment, container, false);
View view = inflater.inflate(R.layout.encrypt_files_fragment, container, false);
View vEncryptFile = view.findViewById(R.id.action_encrypt_file);
vEncryptFile.setOnClickListener(new View.OnClickListener() {

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
View File

@ -302,7 +302,6 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv
// Handle intent actions
handleActions(getIntent());
updateModeFragment();
}
@Override
@ -359,9 +358,11 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv
// When sending to OpenKeychain Encrypt via share menu
if (Intent.ACTION_SEND.equals(action) && type != null) {
Log.logDebugBundle(extras, "extras");
// When sending to OpenKeychain Encrypt via share menu
if ("text/plain".equals(type)) {
String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
String sharedText = extras.getString(Intent.EXTRA_TEXT);
if (sharedText != null) {
// handle like normal text encryption, override action and extras to later
// executeServiceMethod ACTION_ENCRYPT_TEXT in main actions

3
OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml → OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml
View File

@ -13,6 +13,5 @@
</android.support.v4.widget.FixedDrawerLayout>
<include layout="@layout/decrypt_content_old" />
<include layout="@layout/encrypt_files_content" />
</FrameLayout>

11
OpenKeychain/src/main/res/layout/decrypt_activity_old.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/decrypt_content_old"/>
<include layout="@layout/drawer_list" />
</android.support.v4.widget.FixedDrawerLayout>

24
OpenKeychain/src/main/res/layout/decrypt_content_old.xml
View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content_frame"
android:layout_marginLeft="@dimen/drawer_content_padding"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/notify_area" />
<android.support.v4.view.ViewPager
android:id="@+id/decrypt_pager"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.view.PagerTabStrip
android:id="@+id/decrypt_pager_tab_strip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:textColor="@color/emphasis" />
</android.support.v4.view.ViewPager>
</LinearLayout>

2
OpenKeychain/src/main/res/layout/encrypt_file_activity.xml → OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
View File

@ -7,7 +7,7 @@
android:layout_height="match_parent"
tools:context=".ui.EncryptFileActivity">
<include layout="@layout/encrypt_file_content"/>
<include layout="@layout/encrypt_files_content"/>
<include layout="@layout/drawer_list" />

0
OpenKeychain/src/main/res/layout/encrypt_file_content.xml → OpenKeychain/src/main/res/layout/encrypt_files_content.xml
View File

0
OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml → OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
View File