moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 16:38:50 -05:00
Code Issues Releases Wiki Activity

Disable old API

Browse Source
This commit is contained in:
Dominik Schürmann 2013-09-06 14:32:12 +02:00
parent 4813345460
commit 9d30c1ea37
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenPGP-Keychain/AndroidManifest.xml
View File

@ -135,16 +135,19 @@
android:name="android.app.searchable" android:name="android.app.searchable"
android:resource="@xml/searchable_secret_keys" /> android:resource="@xml/searchable_secret_keys" />
</activity> </activity>
<!-- todo: export disabled, old API -->
<activity <activity
android:name=".ui.EditKeyActivity" android:name=".ui.EditKeyActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:exported="false"
android:label="@string/title_editKey" android:label="@string/title_editKey"
android:uiOptions="splitActionBarWhenNarrow" android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="stateHidden" > android:windowSoftInputMode="stateHidden" >
<!-- TODO: disabled: old api! -->
<intent-filter> <intent-filter>
<action android:name="org.sufficientlysecure.keychain.action.EDIT_KEYRING" /> <action android:name="org.sufficientlysecure.keychain.action.EDIT_KEYRING" />
<!-- With permission ACCESS_API: -->
<action android:name="org.sufficientlysecure.keychain.action.CREATE_KEYRING" /> <action android:name="org.sufficientlysecure.keychain.action.CREATE_KEYRING" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

7
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
View File

@ -142,10 +142,11 @@ public class EditKeyActivity extends SherlockFragmentActivity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// TODO: disabled, old API!
// check permissions for intent actions without user interaction // check permissions for intent actions without user interaction
String[] restrictedActions = new String[] { ACTION_CREATE_KEY }; // String[] restrictedActions = new String[] { ACTION_CREATE_KEY };
OtherHelper.checkPackagePermissionForActions(this, this.getCallingPackage(), // OtherHelper.checkPackagePermissionForActions(this, this.getCallingPackage(),
Constants.PERMISSION_ACCESS_API, getIntent().getAction(), restrictedActions); // Constants.PERMISSION_ACCESS_API, getIntent().getAction(), restrictedActions);
setContentView(R.layout.edit_key); setContentView(R.layout.edit_key);