/*
 * Copyright (C) 2015 University of Washington
 *
 * 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.opendatakit;

public class IntentConsts {
  
  public static final String INTENT_KEY_APP_NAME = "appName";
  public static final String INTENT_KEY_TABLE_ID = "tableId";
  public static final String INTENT_KEY_INSTANCE_ID = "instanceId";
  // for rowpath and/or configpath
  public static final String INTENT_KEY_URI_FRAGMENT = "uriFragment";
  public static final String INTENT_KEY_CONTENT_TYPE = "contentType";

}

@@ -1046,11 +1046,813 @@
 pe%22;%0D%0A%0D%0A
+  /**%0D%0A   * Intent Extras:%0D%0A   * %3Col%3E%3Cli%3EINTENT_KEY_APP_NAME%3C/li%3E%0D%0A   * %3Cli%3EINTENT_KEY_TABLE_ID%3C/li%3E%0D%0A   * %3Cli%3EINTENT_KEY_INSTANCE_ID (optional)%3C/li%3E%3C/ol%3E%0D%0A   */%0D%0A  public class ResolveCheckpoint %7B%0D%0A    public static final String APPLICATION_NAME = %22org.opendatakit.core%22;%0D%0A    public static final String ACTIVITY_NAME =%0D%0A        %22org.opendatakit.resolve.checkpoint.CheckpointResolutionActivity%22;%0D%0A  %7D%0D%0A%0D%0A  /**%0D%0A   * Intent Extras:%0D%0A   * %3Col%3E%3Cli%3EINTENT_KEY_APP_NAME%3C/li%3E%0D%0A   * %3Cli%3EINTENT_KEY_TABLE_ID%3C/li%3E%0D%0A   * %3Cli%3EINTENT_KEY_INSTANCE_ID (optional)%3C/li%3E%3C/ol%3E%0D%0A   */%0D%0A  public class ResolveConflict %7B%0D%0A    public static final String APPLICATION_NAME = %22org.opendatakit.core%22;%0D%0A    public static final String ACTIVITY_NAME =%0D%0A        %22org.opendatakit.resolve.conflict.ConflictResolutionActivity%22;%0D%0A  %7D%0D%0A
 %7D%0D%0A

Define conflict and checkpoint resolution application and package strings in IntentConsts and strip out of all other parts of the code.