moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

do not sign on update from server action

Browse Source
This commit is contained in:
Dominik Schürmann 2014-01-18 20:27:28 +01:00
parent 7617e9be2d
commit b6240f8927
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenPGP-Keychain/res/layout/api_app_register_activity.xml
View File

@ -3,8 +3,9 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" android:layout_marginLeft="16dp"
android:padding="8dp" > android:layout_marginRight="16dp"
android:orientation="vertical" >
<TextView <TextView
android:id="@+id/api_register_text" android:id="@+id/api_register_text"

9
OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
View File

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical" android:layout_marginLeft="16dp"
android:padding="8dp" > android:layout_marginRight="16dp"
android:orientation="vertical" >
<fragment <fragment
android:id="@+id/api_app_settings_fragment" android:id="@+id/api_app_settings_fragment"

10
OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml
View File

@ -13,9 +13,10 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="horizontal" android:orientation="horizontal" >
android:paddingBottom="3dip" >
<ImageView <ImageView
android:id="@+id/api_app_settings_app_icon" android:id="@+id/api_app_settings_app_icon"
@ -50,7 +51,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_margin="4dp" android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
android:text="@string/api_settings_show_advanced" android:text="@string/api_settings_show_advanced"
bootstrapbutton:bb_icon_left="fa-caret-up" bootstrapbutton:bb_icon_left="fa-caret-up"
bootstrapbutton:bb_size="default" bootstrapbutton:bb_size="default"
@ -107,7 +109,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="com.example" android:text="com.example"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"

4
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@ -372,10 +372,6 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements CreateN
return; return;
} }
Intent signIntent = new Intent(this, SignKeyActivity.class);
signIntent.putExtra(SignKeyActivity.EXTRA_KEY_ID, updateKeyId);
startActivity(signIntent);
Intent queryIntent = new Intent(this, KeyServerQueryActivity.class); Intent queryIntent = new Intent(this, KeyServerQueryActivity.class);
queryIntent.setAction(KeyServerQueryActivity.ACTION_LOOK_UP_KEY_ID_AND_RETURN); queryIntent.setAction(KeyServerQueryActivity.ACTION_LOOK_UP_KEY_ID_AND_RETURN);
queryIntent.putExtra(KeyServerQueryActivity.EXTRA_KEY_ID, updateKeyId); queryIntent.putExtra(KeyServerQueryActivity.EXTRA_KEY_ID, updateKeyId);