save package name and versions when rewriting the manifest file

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -48,9 +48,6 @@ class AndroidBuild extends JavaBuild {
   static public final int CARDBOARD = 3;
 
   static public final String DEFAULT_COMPONENT = "app";
-  static public final String DEFAULT_BASE_PACKAGE = "processing.test";
-  static public final String DEFAULT_VERSION = "1";
-  static public final String DEFAULT_PRETTY_VERSION = "1.0";
 
   // TODO: ask base package name when exporting signed apk
   //  static final String basePackage = "changethispackage.beforesubmitting.tothemarket";
@@ -201,9 +198,6 @@ public File createProject(boolean wear) throws IOException, SketchException {
 
     manifest = new Manifest(sketch, appComponent, rewriteManifest);    
     manifest.setSdkTarget(target_sdk);
-    
-    
-    
     rewriteManifest = false;
 
     // grab code from current editing window (GUI only)

src/processing/mode/android/AndroidEditor.java

@@ -783,9 +783,6 @@ private void loadModeSettings() {
       if (!sketchProps.exists()) {
         component = AndroidBuild.DEFAULT_COMPONENT;
         settings.set("component", component);
-        settings.set("basePackage", AndroidBuild.DEFAULT_BASE_PACKAGE);
-        settings.set("version", AndroidBuild.DEFAULT_VERSION);
-        settings.set("prettyVersion", AndroidBuild.DEFAULT_PRETTY_VERSION);
         save = true;
       } else {
         component = settings.get("component");
@@ -794,24 +791,6 @@ private void loadModeSettings() {
           settings.set("component", component);
           save = true;
         }
-        String basePackage = settings.get("basePackage");
-        if (basePackage == null) {
-          basePackage = AndroidBuild.DEFAULT_BASE_PACKAGE;
-          settings.set("basePackage", basePackage);
-          save = true;
-        }
-        String version = settings.get("version");
-        if (version == null) {
-          version = AndroidBuild.DEFAULT_VERSION;
-          settings.set("version", version);
-          save = true;
-        }        
-        String prettyVersion = settings.get("prettyVersion");
-        if (prettyVersion == null) {
-          prettyVersion = AndroidBuild.DEFAULT_PRETTY_VERSION;
-          settings.set("version", prettyVersion);
-          save = true;
-        }          
       }
       if (save) settings.save();
 

src/processing/mode/android/Manifest.java

@@ -106,6 +106,18 @@ public String getPackageName() {
   }
 
 
+  public String getVersionCode() {
+    String code = xml.getString("android:versionCode");
+    return code.length() == 0 ? "1" : code;
+  }
+  
+  
+  public String getVersionName() {
+    String name = xml.getString("android:versionName");
+    return name.length() == 0 ? "1.0" : name;
+  }
+  
+  
   public void setPackageName(String packageName) {
 //    this.packageName = packageName;
     // this is the package attribute in the root <manifest> object
@@ -382,8 +394,14 @@ protected void load(boolean forceNew) {
   }
 
   String[] permissionNames = null;
+  String pkgName = null;
+  String versionCode = null;
+  String versionName = null;
   if (xml != null && forceNew) {
-    permissionNames = getPermissions();
+    permissionNames = getPermissions();    
+    pkgName = getPackageName();
+    versionCode = getVersionCode();
+    versionName = getVersionName();
     xml = null;
   }
 
@@ -394,6 +412,15 @@ protected void load(boolean forceNew) {
       if (permissionNames != null) {
         setPermissions(permissionNames);
       }
+      if (pkgName != null) {
+        xml.setString("package", pkgName);
+      }
+      if (versionCode != null) {
+        xml.setString("android:versionCode", versionCode);
+      }
+      if (versionName != null) {
+        xml.setString("android:versionName", versionName);
+      }       
     } catch (FileNotFoundException e) {
       System.err.println("Could not read " + manifestFile.getAbsolutePath());
       e.printStackTrace();