cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix didnt work, new fix and tests

Browse Source
This commit is contained in:
Dominik
2012-11-19 22:18:25 +01:00
parent 949035b009
commit c36fdbd3f8
12 changed files with 158 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APG-API-Demo/AndroidManifest.xml
View File

@@ -31,6 +31,10 @@
android:name=".AidlDemoActivity"
android:label="Aidl Demo"
android:windowSoftInputMode="stateHidden" />
<activity
android:name=".ContentProviderDemoActivity"
android:label="Content Provider Demo"
android:windowSoftInputMode="stateHidden" />
</application>
</manifest>

33
APG-API-Demo/res/layout/content_provider_demo.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<Button
android:id="@+id/content_provider_test1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="test1OnClick"
android:text="Test 1" />
<Button
android:id="@+id/content_provider_test2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="test2OnClick"
android:text="Test 2" />
<EditText
android:id="@+id/content_provider_output"
android:layout_width="match_parent"
android:layout_height="150dip"
android:text="output"
android:textAppearance="@android:style/TextAppearance.Small" />
</LinearLayout>
</ScrollView>

5
APG-API-Demo/res/xml/base_preference.xml
View File

@@ -11,5 +11,10 @@
android:key="aidl_demo"
android:title="AIDL Demo" />
</PreferenceCategory>
<PreferenceCategory android:title="Content Provider" >
<Preference
android:key="content_provider_demo"
android:title="Content Provider Demo" />
</PreferenceCategory>
</PreferenceScreen>

17
APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java
View File

@@ -1,3 +1,19 @@
/*
* Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thialfihar.android.apg.demo;
import org.thialfihar.android.apg.integration.ApgData;
@@ -17,7 +33,6 @@ import android.os.IBinder;
import android.os.RemoteException;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
public class AidlDemoActivity extends Activity {
Activity mActivity;

11
APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java
View File

@@ -30,6 +30,7 @@ public class BaseActivity extends PreferenceActivity {
private Preference mIntentDemo;
private Preference mAidlDemo;
private Preference mContentProviderDemo;
/**
* Called when the activity is first created.
@@ -46,6 +47,7 @@ public class BaseActivity extends PreferenceActivity {
// find preferences
mIntentDemo = (Preference) findPreference("intent_demo");
mAidlDemo = (Preference) findPreference("aidl_demo");
mContentProviderDemo = (Preference) findPreference("content_provider_demo");
mIntentDemo.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
@@ -64,6 +66,15 @@ public class BaseActivity extends PreferenceActivity {
return false;
}
});
mContentProviderDemo.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
startActivity(new Intent(mActivity, ContentProviderDemoActivity.class));
return false;
}
});
}
}

68
APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java Normal file
View File

@@ -0,0 +1,68 @@
/*
* Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thialfihar.android.apg.demo;
import java.util.Arrays;
import org.thialfihar.android.apg.demo.R;
import org.thialfihar.android.apg.integration.ApgContentProviderHelper;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
public class ContentProviderDemoActivity extends Activity {
Activity mActivity;
TextView mOutputTextView;
TextView mCiphertextTextView;
TextView mDataTextView;
ApgContentProviderHelper mApgContentProviderHelper;
/**
* Instantiate View for this Activity
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.content_provider_demo);
mActivity = this;
mOutputTextView = (TextView) findViewById(R.id.content_provider_output);
mApgContentProviderHelper = new ApgContentProviderHelper(mActivity);
}
public void test1OnClick(View view) {
long[] test = mApgContentProviderHelper.getPublicKeyIdsFromEmail("user@example.com");
mOutputTextView.setText(Arrays.toString(test));
}
public void test2OnClick(View view) {
boolean test = mApgContentProviderHelper.hasPublicKeyForEmail("user@example.com");
if (test) {
mOutputTextView.setText("true");
} else {
mOutputTextView.setText("false");
}
}
}